Shazwazza#112 Fixed error

markroffey · Jan 29, 2020 · c633fb7 · c633fb7
1 parent 7c0eda4
commit c633fb7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs b/src/UmbracoIdentity.Web/App_Start/Controllers/UmbracoIdentityAccountController.cs
@@ -312,17 +312,26 @@ public async Task<ActionResult> ManagePassword([Bind(Prefix = "managePasswordMod
         [AllowAnonymous]
         public async Task<ActionResult> HandleLogin([Bind(Prefix = "loginModel")] LoginModel model)
         {
-            if (ModelState.IsValid)
+            if (!ModelState.IsValid)
+                return CurrentUmbracoPage();
+
+            var user = await _userManager.FindAsync(model.Username, model.Password);
+
+            if (user != null)
             {
-                var user = await _userManager.FindAsync(model.Username, model.Password);
-                if (user != null)
+                //member exits but registered with social login.
+                if (user.PasswordHash == null)
                 {
-                    await SignInAsync(user, true);
-                    return RedirectToCurrentUmbracoPage();
+                    ModelState.AddModelError("loginModel", "Social Account registered");
+                    return CurrentUmbracoPage();
                 }
-                ModelState.AddModelError("loginModel", "Invalid username or password");
+
+                await SignInAsync(user, true);
+                return RedirectToCurrentUmbracoPage();
             }
 
+            ModelState.AddModelError("loginModel", "Invalid username or password");
+
             return CurrentUmbracoPage();
         }
 

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