Merge pull request #2797 from KoenZomers/MakeUseWebLoginFaster

Optimizing login speed with Connect-PnPOnline -UseWebLogin
pnp · Sep 6, 2020 · 6f82efe · 6f82efe
2 parents c809888 + 64cbe6d
commit 6f82efe
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Commands/Base/PnPConnectionHelper.cs b/Commands/Base/PnPConnectionHelper.cs
@@ -529,7 +529,16 @@ internal static PnPConnection InstantiateWebloginConnection(Uri url, int minimal
         {
             using (var authManager = new OfficeDevPnP.Core.AuthenticationManager())
             {
-                var context = PnPClientContext.ConvertFrom(authManager.GetWebLoginClientContext(url.ToString()), retryCount, retryWait * 1000);
+                // Log in to a specific page on the tenant which is known to be performant
+                var webLoginClientContext = authManager.GetWebLoginClientContext(url.ToString(), loginRequestUri: new Uri(url, "/_layouts/15/settings.aspx"));
+
+                // Ensure the login process has been completed
+                if(webLoginClientContext == null)
+                {
+                    return null;
+                }
+
+                var context = PnPClientContext.ConvertFrom(webLoginClientContext, retryCount, retryWait * 1000);
 
                 if (context != null)
                 {