chsakell
diff --git a/‎AspNetCoreIdentity/Controllers/AccountController.cs
Copy file name to clipboardExpand all lines: AspNetCoreIdentity/Controllers/AccountController.cs
+1-1Lines changed: 1 addition & 1 deletion b/‎AspNetCoreIdentity/Controllers/AccountController.cs
Copy file name to clipboardExpand all lines: AspNetCoreIdentity/Controllers/AccountController.cs
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎AspNetCoreIdentity/Controllers/ExternalAccountController.cs
Copy file name to clipboardExpand all lines: AspNetCoreIdentity/Controllers/ExternalAccountController.cs
+11-28Lines changed: 11 additions & 28 deletions b/‎AspNetCoreIdentity/Controllers/ExternalAccountController.cs
Copy file name to clipboardExpand all lines: AspNetCoreIdentity/Controllers/ExternalAccountController.cs
+11-28Lines changed: 11 additions & 28 deletions
@@ -81,7 +81,7 @@ await _emailSender.SendEmailAsync(user.Email, "Confirm your email",
                     return new ResultVM
                     {
                         Status = Status.Success,
-                        Message = "User has been created, please confirm your email",
+                        Message = "Email confirmation is pending",
                         Data = user
                     };
                 }
 
@@ -35,7 +35,7 @@ public IActionResult Index()
         [HttpGet]
         public IActionResult Login(string provider, string returnUrl = null)
         {
-            var redirectUrl = "/ExternalAccount/Callback";
+            var redirectUrl = Url.Action("Callback", "ExternalAccount");
             var properties = _signInManager.ConfigureExternalAuthenticationProperties(provider, redirectUrl);
             return new ChallengeResult(provider, properties);
         }
@@ -46,7 +46,6 @@ public async Task<IActionResult> Callback(string returnUrl = null, string remote
             returnUrl = returnUrl ?? Url.Content("~/");
             if (remoteError != null)
             {
-                //ErrorMessage = $"Error from external provider: {remoteError}";
                 return RedirectToPage("./", new { ReturnUrl = returnUrl });
             }
 
@@ -64,40 +63,24 @@ public async Task<IActionResult> Callback(string returnUrl = null, string remote
                 return LocalRedirect(returnUrl);
             }
 
-
-            // If the user does not have an account, create one.
             var userEmail = info.Principal.FindFirstValue(ClaimTypes.Email);
 
-            var user = new IdentityUser { Id = Guid.NewGuid().ToString(), UserName = userEmail, Email = userEmail };
-
             var userDb = await _userManager.FindByEmailAsync(userEmail);
 
             if (userDb != null)
             {
-                var emailConfirmed = await _userManager.IsEmailConfirmedAsync(userDb);
-
-                if (!result.IsNotAllowed)
-                {
-                    var newLoginResult = await _userManager.AddLoginAsync(userDb, info);
-                    if (newLoginResult.Succeeded)
-                    {
-                        // Check Email Confirmation
-                        if (emailConfirmed)
-                        {
-                            await _signInManager.SignInAsync(userDb, isPersistent: false);
-                            return LocalRedirect(
-                                $"{returnUrl}?message={info.ProviderDisplayName} has been added successfully");
-                        }
-
-                        return LocalRedirect(
-                            $"{returnUrl}?message={info.ProviderDisplayName} has been added but email confirmation is pending");
-                    }
-                }
-                else
+                if (!userDb.EmailConfirmed)
                 {
-                    return LocalRedirect(
-                        $"{returnUrl}?message=Email ({user.Email}) confirmation is pending&type=danger");
+                    var code = await _userManager.GenerateEmailConfirmationTokenAsync(userDb);
+                    await _userManager.ConfirmEmailAsync(userDb, code);
                 }
+
+                // Add the external provider
+                await _userManager.AddLoginAsync(userDb, info);
+
+                await _signInManager.SignInAsync(userDb, isPersistent: false);
+                return LocalRedirect(
+                    $"{returnUrl}?message={info.ProviderDisplayName} has been added successfully");
             }
 
             return LocalRedirect($"/register?associate={userEmail}&loginProvider={info.LoginProvider}&providerDisplayName={info.ProviderDisplayName}&providerKey={info.ProviderKey}");
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ await _emailSender.SendEmailAsync(user.Email, "Confirm your email",`
`81`	`81`	`return new ResultVM`
`82`	`82`	`{`
`83`	`83`	`Status = Status.Success,`
`84`		`- Message = "User has been created, please confirm your email",`
	`84`	`+ Message = "Email confirmation is pending",`
`85`	`85`	`Data = user`
`86`	`86`	`};`
`87`	`87`	`}`