updated to align w/ AADAuthenticationFactory beta

GreyCorbel · Jul 31, 2023 · df23d69 · df23d69
1 parent 79db87f
commit df23d69
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/Publish-CosmosLite.yml b/.github/workflows/Publish-CosmosLite.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Install prerequisites
       shell: pwsh
       run: |
-        Install-Module AadAuthenticationFactory -Force -Scope CurrentUser
+        Install-Module AadAuthenticationFactory -AllowPrerelease -Force -Scope CurrentUser
       
     - name: Publish
       #Publish to PS Gallery

diff --git a/Commands/Public/Connect-Cosmos.ps1 b/Commands/Public/Connect-Cosmos.ps1
@@ -95,10 +95,11 @@ function Connect-Cosmos
         $ResourceOwnerCredential,
 
         [Parameter()]
+        [ValidateSet('AzurePublic', 'AzureGermany', 'AzureChina','AzureUsGovernment','None')]
         [string]
             #AAD auth endpoint
             #Default: endpoint for public cloud
-        $LoginApi = 'https://login.microsoftonline.com',
+        $AzureCloudInstance = 'AzurePublic',
 
         [Parameter(Mandatory, ParameterSetName = 'PublicClient')]
         [ValidateSet('Interactive', 'DeviceCode')]
@@ -156,15 +157,15 @@ function Connect-Cosmos
                 switch($PSCmdlet.ParameterSetName)
                 {
                     'PublicClient' {
-                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -RequiredScopes $RequiredScopes -LoginApi $LoginApi -AuthMode $AuthMode -UserNameHint $UserNameHint
+                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -RequiredScopes $RequiredScopes -AzureCloudInstance $AzureCloudInstance -AuthMode $AuthMode -UserNameHint $UserNameHint
                         break;
                     }
                     'ConfidentialClientWithSecret' {
-                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -ClientSecret $clientSecret -RequiredScopes $RequiredScopes -LoginApi $LoginApi
+                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -ClientSecret $clientSecret -RequiredScopes $RequiredScopes -AzureCloudInstance $AzureCloudInstance
                         break;
                     }
                     'ConfidentialClientWithCertificate' {
-                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -X509Certificate $X509Certificate -RequiredScopes $RequiredScopes -LoginApi $LoginApi
+                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -X509Certificate $X509Certificate -RequiredScopes $RequiredScopes -AzureCloudInstance $AzureCloudInstance
                         break;
                     }
                     'MSI' {
@@ -180,7 +181,7 @@ function Connect-Cosmos
                         break;
                     }
                     'ResourceOwnerPasssword' {
-                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -ClientSecret $clientSecret -RequiredScopes $RequiredScopes -LoginApi $LoginApi -ResourceOwnerCredential $ResourceOwnerCredential
+                        $script:AuthFactories[$AccountName] = New-AadAuthenticationFactory -TenantId $TenantId -ClientId $ClientId -ClientSecret $clientSecret -RequiredScopes $RequiredScopes -AzureCloudInstance $AzureCloudInstance -ResourceOwnerCredential $ResourceOwnerCredential
                         break;
                     }
                 }

diff --git a/Module/CosmosLite/CosmosLite.psd1 b/Module/CosmosLite/CosmosLite.psd1