Merge pull request #2858 from pnp/dev

August 2020 Point Release

Author: erwinvanhunen

Binaries/SharePointPnP.Modernization.Framework.dll

@@ -5,6 +5,22 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [3.25.2009.0]
+
+### Added
+- Added -AzureEnvironment parameter to `Initialize-PnPPowerShellAuthentication` to create an Azure AD App in other Azure environments than the default one. 
+- Added -AzureEnvironment parameter to all Connect-PnPOnline options which result in an OAuth based authentication connection, supporting the various Azure Environments available. 
+
+### Changed
+- Fixed issue with Submit-PnPTeamsChannelMessage not posting HTML message when setting the content type to Html.
+- The content type that Submit-PnPTeamsChannelMessage uses defaults now to HTML.
+- Fixed an issue with the PnP Provisioning Engine not being able to correctly acquire a token for the Microsoft Graph when provisioning a tenant template containing a Team.
+- Optimized Submit-PnPSearchQuery and Get-PnPSiteSearchQueryResults cmdlets when using the -All parameter.
+- Fixed TrimDuplicates to be default off for Submit-PnPSearchQuery
+
+### Contributors
+
+
 ## [3.24.2008.0]
 
 ### Added

Binaries/release/SharePointPnP.Modernization.Framework.dll

@@ -522,6 +522,9 @@ public class ConnectOnline : BasePSCmdlet
         [Parameter(Mandatory = false, ParameterSetName = ParameterSet_APPONLYAADCER, HelpMessage = "The Azure environment to use for authentication, the defaults to 'Production' which is the main Azure environment.")]
         [Parameter(Mandatory = false, ParameterSetName = ParameterSet_TOKEN, HelpMessage = "The Azure environment to use for authentication, the defaults to 'Production' which is the main Azure environment.")]
         [Parameter(Mandatory = false, ParameterSetName = ParameterSet_APPONLYCLIENTIDCLIENTSECRETURL, HelpMessage = "The Azure environment to use for authentication, the defaults to 'Production' which is the main Azure environment.")]
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_AADWITHSCOPE, HelpMessage = "The Azure environment to use for authentication, the defaults to 'Production' which is the main Azure environment.")]
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_DEVICELOGIN, HelpMessage = "The Azure environment to use for authentication, the defaults to 'Production' which is the main Azure environment.")]
+        [Parameter(Mandatory = false, ParameterSetName = ParameterSet_GRAPHDEVICELOGIN, HelpMessage = "The Azure environment to use for authentication, the defaults to 'Production' which is the main Azure environment.")]
         public AzureEnvironment AzureEnvironment = AzureEnvironment.Production;
 
         [Parameter(Mandatory = true, ParameterSetName = ParameterSet_AADWITHSCOPE, HelpMessage = "The array of permission scopes to request from Azure Active Directory")]
@@ -710,7 +713,7 @@ protected void Connect()
                     break;
 
                 case ParameterSet_AADWITHSCOPE:
-                    connection = ConnectAadWithScope(credentials);
+                    connection = ConnectAadWithScope(credentials, AzureEnvironment);
                     break;
                 case ParameterSet_ACCESSTOKEN:
                     connection = ConnectAccessToken();
@@ -889,7 +892,7 @@ private PnPConnection ConnectDeviceLogin()
             {
                 Url += "/";
             }
-            var connection = PnPConnectionHelper.InstantiateDeviceLoginConnection(Url, LaunchBrowser, MinimalHealthScore, RetryCount, RetryWait, RequestTimeout, TenantAdminUrl, Host, NoTelemetry);
+            var connection = PnPConnectionHelper.InstantiateDeviceLoginConnection(Url, LaunchBrowser, MinimalHealthScore, RetryCount, RetryWait, RequestTimeout, TenantAdminUrl, Host, NoTelemetry, AzureEnvironment);
 
             if (Host.Name == "ConsoleHost")
             {
@@ -939,7 +942,7 @@ private PnPConnection ConnectGraphDeviceLogin(string accessToken)
                         }
                     }
                     return false;
