Value cannot be null or whitespace - Parameter name: dbPassword Shazw…

…azza#112
sinkypars1885 · May 21, 2020 · 6a31173 · 6a31173
1 parent f391421
commit 6a31173
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
@@ -318,6 +318,13 @@ public async Task<ActionResult> HandleLogin([Bind(Prefix = "loginModel")] LoginM
                 var user = await _userManager.FindAsync(model.Username, model.Password);
                 if (user != null)
                 {
+
+                    if (user.PasswordHash == null)
+                    {
+                        ModelState.AddModelError("loginModel", "Social Account registered but no website password");
+                        return CurrentUmbracoPage();
+                    }
+
                     await SignInAsync(user, true);
                     return RedirectToCurrentUmbracoPage();
                 }

diff --git a/src/UmbracoIdentity/IdentityEnabledMembersMembershipProvider.cs b/src/UmbracoIdentity/IdentityEnabledMembersMembershipProvider.cs
@@ -49,6 +49,9 @@ public class IdentityEnabledMembersMembershipProvider : MembersMembershipProvide
 
         public new bool VerifyPassword(string password, string hashedPassword)
         {
+            if (hashedPassword == null)
+                return true;
+
             return CheckPassword(password, hashedPassword);
         }