Merge pull request #9152 from abpframework/auto-merge/rel-4-3/412

Merge branch dev with rel-4.3

framework/src/Volo.Abp.Http.Client.IdentityModel/Volo/Abp/Http/Client/IdentityModel/IdentityModelRemoteServiceHttpClientAuthenticator.cs

@@ -20,7 +20,7 @@ namespace Volo.Abp.Http.Client.IdentityModel
         {
             await IdentityModelAuthenticationService.TryAuthenticateAsync(
                 context.Client,
-                context.RemoteService.GetIdentityClient()
+                context.RemoteService.GetIdentityClient() ?? context.RemoteServiceName
             );
         }
     }

framework/src/Volo.Abp.IdentityModel/Volo/Abp/IdentityModel/IdentityModelTokenCacheItem.cs

@@ -5,7 +5,6 @@ using Volo.Abp.MultiTenancy;
 namespace Volo.Abp.IdentityModel
 {
     [Serializable]
-    [IgnoreMultiTenancy]
     public class IdentityModelTokenCacheItem
     {
         public string AccessToken { get; set; }

modules/account/src/Volo.Abp.Account.Web/Pages/Account/Login.cshtml.cs

@@ -213,9 +213,16 @@ namespace Volo.Abp.Account.Web.Pages.Account
 
             if (result.IsLockedOut)
             {
+                Logger.LogWarning($"External login callback error: user is locked out!");
                 throw new UserFriendlyException("Cannot proceed because user is locked out!");
             }
             
+            if (result.IsNotAllowed)
+            {
+                Logger.LogWarning($"External login callback error: user is not allowed!");
+                throw new UserFriendlyException("Cannot proceed because user is not allowed!");
+            }
+
             if (result.Succeeded)
             {
                 return RedirectSafely(returnUrl, returnUrlHash);