-                }, Host, NoTelemetry);
+                }, Host, NoTelemetry, AzureEnvironment);
                 if (Host.Name == "ConsoleHost")
                 {
                     Console.TreatControlCAsInput = ctrlCAsInput;
@@ -1076,7 +1079,7 @@ private PnPConnection ConnectAppOnlyAadCer()
         /// </summary>
         /// <param name="credentials">Credentials to authenticate with for delegated access or NULL for application permissions</param>
         /// <returns>PnPConnection based on the parameters provided in the parameter set</returns>
-        private PnPConnection ConnectAadWithScope(PSCredential credentials)
+        private PnPConnection ConnectAadWithScope(PSCredential credentials, AzureEnvironment azureEnvironment)
         {
 #if !ONPREMISES
             // Filter out the scopes for the Microsoft Office 365 Management API
@@ -1100,7 +1103,7 @@ private PnPConnection ConnectAadWithScope(PSCredential credentials)
                 //    TokenManager.InitializeAsync(TokenManager.CLIENTID_PNPMANAGEMENTSHELL, officeManagementApiScopes.Select(s => $"https://manage.office.com/{s}").ToArray(), credentials.UserName, credentials.Password, cacheIdentifierName: "OfficeManagementApi").GetAwaiter().GetResult();
                 //}
 
-                var officeManagementApiToken = credentials == null ? OfficeManagementApiToken.AcquireApplicationTokenInteractive(PnPConnection.PnPManagementShellClientId, officeManagementApiScopes) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(PnPConnection.PnPManagementShellClientId, officeManagementApiScopes, credentials.UserName, credentials.Password);
+                var officeManagementApiToken = credentials == null ? OfficeManagementApiToken.AcquireApplicationTokenInteractive(PnPConnection.PnPManagementShellClientId, officeManagementApiScopes, azureEnvironment) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(PnPConnection.PnPManagementShellClientId, officeManagementApiScopes, credentials.UserName, credentials.Password, azureEnvironment);
 #else
                 var officeManagementApiToken = credentials == null ? OfficeManagementApiToken.AcquireApplicationTokenDeviceLogin(PnPConnection.PnPManagementShellClientId, officeManagementApiScopes, PnPConnection.DeviceLoginCallback(this.Host, true)) : OfficeManagementApiToken.AcquireDelegatedTokenWithCredentials(PnPConnection.PnPManagementShellClientId, officeManagementApiScopes, credentials.UserName, credentials.Password);
 #endif
@@ -1111,7 +1114,7 @@ private PnPConnection ConnectAadWithScope(PSCredential credentials)
             if (graphScopes.Length > 0)
             {
 #if !PNPPSCORE
-                var graphToken = credentials == null ? GraphToken.AcquireApplicationTokenInteractive(PnPConnection.PnPManagementShellClientId, graphScopes) : GraphToken.AcquireDelegatedTokenWithCredentials(PnPConnection.PnPManagementShellClientId, graphScopes, credentials.UserName, credentials.Password);
+                var graphToken = credentials == null ? GraphToken.AcquireApplicationTokenInteractive(PnPConnection.PnPManagementShellClientId, graphScopes, azureEnvironment) : GraphToken.AcquireDelegatedTokenWithCredentials(PnPConnection.PnPManagementShellClientId, graphScopes, credentials.UserName, credentials.Password, azureEnvironment);
 #else
                 var graphToken = credentials == null ? GraphToken.AcquireApplicationTokenDeviceLogin(PnPConnection.PnPManagementShellClientId, graphScopes, PnPConnection.DeviceLoginCallback(this.Host, true)) : GraphToken.AcquireDelegatedTokenWithCredentials(PnPConnection.PnPManagementShellClientId, graphScopes, credentials.UserName, credentials.Password);
 #endif
@@ -1341,6 +1344,11 @@ private PnPConnection ConnectCredentials(PSCredential credentials)
                                                                      RequestTimeout,
                                                                      TenantAdminUrl,
                                                                      NoTelemetry,
+#if !ONPREMISES
+                                                                     AzureEnvironment,
+#else
+                                                                     AzureEnvironment.Production,
+#endif
                                                                      SkipTenantAdminCheck,
                                                                      AuthenticationMode);
 #else

CHANGELOG.md

@@ -1,4 +1,5 @@
 #if !ONPREMISES && !PNPPSCORE
+using OfficeDevPnP.Core;
 using OfficeDevPnP.Core.Utilities;
 using PnP.PowerShell.CmdletHelpAttributes;
 using PnP.PowerShell.Commands.Model;
@@ -87,10 +88,18 @@ public class InitializePowerShellAuthentication : BasePSCmdlet, IDynamicParamete
         [Parameter(Mandatory = false, HelpMessage = "Local Certificate Store to add the certificate to", ParameterSetName = ParameterSet_NEWCERT)]
         public StoreLocation Store;
 
+        [Parameter(Mandatory = false, HelpMessage = "Specify the Azure environment to use to setup the Azure AD app. Defaults to 'Production'.")]
+        public AzureEnvironment AzureEnvironment = AzureEnvironment.Production;
+
         protected override void ProcessRecord()
         {
+            var loginEndPoint = string.Empty;
             var record = new PSObject();
-            var token = AzureAuthHelper.AuthenticateAsync(Tenant).GetAwaiter().GetResult();
+            using (var authenticationManager = new AuthenticationManager())
+            {
+                loginEndPoint = authenticationManager.GetAzureADLoginEndPoint(AzureEnvironment);
+            }
+            var token = AzureAuthHelper.AuthenticateAsync(Tenant, loginEndPoint).GetAwaiter().GetResult();
 
             var cert = new X509Certificate2();
             if (ParameterSetName == ParameterSet_EXISTINGCERT)
@@ -104,7 +113,7 @@ protected override void ProcessRecord()
                 if (ParameterSpecified(nameof(CertificatePassword)))
                 {
                     try
-                    { 
+                    {
                         cert.Import(CertificatePath, CertificatePassword, X509KeyStorageFlags.Exportable);
                     }
                     catch (CryptographicException e) when (e.Message.Contains("The specified network password is not correct"))
@@ -118,7 +127,7 @@ protected override void ProcessRecord()
                     {
                         cert.Import(CertificatePath);
                     }
-                    catch(CryptographicException e) when (e.Message.Contains("The specified network password is not correct"))
+                    catch (CryptographicException e) when (e.Message.Contains("The specified network password is not correct"))
                     {
                         throw new PSArgumentNullException(nameof(CertificatePassword), string.Format(Resources.PrivateKeyCertificateImportFailedPasswordMissing, nameof(CertificatePassword)));
                     }
@@ -177,7 +186,7 @@ protected override void ProcessRecord()
                 }
                 if (ParameterSpecified(nameof(Store)))
                 {
-                    using (var store = new X509Store("My",Store))
+                    using (var store = new X509Store("My", Store))
                     {
                         store.Open(OpenFlags.ReadWrite);
                         store.Add(cert);
@@ -228,7 +237,7 @@ protected override void ProcessRecord()
                     publicClient = new
                     {
                         redirectUris = new[] {
-                        "https://login.microsoftonline.com/common/oauth2/nativeclient",
+                            $"{loginEndPoint}/common/oauth2/nativeclient"
                         }
                     },
                     requiredResourceAccess = scopesPayload
@@ -239,9 +248,9 @@ protected override void ProcessRecord()
 
                 var waitTime = 60;
                 Host.UI.Write(ConsoleColor.Yellow, Host.UI.RawUI.BackgroundColor, $"Waiting {waitTime} seconds to launch consent flow in a browser window. This wait is required to make sure that Azure AD is able to initialize all required artifacts.");
-                
+
                 Console.TreatControlCAsInput = true;
-               
+
                 for (var i = 0; i < waitTime; i++)
                 {
                     Host.UI.Write(ConsoleColor.Yellow, Host.UI.RawUI.BackgroundColor, ".");
@@ -251,24 +260,24 @@ protected override void ProcessRecord()
                     if (Host.UI.RawUI.KeyAvailable)
                     {
                         var key = Host.UI.RawUI.ReadKey(ReadKeyOptions.AllowCtrlC | ReadKeyOptions.NoEcho | ReadKeyOptions.IncludeKeyUp);
-                        if((key.ControlKeyState.HasFlag(ControlKeyStates.LeftCtrlPressed) || key.ControlKeyState.HasFlag(ControlKeyStates.RightCtrlPressed)) && key.VirtualKeyCode == 67)
+                        if ((key.ControlKeyState.HasFlag(ControlKeyStates.LeftCtrlPressed) || key.ControlKeyState.HasFlag(ControlKeyStates.RightCtrlPressed)) && key.VirtualKeyCode == 67)
                         {
-                            
+
                             break;
                         }
                     }
                 }
                 Host.UI.WriteLine();
 
-                var consentUrl = $"https://login.microsoftonline.com/{Tenant}/v2.0/adminconsent?client_id={azureApp.AppId}&scope=https://microsoft.sharepoint-df.com/.default";
+                var consentUrl = $"{loginEndPoint}/{Tenant}/v2.0/adminconsent?client_id={azureApp.AppId}&scope=https://microsoft.sharepoint-df.com/.default";
                 record.Properties.Add(new PSVariableProperty(new PSVariable("Certificate Thumbprint", cert.GetCertHashString())));
 
                 WriteObject(record);
 
                 AzureAuthHelper.OpenConsentFlow(consentUrl, (message) =>
                 {
                     Host.UI.WriteLine(ConsoleColor.Red, Host.UI.RawUI.BackgroundColor, message);
-                });                
+                });
             }
         }