From cbe6f24f8604c3a6a0f773918d2d78679ce03016 Mon Sep 17 00:00:00 2001
From: Steve Winward <2002602+SteveWinward@users.noreply.github.com>
Date: Tue, 6 Aug 2024 22:58:40 -0400
Subject: [PATCH] Update AuthenticationManager.cs

Updating UsGovernment (ie GCC) URL endpoints
---
 src/lib/PnP.Framework/AuthenticationManager.cs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/lib/PnP.Framework/AuthenticationManager.cs b/src/lib/PnP.Framework/AuthenticationManager.cs
index 00166f548..6c9773a6d 100644
--- a/src/lib/PnP.Framework/AuthenticationManager.cs
+++ b/src/lib/PnP.Framework/AuthenticationManager.cs
@@ -1450,7 +1450,9 @@ public static string GetACSEndPoint(AzureEnvironment environment)
                 AzureEnvironment.Production => "accesscontrol.windows.net",
                 AzureEnvironment.Germany => "microsoftonline.de",
                 AzureEnvironment.China => "accesscontrol.chinacloudapi.cn",
-                AzureEnvironment.USGovernment => "microsoftonline.us",
+                AzureEnvironment.USGovernment => "accesscontrol.windows.net",                
+                AzureEnvironment.USGovernmentHigh => "microsoftonline.us",
+                AzureEnvironment.USGovernmentDoD => "microsoftonline.us",
                 AzureEnvironment.PPE => "windows-ppe.net",
                 _ => "accesscontrol.windows.net"
             };
@@ -1594,7 +1596,7 @@ public static string GetAzureADLoginEndPointStatic(AzureEnvironment environment)
                 AzureEnvironment.Production => "https://login.microsoftonline.com",
                 AzureEnvironment.Germany => "https://login.microsoftonline.de",
                 AzureEnvironment.China => "https://login.chinacloudapi.cn",
-                AzureEnvironment.USGovernment => "https://login.microsoftonline.us",
+                AzureEnvironment.USGovernment => "https://login.microsoftonline.com",
                 AzureEnvironment.USGovernmentHigh => "https://login.microsoftonline.us",
                 AzureEnvironment.USGovernmentDoD => "https://login.microsoftonline.us",
                 AzureEnvironment.PPE => "https://login.windows-ppe.net",
@@ -1879,6 +1881,10 @@ public PublicClientApplicationBuilder GetBuilderWithAuthority(PublicClientApplic
                 switch (azureEnvironment)
                 {
                     case AzureEnvironment.USGovernment:
+                        {
+                            builder = builder.WithAuthority(AzureCloudInstance.AzurePublic, AadAuthorityAudience.AzureAdMyOrg);
+                            break;
+                        }
                     case AzureEnvironment.USGovernmentDoD:
                     case AzureEnvironment.USGovernmentHigh:
                         {
@@ -1918,7 +1924,11 @@ public ConfidentialClientApplicationBuilder GetBuilderWithAuthority(Confidential
             {
                 switch (azureEnvironment)
                 {
-                    case AzureEnvironment.USGovernment:
+                    case AzureEnvironment.USGovernment:                    
+                        {
+                            builder = builder.WithAuthority(AzureCloudInstance.AzurePublic, AadAuthorityAudience.AzureAdMyOrg);
+                            break;
+                        }
                     case AzureEnvironment.USGovernmentDoD:
                     case AzureEnvironment.USGovernmentHigh:
                         {