Backport variable name updates and fix found porting the invalidation of sessions after removal of external login provider to 16.

Author: AndyButland

src/Umbraco.Core/Services/IUserService.cs

@@ -236,8 +236,8 @@ IEnumerable<IUser> GetAll(
     /// <summary>
     ///     Invalidates sessions for users that aren't associated with the current collection of providers.
     /// </summary>
-    /// <param name="currentProviderKeys">The keys for the currently configured providers.</param>
-    void InvalidateSessionsForRemovedProviders(IEnumerable<string> currentProviderKeys) { }
+    /// <param name="currentLoginProviders">The keys for the currently configured providers.</param>
+    void InvalidateSessionsForRemovedProviders(IEnumerable<string> currentLoginProviders) { }
 
     #region User groups
 

src/Umbraco.Core/Services/UserService.cs

@@ -721,11 +721,11 @@ public IEnumerable<IUser> GetNextUsers(int id, int count)
     }
 
     /// <inheritdoc />
-    public void InvalidateSessionsForRemovedProviders(IEnumerable<string> currentProviderKeys)
+    public void InvalidateSessionsForRemovedProviders(IEnumerable<string> currentLoginProviders)
     {
         using (ICoreScope scope = ScopeProvider.CreateCoreScope())
         {
-            _userRepository.InvalidateSessionsForRemovedProviders(currentProviderKeys);
+            _userRepository.InvalidateSessionsForRemovedProviders(currentLoginProviders);
             scope.Complete();
         }
     }

src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs

@@ -1071,13 +1071,13 @@ public IEnumerable<IUser> GetNextUsers(int id, int count)
     }
 
     /// <inheritdoc />
-    public void InvalidateSessionsForRemovedProviders(IEnumerable<string> currentProviderKeys)
+    public void InvalidateSessionsForRemovedProviders(IEnumerable<string> currentLoginProviders)
     {
         // Get all the user or member keys associated with the removed providers.
         Sql<ISqlContext> idsQuery = SqlContext.Sql()
             .Select<ExternalLoginDto>(x => x.UserOrMemberKey)
             .From<ExternalLoginDto>()
-            .WhereNotIn<ExternalLoginDto>(x => x.ProviderKey, currentProviderKeys);
+            .WhereNotIn<ExternalLoginDto>(x => x.LoginProvider, currentLoginProviders);
         List<Guid> userAndMemberKeysAssociatedWithRemovedProviders = Database.Fetch<Guid>(idsQuery);
         if (userAndMemberKeysAssociatedWithRemovedProviders.Count == 0)
         {