Merge pull request #2099 from SharePoint/dev

May 2019 Intermediate Release 3
pnp · May 22, 2019 · c55dc05 · c55dc05
2 parents 1854f9d + d814c32
commit c55dc05
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 10 deletions.
diff --git a/Binaries/SharePointPnP.Modernization.Framework.dll b/Binaries/SharePointPnP.Modernization.Framework.dll
diff --git a/Binaries/release/SharePointPnP.Modernization.Framework.dll b/Binaries/release/SharePointPnP.Modernization.Framework.dll
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ 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.9.1905.3 - May 2019 Intermediate Release 3]
+
+### Changed
+- Updatd core provisioning to handle token issue during extraction and reintroduced content type fieldlink reordering in the engine.
+
 ## [3.9.1905.2 - May 2019 Intermediate Release 2]
 
 ### Changed

diff --git a/Commands/Properties/AssemblyInfo.cs b/Commands/Properties/AssemblyInfo.cs
@@ -48,6 +48,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.9.1905.2")]
-[assembly: AssemblyFileVersion("3.9.1905.2")]
+[assembly: AssemblyVersion("3.9.1905.3")]
+[assembly: AssemblyFileVersion("3.9.1905.3")]
 [assembly: InternalsVisibleTo("SharePointPnP.PowerShell.Tests")]
diff --git a/Commands/Provisioning/Tenant/ApplyTenantTemplate.cs b/Commands/Provisioning/Tenant/ApplyTenantTemplate.cs
@@ -13,6 +13,7 @@
 using System.IO;
 using System.Linq;
 using System.Management.Automation;
+using System.Threading.Tasks;
 
 namespace SharePointPnP.PowerShell.Commands.Provisioning.Tenant
 {
@@ -256,22 +257,85 @@ protected override void ExecuteCmdlet()
                     }
                 }
             }
-            if (!string.IsNullOrEmpty(SequenceId))
+#if !ONPREMISES
+            using (var provisioningContext = new PnPProvisioningContext((resource, scope) =>
             {
-                Tenant.ApplyProvisionHierarchy(hierarchyToApply, SequenceId, applyingInformation);
-            }
-            else
+                // Get Azure AD Token
+                if (AccessToken != null)
+                {
+                    // Authenticated using -Graph or using another way to retrieve the accesstoken with Connect-PnPOnline
+                    return Task.FromResult(AccessToken);
+                }
+                else if (SPOnlineConnection.CurrentConnection.PSCredential != null)
+                {
+                    // Using normal credentials
+                    return Task.FromResult(TokenHandler.AcquireToken(resource, null));
+                }
+                else
+                {
+                    // No token...
+                    return null;
+                }
+            }))
             {
-                foreach (var sequence in hierarchyToApply.Sequences)
+#endif
+                if (!string.IsNullOrEmpty(SequenceId))
                 {
-                    Tenant.ApplyProvisionHierarchy(hierarchyToApply, sequence.ID, applyingInformation);
+                    Tenant.ApplyProvisionHierarchy(hierarchyToApply, SequenceId, applyingInformation);
                 }
+                else
+                {
+                    if (hierarchyToApply.Sequences.Count > 0)
+                    {
+                        foreach (var sequence in hierarchyToApply.Sequences)
+                        {
+                            Tenant.ApplyProvisionHierarchy(hierarchyToApply, sequence.ID, applyingInformation);
+                        }
+                    }
+                    else
+                    {
+                        Tenant.ApplyProvisionHierarchy(hierarchyToApply, null, applyingInformation);
+                    }
+                }
+#if !ONPREMISES
             }
-
+#endif
             WriteObject(sitesProvisioned, true);
 
         }
 
+        private string AccessToken
+        {
+            get
+            {
+                if (SPOnlineConnection.AuthenticationResult != null)
+                {
+                    if (SPOnlineConnection.AuthenticationResult.ExpiresOn < DateTimeOffset.Now)
+                    {
+                        WriteWarning(Properties.Resources.MicrosoftGraphOAuthAccessTokenExpired);
+                        SPOnlineConnection.AuthenticationResult = null;
+                        return null;
+                    }
+                    else
+                    {
+#if !NETSTANDARD2_0
+                        return (SPOnlineConnection.AuthenticationResult.Token);
+#else
+                        return SPOnlineConnection.AuthenticationResult.AccessToken;
+#endif
+                    }
+                }
+                else if (SPOnlineConnection.CurrentConnection?.AccessToken != null)
+                {
+                    return SPOnlineConnection.CurrentConnection.AccessToken;
+                }
+                else
+                {
+                    return null;
+                }
+            }
+        }
+
 
         private ProvisioningHierarchy GetHierarchy()
         {

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-3.9.1905.2
+3.9.1905.3