hotfix for Azure Active Directory Admin set (Azure#16806)

jard285 · web-flow · commit 8cafecbf0dfb · 2022-01-11T13:26:09.000+08:00
* hotfix for Azure Active Directory Admin set

* updating changelog
diff --git a/src/Sql/Sql/ChangeLog.md b/src/Sql/Sql/ChangeLog.md
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Hotfix for Azure Active Directory Admin
+    - AzureSqlServerActiveDirectoryAdministratorAdapter and AzureSqlInstanceActiveDirectoryAdministratorAdapter both used AzureEnvironment.Endpoint.AzureEnvironment.Endpoint.Graph instead of AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl
 
 ## Version 3.7.0
 * Added `ZoneRedundant` parameter to `New-AzSqlDatabaseCopy`, `New-AzSqlDatabaseSecondary` and `Restore-AzSqlDatabase` to enable zone redundant copy, geo secondary and PITR support for hyperscale databases
diff --git a/src/Sql/Sql/InstanceActiveDirectoryAdministrator/Services/AzureSqlInstanceActiveDirectoryAdministratorAdapter.cs b/src/Sql/Sql/InstanceActiveDirectoryAdministrator/Services/AzureSqlInstanceActiveDirectoryAdministratorAdapter.cs
@@ -54,7 +54,7 @@ public MicrosoftGraphClient MicrosoftGraphClient
             {
                 if (_microsoftGraphClient == null)
                 {
-                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);
+                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);
                     _microsoftGraphClient.TenantID = Context.Tenant.Id;
                 }
                 return _microsoftGraphClient;
@@ -315,7 +315,7 @@ protected Guid GetTenantId()
         {
             var tenantIdStr = Context.Tenant.Id.ToString();
             string adTenant = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.AdTenant);
-            string graph = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.Graph);
+            string graph = Context.Environment.GetEndpoint(AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);
             var tenantIdGuid = Guid.Empty;
 
             if (string.IsNullOrWhiteSpace(tenantIdStr) || !Guid.TryParse(tenantIdStr, out tenantIdGuid))
diff --git a/src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs b/src/Sql/Sql/ServerActiveDirectoryAdministrator/Services/AzureSqlServerActiveDirectoryAdministratorAdapter.cs
@@ -55,7 +55,7 @@ public MicrosoftGraphClient MicrosoftGraphClient
             {
                 if (_microsoftGraphClient == null)
                 {
-                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);
+                    _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);
                     _microsoftGraphClient.TenantID = Context.Tenant.Id;
                 }
                 return _microsoftGraphClient;
@@ -316,7 +316,7 @@ protected Guid GetTenantId()
         {
             var tenantIdStr = Context.Tenant.Id.ToString();
             string adTenant = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.AdTenant);
-            string graph = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.Graph);
+            string graph = Context.Environment.GetEndpoint(AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);
             var tenantIdGuid = Guid.Empty;
 
             if (string.IsNullOrWhiteSpace(tenantIdStr) || !Guid.TryParse(tenantIdStr, out tenantIdGuid))

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public MicrosoftGraphClient MicrosoftGraphClient`
`54`	`54`	`{`
`55`	`55`	`if (_microsoftGraphClient == null)`
`56`	`56`	`{`
`57`		`- _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);`
	`57`	`+ _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);`
`58`	`58`	`_microsoftGraphClient.TenantID = Context.Tenant.Id;`
`59`	`59`	`}`
`60`	`60`	`return _microsoftGraphClient;`
`@@ -315,7 +315,7 @@ protected Guid GetTenantId()`
`315`	`315`	`{`
`316`	`316`	`var tenantIdStr = Context.Tenant.Id.ToString();`
`317`	`317`	`string adTenant = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.AdTenant);`
`318`		`- string graph = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.Graph);`
	`318`	`+ string graph = Context.Environment.GetEndpoint(AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);`
`319`	`319`	`var tenantIdGuid = Guid.Empty;`
`320`	`320`
`321`	`321`	`if (string.IsNullOrWhiteSpace(tenantIdStr) \|\| !Guid.TryParse(tenantIdStr, out tenantIdGuid))`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public MicrosoftGraphClient MicrosoftGraphClient`
`55`	`55`	`{`
`56`	`56`	`if (_microsoftGraphClient == null)`
`57`	`57`	`{`
`58`		`- _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.Endpoint.Graph);`
	`58`	`+ _microsoftGraphClient = AzureSession.Instance.ClientFactory.CreateArmClient<MicrosoftGraphClient>(Context, AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);`
`59`	`59`	`_microsoftGraphClient.TenantID = Context.Tenant.Id;`
`60`	`60`	`}`
`61`	`61`	`return _microsoftGraphClient;`
`@@ -316,7 +316,7 @@ protected Guid GetTenantId()`
`316`	`316`	`{`
`317`	`317`	`var tenantIdStr = Context.Tenant.Id.ToString();`
`318`	`318`	`string adTenant = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.AdTenant);`
`319`		`- string graph = Context.Environment.GetEndpoint(AzureEnvironment.Endpoint.Graph);`
	`319`	`+ string graph = Context.Environment.GetEndpoint(AzureEnvironment.ExtendedEndpoint.MicrosoftGraphUrl);`
`320`	`320`	`var tenantIdGuid = Guid.Empty;`
`321`	`321`
`322`	`322`	`if (string.IsNullOrWhiteSpace(tenantIdStr) \|\| !Guid.TryParse(tenantIdStr, out tenantIdGuid))`