Skip to content

Commit

Permalink
Fix pnp#3717 - Added support for custom environment in App registration
Browse files Browse the repository at this point in the history
  • Loading branch information
Gautam Sheth committed Feb 17, 2024
1 parent fe1bd8b commit f2c5913
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 21 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
- Fixed `Get-PnPPowerPlatformConnector`, `Get-PnPPowerPlatformEnvironment`, `Get-PnPPowerApp`, `Add-PnPFlowOwner`, `Disable-PnPFlow`, `Enable-PnPFlow`, `Export-PnPFlow`, `Get-PnPFlowOwner`, `Get-PnPFlowRun`, `Remove-PnPFlow`, `Remove-PnPFlowOwner` , `Restart-PnPFlow` and `Stop-PnPFlowRun` cmdlets to use the new HTTP endpoints. [#3687](https://github.com/pnp/powershell/pull/3687)
- Fixed `Add-PnPHubSiteAssociation` cmdlet to allow support for multi-geo scenario. [#3568](https://github.com/pnp/powershell/pull/3568)
- Fixed `Enable/Disable-PnPPageScheduling` cmdlet to also work with Viva connections enabled site. [#3713](https://github.com/pnp/powershell/pull/3713)
- Fixed `Register-PnPManagementShellAccess` and `Register-PnPAzureADApp` cmdlets to also work with custom environment.

### Changed

Expand Down
33 changes: 29 additions & 4 deletions src/Commands/AzureAD/RegisterAzureADApp.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,14 @@ private X509Certificate2 GetCertificate(PSObject record)
private bool AppExists(string appName, HttpClient httpClient, string token)
{
Host.UI.Write(ConsoleColor.Yellow, Host.UI.RawUI.BackgroundColor, $"Checking if application '{appName}' does not exist yet...");
var azureApps = RestHelper.GetAsync<RestResultCollection<AzureADApp>>(httpClient, $@"https://{PnP.Framework.AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}/v1.0/applications?$filter=displayName eq '{appName}'&$select=Id", token).GetAwaiter().GetResult();

var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}";
if (AzureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}

var azureApps = RestHelper.GetAsync<RestResultCollection<AzureADApp>>(httpClient, $"{graphEndpoint}/v1.0/applications?$filter=displayName eq '{appName}'&$select=Id", token).GetAwaiter().GetResult();
if (azureApps != null && azureApps.Items.Any())
{
Host.UI.WriteLine();
Expand Down Expand Up @@ -571,7 +578,13 @@ private AzureADApp CreateApp(string loginEndPoint, HttpClient httpClient, string
requiredResourceAccess = scopesPayload
};

var azureApp = RestHelper.PostAsync<AzureADApp>(httpClient, $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}/v1.0/applications", token, payload).GetAwaiter().GetResult();
var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}";
if (AzureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}

var azureApp = RestHelper.PostAsync<AzureADApp>(httpClient, $"{graphEndpoint}/v1.0/applications", token, payload).GetAwaiter().GetResult();
if (azureApp != null)
{
Host.UI.WriteLine(ConsoleColor.Yellow, Host.UI.RawUI.BackgroundColor, $"App {azureApp.DisplayName} with id {azureApp.AppId} created.");
Expand All @@ -583,7 +596,13 @@ private void StartConsentFlow(string loginEndPoint, AzureADApp azureApp, string
{
//Host.UI.WriteLine(ConsoleColor.Yellow, Host.UI.RawUI.BackgroundColor, $"Starting consent flow.");

var resource = scopes.FirstOrDefault(s => s.resourceAppId == PermissionScopes.ResourceAppId_Graph) != null ? $"https://{AzureAuthHelper.GetGraphEndPoint(AzureEnvironment)}/.default" : "https://microsoft.sharepoint-df.com/.default";
var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}";
if (AzureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}

var resource = scopes.FirstOrDefault(s => s.resourceAppId == PermissionScopes.ResourceAppId_Graph) != null ? $"{graphEndpoint}/.default" : "https://microsoft.sharepoint-df.com/.default";

var consentUrl = $"{loginEndPoint}/{Tenant}/v2.0/adminconsent?client_id={azureApp.AppId}&scope={resource}&redirect_uri={redirectUri}";

Expand Down Expand Up @@ -658,7 +677,13 @@ private void SetLogo(AzureADApp azureApp, string token)
{
WriteVerbose("Setting the logo for the Azure AD app");

var endpoint = $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}/v1.0/applications/{azureApp.Id}/logo";
var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}";
if (AzureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}

var endpoint = $"{graphEndpoint}/v1.0/applications/{azureApp.Id}/logo";

var bytes = File.ReadAllBytes(LogoFilePath);

Expand Down
18 changes: 10 additions & 8 deletions src/Commands/AzureAD/RegisterManagementShellAccess.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using PnP.Framework;
using PnP.PowerShell.Commands.Base;
using PnP.PowerShell.Commands.Utilities;
using System;
using System.Collections.Generic;
using System.Management.Automation;
using System.Net.Http;
Expand Down Expand Up @@ -50,6 +51,12 @@ protected override void ProcessRecord()
WriteWarning("Please specify the Tenant name for non-commercial clouds, otherwise this operation will fail.");
}

var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(AzureEnvironment)}";
if (AzureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}

Task.Factory.StartNew(() =>
{
if (ParameterSetName == ParameterSet_REGISTER)
Expand All @@ -64,7 +71,7 @@ protected override void ProcessRecord()
{
try
{
authManager.GetAccessTokenAsync(new[] { $"https://{GetGraphEndPoint()}/.default" }, source.Token, Microsoft.Identity.Client.Prompt.Consent).GetAwaiter().GetResult();
authManager.GetAccessTokenAsync(new[] { $"{graphEndpoint}/.default" }, source.Token, Microsoft.Identity.Client.Prompt.Consent).GetAwaiter().GetResult();
}
catch (Microsoft.Identity.Client.MsalException)
{
Expand All @@ -91,7 +98,7 @@ protected override void ProcessRecord()
var accessToken = string.Empty;
try
{
accessToken = authManager.GetAccessTokenAsync(new[] { $"https://{GetGraphEndPoint()}/.default" }, source.Token).GetAwaiter().GetResult();
accessToken = authManager.GetAccessTokenAsync(new[] { $"{graphEndpoint}/.default" }, source.Token).GetAwaiter().GetResult();
}
catch (Microsoft.Identity.Client.MsalException)
{
Expand All @@ -100,7 +107,7 @@ protected override void ProcessRecord()
if (!string.IsNullOrEmpty(accessToken))
{
var httpClient = Framework.Http.PnPHttpClient.Instance.GetHttpClient();
using (var requestMessage = new HttpRequestMessage(HttpMethod.Get, $"https://{GetGraphEndPoint()}/v1.0/organization"))
using (var requestMessage = new HttpRequestMessage(HttpMethod.Get, $"{graphEndpoint}/v1.0/organization"))
{
requestMessage.Version = new System.Version(2, 0);
requestMessage.Headers.Add("Authorization", $"Bearer {accessToken}");
Expand Down Expand Up @@ -142,10 +149,5 @@ protected override void StopProcessing()
{
source.Cancel();
}

private string GetGraphEndPoint()
{
return PnP.Framework.AuthenticationManager.GetGraphEndPoint(AzureEnvironment);
}
}
}
28 changes: 19 additions & 9 deletions src/Commands/Utilities/AzureAuthHelper.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ internal static async Task<string> AuthenticateAsync(string tenantId, string use

using (var authManager = PnP.Framework.AuthenticationManager.CreateWithCredentials(username, password, azureEnvironment))
{
return await authManager.GetAccessTokenAsync(new[] { $"https://{GetGraphEndPoint(azureEnvironment)}/.default" });
var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(azureEnvironment)}";
if (azureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}
return await authManager.GetAccessTokenAsync(new[] { $"{graphEndpoint}/.default" });
}
}

Expand All @@ -46,7 +51,12 @@ internal static string AuthenticateDeviceLogin(CancellationTokenSource cancellat
authManager.ClearTokenCache();
try
{
return authManager.GetAccessTokenAsync(new string[] { $"https://{GetGraphEndPoint(azureEnvironment)}/.default" }, cancellationTokenSource.Token).GetAwaiter().GetResult();
var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(azureEnvironment)}";
if (azureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}
return authManager.GetAccessTokenAsync(new string[] { $"{graphEndpoint}/.default" }, cancellationTokenSource.Token).GetAwaiter().GetResult();
}
catch (Microsoft.Identity.Client.MsalException)
{
Expand Down Expand Up @@ -78,7 +88,12 @@ internal static string AuthenticateInteractive(CancellationTokenSource cancellat
authManager.ClearTokenCache();
try
{
return authManager.GetAccessTokenAsync(new string[] { $"https://{GetGraphEndPoint(azureEnvironment)}/.default" }, cancellationTokenSource.Token).GetAwaiter().GetResult();
var graphEndpoint = $"https://{AuthenticationManager.GetGraphEndPoint(azureEnvironment)}";
if (azureEnvironment == AzureEnvironment.Custom)
{
graphEndpoint = Environment.GetEnvironmentVariable("MicrosoftGraphEndPoint", EnvironmentVariableTarget.Process);
}
return authManager.GetAccessTokenAsync(new string[] { $"{graphEndpoint}/.default" }, cancellationTokenSource.Token).GetAwaiter().GetResult();
}
catch (Microsoft.Identity.Client.MsalException)
{
Expand All @@ -91,11 +106,6 @@ internal static string AuthenticateInteractive(CancellationTokenSource cancellat
cancellationTokenSource.Cancel();
}
return null;
}

internal static string GetGraphEndPoint(AzureEnvironment azureEnvironment)
{
return PnP.Framework.AuthenticationManager.GetGraphEndPoint(azureEnvironment);
}
}
}
}

0 comments on commit f2c5913

Please sign in to comment.