Allow Magic.cshtml to Use Magic LInks (#118)

* Changing DIY magic links to work with new magic links.
bitwarden · Feb 26, 2024 · 72d00b5 · 72d00b5
1 parent 6a7c2eb
commit 72d00b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/examples/Passwordless.AspNetIdentity.Example/Pages/Account/Magic.cshtml.cs b/examples/Passwordless.AspNetIdentity.Example/Pages/Account/Magic.cshtml.cs
@@ -20,7 +20,7 @@ public Magic(PasswordlessClient passwordlessClient,
 
     public bool Success { get; set; }
 
-    public async Task<ActionResult> OnGet(string token, string email)
+    public async Task<ActionResult> OnGet(string token)
     {
         if (User.Identity is { IsAuthenticated: true }) return RedirectToPage("/Authorized/HelloWorld");
 
@@ -30,17 +30,21 @@ public async Task<ActionResult> OnGet(string token, string email)
             return Page();
         }
 
-        var user = await _signInManager.UserManager.FindByEmailAsync(email);
+        var response = await _passwordlessClient.VerifyAuthenticationTokenAsync(token);
 
-        if (user == null || !(await _signInManager.CanSignInAsync(user)))
+        if (!response.Success)
         {
             Success = false;
             return Page();
         }
 
-        var response = await _passwordlessClient.VerifyAuthenticationTokenAsync(token);
+        var user = await _signInManager.UserManager.FindByIdAsync(response.UserId);
 
-        if (!response.Success) return Page();
+        if (user == null || !(await _signInManager.CanSignInAsync(user)))
+        {
+            Success = false;
+            return Page();
+        }
 
         await _signInManager.SignInAsync(user, true);
         Success = true;

diff --git a/examples/Passwordless.AspNetIdentity.Example/Pages/Account/Recovery.cshtml.cs b/examples/Passwordless.AspNetIdentity.Example/Pages/Account/Recovery.cshtml.cs
@@ -67,7 +67,6 @@ public async Task<IActionResult> OnPostAsync(RecoveryForm form, CancellationToke
         var uriBuilder = new UriBuilder(url);
         var query = HttpUtility.ParseQueryString(uriBuilder.Query);
         query["token"] = token.Token;
-        query["email"] = user.Email;
         uriBuilder.Query = query.ToString();
 
         var message = $"""