Skip to content
This repository was archived by the owner on Sep 22, 2023. It is now read-only.

[WIP] Add Azure region to support regional ESTS-r #71

Open
faix wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[WIP] Add Azure region to support regional ESTS-r #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2eeb4e6
Adding AzureRegion parameter
faix Jun 6, 2023
0f49977
invoke withazureregion
faix Jun 6, 2023
28e0dcb
update Msal version
faix Jun 20, 2023
b230273
Limit region parameter
faix Jun 20, 2023
dd1e346
confidentialclientsecret not supported in regional
faix Jun 20, 2023
3188142
confidentialclientsecret not supported in regional
faix Jun 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Identity.Client" version="4.37.0" />
<package id="Microsoft.Identity.Client.Desktop" version="4.37.0" />
<package id="Microsoft.Identity.Client" version="4.54.1" />
<package id="Microsoft.Identity.Client.Desktop" version="4.54.1" />
<package id="Microsoft.Web.WebView2" version="1.0.864.35" />
<!-- <package id="System.Security.Cryptography.ProtectedData" version="4.7.0" /> -->
</packages>
10 changes: 9 additions & 1 deletion src/Get-MsalToken.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function Get-MsalToken {
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate', Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-AuthorizationCode', Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-OnBehalfOf', Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-Regional', Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[string] $ClientId,

# Secure secret of the client requesting the token.
Expand All @@ -48,13 +49,15 @@ function Get-MsalToken {
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-AuthorizationCode', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-OnBehalfOf', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-Regional', ValueFromPipelineByPropertyName = $true)]
[System.Security.Cryptography.X509Certificates.X509Certificate2] $ClientCertificate,

# Specifies if the x5c claim (public key of the certificate) should be sent to the STS.
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClient-InputObject')]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate')]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate-AuthorizationCode')]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate-OnBehalfOf')]
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-Regional')]
[switch] $SendX5C,

# The authorization code received from service authorization endpoint.
Expand Down Expand Up @@ -88,6 +91,7 @@ function Get-MsalToken {
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate-AuthorizationCode', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate-OnBehalfOf', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate-Regional', ValueFromPipelineByPropertyName = $true)]
[uri] $RedirectUri,

# Instance of Azure Cloud
Expand Down Expand Up @@ -201,7 +205,11 @@ function Get-MsalToken {

# Specifies the timeout threshold for MSAL.net operations.
[Parameter(Mandatory = $false)]
[timespan] $Timeout
[timespan] $Timeout,

# Specifies the Azure region to use for token acquisition.
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClientCertificate-Regional', ValueFromPipelineByPropertyName = $true)]
[string] $AzureRegion
)

begin {
Expand Down
2 changes: 1 addition & 1 deletion src/MSAL.PS.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
RootModule = 'MSAL.PS.psm1'

# Version number of this module.
ModuleVersion = '4.37.0'
ModuleVersion = '4.54.1'

# Supported PSEditions
CompatiblePSEditions = 'Core','Desktop'
Expand Down
9 changes: 7 additions & 2 deletions src/New-MsalClientApplication.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,12 @@ function New-MsalClientApplication {
[Microsoft.Identity.Client.PublicClientApplicationOptions] $PublicClientOptions,
# Confidential client application options
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClient-InputObject', Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[Microsoft.Identity.Client.ConfidentialClientApplicationOptions] $ConfidentialClientOptions
[Microsoft.Identity.Client.ConfidentialClientApplicationOptions] $ConfidentialClientOptions,
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientClaims', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientAssertion', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClient-InputObject', ValueFromPipelineByPropertyName = $true)]
[string] $AzureRegion
)

switch -Wildcard ($PSCmdlet.ParameterSetName) {
Expand Down Expand Up @@ -127,7 +132,7 @@ function New-MsalClientApplication {
if ($ClientClaims) { [void] $ClientApplicationBuilder.WithClientClaims($ClientCertificate, (ConvertTo-Dictionary $ClientClaims -KeyType ([string]) -ValueType ([string]))) }
elseif ($ClientCertificate) { [void] $ClientApplicationBuilder.WithCertificate($ClientCertificate) }
if ($RedirectUri) { [void] $ClientApplicationBuilder.WithRedirectUri($RedirectUri.AbsoluteUri) }

if ($AzureRegion) { [void] $ClientApplicationBuilder.WithAzureRegion($AzureRegion) }
$ClientOptions = $ConfidentialClientOptions
}
"*" {
Expand Down
6 changes: 5 additions & 1 deletion src/Select-MsalClientApplication.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,11 @@ function Select-MsalClientApplication {
[Microsoft.Identity.Client.PublicClientApplicationOptions] $PublicClientOptions,
# Confidential client application options
[Parameter(Mandatory = $true, ParameterSetName = 'ConfidentialClient-InputObject', Position = 0, ValueFromPipeline = $true, ValueFromPipelineByPropertyName = $true)]
[Microsoft.Identity.Client.ConfidentialClientApplicationOptions] $ConfidentialClientOptions
[Microsoft.Identity.Client.ConfidentialClientApplicationOptions] $ConfidentialClientOptions,
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientSecret', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClientCertificate', ValueFromPipelineByPropertyName = $true)]
[Parameter(Mandatory = $false, ParameterSetName = 'ConfidentialClient-InputObject', ValueFromPipelineByPropertyName = $true)]
[string] $AzureRegion = [Microsoft.Identity.Client.ConfidentialClientApplication]::AttemptRegionDiscovery
)

$paramNewMsalClientApplication = Select-PsBoundParameters $PSBoundParameters -CommandName New-MsalClientApplication -ExcludeParameters ErrorAction
Expand Down