Fixed potential null reference bug

VirtoCommerce · Feb 15, 2018 · bbe6712 · bbe6712
1 parent cf19294
commit bbe6712
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/VirtoCommerce.Storefront/Domain/Security/AuthWorkContextBuilderExtensions.cs b/VirtoCommerce.Storefront/Domain/Security/AuthWorkContextBuilderExtensions.cs
@@ -35,18 +35,13 @@ public static async Task WithCurrentUserAsync(this IWorkContextBuilder builder)
             if (identity.IsAuthenticated)
             {
                 user = await signInManager.UserManager.FindByNameAsync(identity.Name);
-                //User has been removed from storage need to do sign out 
-                if (user == null)
-                {
-                    await signInManager.SignOutAsync();
-                }
-
-                //Current store is not allowed for signed in user - do sign out
-                if (!user.AllowedStores.Contains(builder.WorkContext.CurrentStore.Id))
+                //User has been removed from storage or current store is not allowed for signed in user
+                //need to do sign out 
+                if (user == null || !user.AllowedStores.Contains(builder.WorkContext.CurrentStore.Id))
                 {
                     await signInManager.SignOutAsync();
                     user = null;
-                }
+                }              
             }
 
             if (user == null || user.IsTransient())