July 2020 Intermediate Release 1

Author: erwinvanhunen

CHANGELOG.md

@@ -5,7 +5,16 @@ 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.24.2008.0]
+## [3.24.2008.0] not yet released
+
+
+## [3.23.2007.1]
+
+### Changed
+- Fixed issue with Remove-PnPTeamsTab not working as intended
+- Fixed issue with Add-PnPTeamsChannel -Private not working as intended. We now require you to specify an owner.
+- Fixed authentication issues when using Connect-PnPOnline and mixed Resource permissions scopes (e.g. Graph and Office 365 Management API)
+- Fixed issue where Disconnect-PnPOnline would not clear the in memory token cache when using Disconnect-PnPOnline
 
 ## [3.23.2007.0]
 

Commands/Base/DisconnectOnline.cs

@@ -25,12 +25,12 @@ public class DisconnectOnline : PSCmdlet
         protected override void ProcessRecord()
         {
             // If no specific connection has been passed in, take the connection from the current context
-            if(Connection == null)
+            if (Connection == null)
             {
                 Connection = PnPConnection.CurrentConnection;
             }
 #if !ONPREMISES
-            if(Connection?.Certificate != null)
+            if (Connection?.Certificate != null)
             {
 #if !NETSTANDARD2_1
                 if (Connection != null && Connection.DeleteCertificateFromCacheOnDisconnect)
@@ -80,14 +80,17 @@ internal static bool DisconnectProvidedService(PnPConnection connection)
             {
                 return false;
             }
+
             GraphToken.ClearCaches();
+            OfficeManagementApiToken.ClearCaches();
+
             connection.Context = null;
             connection = null;
             return true;
         }
 
         internal static bool DisconnectCurrentService()
-        {            
+        {
             Environment.SetEnvironmentVariable("PNPPSHOST", string.Empty);
             Environment.SetEnvironmentVariable("PNPPSSITE", string.Empty);
 
@@ -100,10 +103,10 @@ internal static bool DisconnectCurrentService()
                 PnPConnection.CurrentConnection.ClearTokens();
                 PnPConnection.CurrentConnection.Context = null;
                 PnPConnection.CurrentConnection = null;
-                
-                
+
+
                 return true;
-            }            
+            }
         }
     }
 }

Commands/Base/PnPConnection.cs

@@ -187,26 +187,6 @@ internal GenericToken TryGetToken(TokenAudience tokenAudience, string[] orRoles
         {
             GenericToken token = null;
 
-            //Validate if we have a token already
-            //if (AccessTokens.ContainsKey(tokenAudience))
-            //{
-            //    // We have a token already, ensure it is still valid
-            //    token = AccessTokens[tokenAudience];
-
-            //    if (token.ExpiresOn > DateTime.Now)
-            //    {
-            //        var validationResults = ValidateTokenForPermissions(token, tokenAudience, orRoles, andRoles, tokenType);
-            //        if (validationResults.valid)
-            //        {
-            //            return token;
-            //        }
-            //        throw new PSSecurityException($"Access to {tokenAudience} failed because the app registration {ClientId} in tenant {Tenant} is not granted {validationResults.message}");
-            //    }
-
-            //    // Token was no longer valid, proceed with trying to create a new token
-            //}
-
-            // We do not have a token for the requested audience yet or it was no longer valid, try to create (a new) one
             switch (tokenAudience)
             {
                 case TokenAudience.MicrosoftGraph:

Commands/Model/GraphToken.cs

@@ -273,8 +273,28 @@ public static GenericToken AcquireDelegatedTokenWithCredentials(string clientId,
 
         public static void ClearCaches()
         {
-            GraphToken.publicClientApplication = null;
-            GraphToken.confidentialClientApplication = null;
+            if (publicClientApplication != null)
+            {
+                var accounts = publicClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+
+                // clear the cache
+                while (accounts.Any())
+                {
+                    publicClientApplication.RemoveAsync(accounts.First());
+                    accounts = publicClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+                }
+            }
+            if(confidentialClientApplication != null)
+            {
+                var accounts = confidentialClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+
+                // clear the cache
+                while (accounts.Any())
+                {
+                    confidentialClientApplication.RemoveAsync(accounts.First());
+                    accounts = confidentialClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+                }
+            }
         }
     }
 }

Commands/Model/OfficeManagementApiToken.cs

@@ -213,6 +213,32 @@ public static GenericToken AcquireDelegatedTokenWithCredentials(string clientId,
             }
             return new OfficeManagementApiToken(tokenResult.AccessToken);
         }
+
+        public static void ClearCaches()
+        {
+            if (publicClientApplication != null)
+            {
+                var accounts = publicClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+
+                // clear the cache
+                while (accounts.Any())
+                {
+                    publicClientApplication.RemoveAsync(accounts.First());
+                    accounts = publicClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+                }
+            }
+            if (confidentialClientApplication != null)
+            {
+                var accounts = confidentialClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+
+                // clear the cache
+                while (accounts.Any())
+                {
+                    confidentialClientApplication.RemoveAsync(accounts.First());
+                    accounts = confidentialClientApplication.GetAccountsAsync().GetAwaiter().GetResult().ToList();
+                }
+            }
+        }
     }
 }