Unified directory tenant ID retrieval

Author: MatthewMcGlynn

ComputeAdmin/README.md

@@ -40,7 +40,7 @@ As a prerequisite, you need to obtain the Windows Server 2016 Evaluation ISO whi
 You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
 An example usage is the following:
@@ -74,7 +74,7 @@ Please note that to use this image for **installing additional Azure Stack servi
 You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
 ```powershell
@@ -97,7 +97,7 @@ Run the below command to remove an uploaded VM image. After removal, tenants wil
 You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
 ```powershell
@@ -110,7 +110,7 @@ Note: This cmdlet will remove the associated Marketplace item unless the -KeepMa
 You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 An example usage is the following:
 
@@ -125,7 +125,7 @@ Add-VMExtension -publisher "Publisher" -type "Type" -version $version -extension
 You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external"
 ```
 Run the below command to remove an uploaded VM extension.
 
@@ -147,7 +147,7 @@ VM Scale Set allows deployment of multi-VM collections. To add a gallery item wi
 $Tenant = "<AAD Tenant Id used to connect to AzureStack>"
 $Arm = "<AzureStack administrative Azure Resource Manager endpoint URL>"
 
-Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint $Arm -AadTenant $Tenant
+Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint $Arm 
 
 $Password = ConvertTo-SecureString -AsPlainText -Force "<your AzureStack admin user password>"
 $User = "<your AzureStack admin user name>"

Connect/AzureStack.Connect.psm1

@@ -370,3 +370,33 @@ function Get-AADTenantGUID () {
 } 
 
 Export-ModuleMember Get-AADTenantGUID
+
+function Get-DirectoryTenantID () {
+    [CmdletBinding(DefaultParameterSetName='AzureActiveDirectory')]
+    param(
+        [Parameter(Mandatory=$true, ParameterSetName='ADFS')]
+        [switch] $ADFS,
+
+        [parameter(mandatory=$true,ParameterSetName='AzureActiveDirectory', HelpMessage="AAD Directory Tenant <myaadtenant.onmicrosoft.com>")]
+        [string] $AADTenantName = "",
+
+        [Parameter(Mandatory=$true, ParameterSetName='ADFS')]
+        [Parameter(Mandatory=$true, ParameterSetName='AzureActiveDirectory')]
+        [string] $EnvironmentName
+    )
+    
+    $ADauth = (Get-AzureRmEnvironment -Name $EnvironmentName).ActiveDirectoryAuthority
+    if($ADFS -eq $true){
+        if(-not (Get-AzureRmEnvironment -Name $EnvironmentName).EnableAdfsAuthentication){
+            Write-Error "This environment is not configured to do ADFS authentication." -ErrorAction Stop
+        }
+        return $(Invoke-RestMethod $("{0}/.well-known/openid-configuration" -f $ADauth.TrimEnd('/'))).issuer.TrimEnd('/').Split('/')[-1]
+    }else{
+        $endpt = "{0}{1}/.well-known/openid-configuration" -f $ADauth, $AADTenantName
+        $OauthMetadata = (Invoke-WebRequest -UseBasicParsing $endpt).Content | ConvertFrom-Json
+        $AADid = $OauthMetadata.Issuer.Split('/')[3]
+        $AADid
+    }
+} 
+
+Export-ModuleMember Get-DirectoryTenantID

Connect/README.md

@@ -89,13 +89,13 @@ $AadTenant = Get-AzureStackAadTenant  -HostComputer <Host IP Address> -Password
 To target your Azure Stack instance as a tenant, an AzureRM environment needs to be registered as follows. The ARM endpoint below is the tenant default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name AzureStack -ArmEndpoint "https://management.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name AzureStack -ArmEndpoint "https://management.local.azurestack.external" 
 ```
 
 To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name AzureStackAdmin -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
 After registering the AzureRM environment, cmdlets can be easily targeted at your Azure Stack instance. For example:

Infrastructure/README.md

@@ -21,7 +21,7 @@ Import-Module .\AzureStack.Infra.psm1
 Import-Module .\AzureStack.Connect.psm1
 $Password = ConvertTo-SecureString "<Admin password provided when deploying Azure Stack>" -AsPlainText -Force
 $AadTenant = Get-AzureStackAadTenant  -HostComputer <Host IP Address> -Password $Password
-Add-AzureStackAzureRmEnvironment -AadTenant $AadTenant -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external"
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external"
 Login-AzureRmAccount -EnvironmentName "AzureStackAdmin" -TenantId $AadTenant
 ```
 

ServiceAdmin/README.md

@@ -37,7 +37,7 @@ $AadTenant = Get-AzureStackAadTenant  -HostComputer <Host IP Address> -Password
 You will need to reference your Azure Stack Administrator environment. To create an administrator environment use the below. The ARM endpoint below is the administrator default for a one-node environment.
 
 ```powershell
-Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" -AadTenant $aadTenant
+Add-AzureStackAzureRmEnvironment -Name "AzureStackAdmin" -ArmEndpoint "https://adminmanagement.local.azurestack.external" 
 ```
 
 ```powershell