From ce201207d471fe87d0a764aeaeab85e6b417573f Mon Sep 17 00:00:00 2001
From: limited_dev <loginakkisativ@gmail.com>
Date: Mon, 12 Jun 2023 20:46:44 +0200
Subject: [PATCH] NOTE: temp commit, started rolling back changes to auth
 system

Signed-off-by: limited_dev <loginakkisativ@gmail.com>
---
 .../Auth/CustomAuthenticationStateProvider.cs | 12 ++--
 .../ClickOn/ClickOnResetPassword.razor        | 14 ++---
 .../Pages/Accounts/Login.razor                | 12 ++--
 .../Pages/Accounts/Register.razor             | 23 ++++----
 .../Pages/Accounts/ResetPassword.razor        | 11 ++--
 .../Pages/Accounts/UserPage.razor             | 56 ++++++++++++++++---
 .../Pages/Accounts/UserPage.razor.css         |  0
 .../Pages/Basic/ReportPage.razor              | 13 +++--
 .../Pages/Moderation/ModMenu.razor            |  5 --
 .../Shared/Components/Comment.razor           |  4 +-
 .../Shared/Components/Forms/CommentForm.razor |  4 +-
 .../Shared/Components/Forms/PostForm.razor    |  4 +-
 .../Shared/Components/Post.razor              |  2 +-
 13 files changed, 97 insertions(+), 63 deletions(-)
 create mode 100644 ImageBoardServerApp/Pages/Accounts/UserPage.razor.css

diff --git a/ImageBoardServerApp/Auth/CustomAuthenticationStateProvider.cs b/ImageBoardServerApp/Auth/CustomAuthenticationStateProvider.cs
index 65bef1e..06256c0 100644
--- a/ImageBoardServerApp/Auth/CustomAuthenticationStateProvider.cs
+++ b/ImageBoardServerApp/Auth/CustomAuthenticationStateProvider.cs
@@ -27,15 +27,15 @@ public class CustomAuthenticationStateProvider : AuthenticationStateProvider
             var claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>
             {
                 //new Claim(ClaimTypes.Email, userSession.Email),
-                new Claim(ClaimTypes.Name, userSession.UserID.ToString()),
+                new Claim(ClaimTypes.Name, userSession.Email),
                 new Claim(ClaimTypes.Role, userSession.Role)
             }, "CustomAuth"));
-            return new AuthenticationState(claimsPrincipal);
+            return await Task.FromResult(new AuthenticationState(claimsPrincipal));
         }
         catch
         {
-            Console.WriteLine("Returned Anon Auth due to err");
-            return new AuthenticationState(_anonymous);
+            Console.WriteLine("Resorting to Anon");
+            return await Task.FromResult(new AuthenticationState(_anonymous));
         }
     }
 
@@ -48,8 +48,8 @@ public class CustomAuthenticationStateProvider : AuthenticationStateProvider
             await _sessionStorage.SetAsync("UserSession", session);
             claimsPrincipal = new ClaimsPrincipal(new ClaimsIdentity(new List<Claim>
             {
-                new Claim(ClaimTypes.Email, session.UserID.ToString()),
-                new Claim(ClaimTypes.Email, session.Role)
+                new Claim(ClaimTypes.Name, session.Email),
+                new Claim(ClaimTypes.Role, session.Role)
             }));
         }
         else
diff --git a/ImageBoardServerApp/Pages/Accounts/ClickOn/ClickOnResetPassword.razor b/ImageBoardServerApp/Pages/Accounts/ClickOn/ClickOnResetPassword.razor
index 27a2051..c9f5592 100644
--- a/ImageBoardServerApp/Pages/Accounts/ClickOn/ClickOnResetPassword.razor
+++ b/ImageBoardServerApp/Pages/Accounts/ClickOn/ClickOnResetPassword.razor
@@ -9,11 +9,11 @@
 <div class="login">
     <form>
         <RadzenFormField Text="New Password" Variant="Variant.Outlined">
-            <RadzenPassword @bind-Value="@Password" />
+            <RadzenPassword @bind-Value="@Password"/>
         </RadzenFormField>
         <br/>
         <br/>
-        <RadzenButton Click=@reset Text="reset" ButtonStyle="ButtonStyle.Secondary" />
+        <RadzenButton Click=@reset Text="reset" ButtonStyle="ButtonStyle.Secondary" ButtonType="ButtonType.Submit"/>
         <br/>
     </form>
     @if (msg != null)
@@ -25,13 +25,13 @@
 
 @code {
     private string Password { get; set; }
-    
+
     private string msg { get; set; }
-    
+
     [Parameter]
     [Required]
     public string userid { get; set; }
-    
+
     [Parameter]
     [Required]
     public string hash { get; set; }
@@ -55,7 +55,7 @@
             msg = "The token does not match the account.";
             return;
         }
-        if (user.ResetPasswordExpiresAt == -1 || user.ResetPasswordToken == "-1")
+        if (user.ResetPasswordExpiresAt < 0 || user.ResetPasswordToken == "-1")
         {
             msg = "There is currently no valid link to reset this accounts password.";
             return;
@@ -73,6 +73,6 @@
         await UsersRepository.updateUserAsync(user);
 
         msg = "Your Password has been updated.";
-
     }
+
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Pages/Accounts/Login.razor b/ImageBoardServerApp/Pages/Accounts/Login.razor
index 35087b9..c86bdd6 100644
--- a/ImageBoardServerApp/Pages/Accounts/Login.razor
+++ b/ImageBoardServerApp/Pages/Accounts/Login.razor
@@ -10,15 +10,15 @@
 <div class="login">
     <form>
         <RadzenFormField Text="Email" Variant="Variant.Outlined">
-            <RadzenTextBox @bind-Value="@Email" />
+            <RadzenTextBox @bind-Value="@Email"/>
         </RadzenFormField>
         <br/>
         <RadzenFormField Text="Password" Variant="Variant.Outlined">
-            <RadzenPassword @bind-Value="@Password" />
+            <RadzenPassword @bind-Value="@Password"/>
         </RadzenFormField>
         <br/>
         <br/>
-        <RadzenButton Click=@login Text="login" ButtonStyle="ButtonStyle.Secondary" />
+        <RadzenButton Click=@login Text="login" ButtonStyle="ButtonStyle.Secondary" ButtonType="ButtonType.Submit"/>
         <br/>
     </form>
 </div>
@@ -28,13 +28,12 @@
     private Variant vari = Variant.Outlined;
 
     private bool verified;
-    
+
     public string Email { get; set; }
     public string Password { get; set; }
 
     private async Task login()
     {
-        Console.WriteLine("loggin you in...");
         var user = await UsersRepository.getUserByEmailRawAsync(Email);
         if (user == null)
         {
@@ -42,10 +41,10 @@
             verified = false;
             return;
         }
+        Console.WriteLine("loggin you in...");
         verified = BCrypt.Net.BCrypt.Verify(Password, user.Password);
         if (verified)
         {
-            verified = true;
             var customAuthStateProvider = (CustomAuthenticationStateProvider)authStateProvider;
             await customAuthStateProvider.UpdateAuthenticationStateAsync(user);
             navManager.NavigateTo("/", true);
@@ -53,4 +52,5 @@
         }
         await js.InvokeVoidAsync("alert", $"Wrong Password");
     }
+
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Pages/Accounts/Register.razor b/ImageBoardServerApp/Pages/Accounts/Register.razor
index a0a6ab7..ab36a4d 100644
--- a/ImageBoardServerApp/Pages/Accounts/Register.razor
+++ b/ImageBoardServerApp/Pages/Accounts/Register.razor
@@ -11,18 +11,18 @@
 <div class="login">
     <form>
         <RadzenFormField Text="Email" Variant="Variant.Outlined">
-            <RadzenTextBox @bind-Value="@Email" />
+            <RadzenTextBox @bind-Value="@Email"/>
         </RadzenFormField>
         <br/>
         <RadzenFormField Text="Password" Variant="Variant.Outlined">
-            <RadzenPassword @bind-Value="@Password" />
+            <RadzenPassword @bind-Value="@Password"/>
         </RadzenFormField>
         <br/>
-        <RadzenCheckBox @bind-Value=@is18 Name="is_18" />
-        <RadzenLabel Text="I am atleast 18 Years old." Component="is_18" />
+        <RadzenCheckBox @bind-Value=@is18 Name="is_18"/>
+        <RadzenLabel Text="I am atleast 18 Years old." Component="is_18"/>
         <br/>
         <br/>
-        <RadzenButton Click=@login Text="register" ButtonStyle="ButtonStyle.Secondary" />
+        <RadzenButton Click=@login Text="register" ButtonStyle="ButtonStyle.Secondary" ButtonType="ButtonType.Submit"/>
     </form>
     <br/>
     <br/>
@@ -38,7 +38,7 @@
     private string Email { get; set; }
     private string Password { get; set; }
     private bool is18 { get; set; }
-    
+
     private string msg { get; set; }
 
     private bool verified;
@@ -70,7 +70,7 @@
             LastUsedName = "Anonymous",
             BanReason = "Not banned",
             ConfirmedEmail = false,
-            ResetPasswordExpiresAt = DateTimeOffset.Now.ToUnixTimeMilliseconds() + 300000,
+            ResetPasswordExpiresAt = -1,
             ConfirmEmailToken = TheManager.getmd5Hash(),
             ResetPasswordToken = "-1"
         };
@@ -79,22 +79,20 @@
             msg = "This Email is already registered.";
             return;
         }
-        
+
         await UsersRepository.createUserAsync(userToCreate);
-        
+
         Postman.sendMail(Email, "Confirm Email", "");
-        
+
         var user = await UsersRepository.getUserByEmailRawAsync(Email);
         if (user == null)
         {
             await js.InvokeVoidAsync("alert", "User does not exist");
-            verified = false;
             return;
         }
         verified = BCrypt.Net.BCrypt.Verify(Password, user.Password);
         if (verified)
         {
-            verified = true;
             var customAuthStateProvider = (CustomAuthenticationStateProvider)authStateProvider;
             await customAuthStateProvider.UpdateAuthenticationStateAsync(user);
             navManager.NavigateTo("/", true);
@@ -102,4 +100,5 @@
         }
         await js.InvokeVoidAsync("alert", $"Wrong Password");
     }
+
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Pages/Accounts/ResetPassword.razor b/ImageBoardServerApp/Pages/Accounts/ResetPassword.razor
index 28b0bb4..effcda2 100644
--- a/ImageBoardServerApp/Pages/Accounts/ResetPassword.razor
+++ b/ImageBoardServerApp/Pages/Accounts/ResetPassword.razor
@@ -6,11 +6,11 @@
 <div class="login">
     <form>
         <RadzenFormField Text="Email" Variant="Variant.Outlined">
-            <RadzenTextBox @bind-Value="@Email" />
+            <RadzenTextBox @bind-Value="@Email"/>
         </RadzenFormField>
         <br/>
         <br/>
-        <RadzenButton Click=@resetPassword Text="Send reset Email" ButtonStyle="ButtonStyle.Secondary" />
+        <RadzenButton Click=@resetPassword Text="Send reset email" ButtonStyle="ButtonStyle.Secondary" ButtonType="ButtonType.Submit"/>
         <br/>
     </form>
     @if (msg != null)
@@ -37,7 +37,7 @@
         Console.WriteLine("Resetting a password...");
 
         msg = "Generating";
-        
+
         var hash = TheManager.getmd5Hash();
         user.ResetPasswordToken = hash;
         user.ResetPasswordExpiresAt = DateTimeOffset.Now.ToUnixTimeMilliseconds() + 300000;
@@ -45,11 +45,12 @@
         await UsersRepository.updateUserAsync(user);
 
         msg = "Sending...";
-        
-        Postman.sendMail(user.Email, 
+
+        Postman.sendMail(user.Email,
             "Password Reset",
             "Reset your Password using this link:\n" +
             $"https://bulletboards.xyz/sys/click/resetpw/{user.UserID}/{hash}");
         msg = "A reset email has been sent to the selected email, if that email is registered here. The link expires in 5 Minutes";
     }
+
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Pages/Accounts/UserPage.razor b/ImageBoardServerApp/Pages/Accounts/UserPage.razor
index a03b04d..dbeda3f 100644
--- a/ImageBoardServerApp/Pages/Accounts/UserPage.razor
+++ b/ImageBoardServerApp/Pages/Accounts/UserPage.razor
@@ -8,15 +8,36 @@
 
 <AuthorizeView>
     <Authorized>
-        <h3>YOU</h3>
+        <h3>YOUR ACCOUNT</h3>
         <br/>
-        <span>Email: @mail</span>
+        <span>UserId: @userid</span>
         <br/>
+        @if (u != null)
+        {
+            <span>Current email: @u.Email</span>
+            <br/>
+        }
         <span>Email: </span>
-        <input type="email" id="email" @bind="newMail"/>
-        <a @onclick="changeEmail" href="javascript:void(0)">[Change Email]</a>
+        <form>
+            <RadzenFormField Text="Enter new email address" Variant="Variant.Outlined">
+                <RadzenTextBox @bind-Value="@newMail"/>
+            </RadzenFormField>
+            <br/>
+            <br/>
+            <RadzenButton Click=@changeEmail Text="Set Email" ButtonStyle="ButtonStyle.Secondary" ButtonType="ButtonType.Submit"/>
+            <br/>
+        </form>
+        @if (msg != null)
+        {
+            <div>
+                <span class="msg">@msg</span>
+            </div>
+        }
+        <br/>
+        <br/>
+        <br/>
+        <a href="/sys/resetpw">[Click here to change your password]</a>
         <br/>
-        <a href="/sys/resetpw">[Change Password]</a>
         <br/>
         <a href="/sys/logout">[Logout]</a>
     </Authorized>
@@ -28,8 +49,12 @@
 
 @code {
 
-    private string mail { get; set; } = "";
+    private string userid { get; set; } = "";
     private string newMail { get; set; }
+    private string msg { get; set; }
+
+    private UserData u { get; set; }
+    private string isMailConfirmedMsg { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
@@ -37,7 +62,7 @@
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         if (user.User.Identity.IsAuthenticated)
         {
-            mail = user.User.Identity.Name;
+            userid = user.User.Identity.Name;
         }
     }
 
@@ -46,18 +71,31 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr == null)
         {
+            msg = "Could not find user.";
             return;
         }
-        if (newMail == null || newMail == "" || !newMail.Contains("@"))
+        if (newMail == null || newMail == "" || !newMail.Contains("@") || !newMail.Contains("."))
         {
+            msg = "The new email is not valid.";
             return;
         }
         foundusr.Email = newMail;
         foundusr.lastActionTimeStamp = DateTimeOffset.Now.ToUnixTimeMilliseconds();
+        foundusr.ConfirmedEmail = false;
         await UsersRepository.updateUserAsync(foundusr);
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
+        var user = await cauthStateProvder.GetAuthenticationStateAsync();
+        var usr = user.User;
+        u = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
+        isMailConfirmedMsg = u.ConfirmedEmail ? "Email is confirmed" : "Email is NOT confirmed";
+        await base.OnAfterRenderAsync(firstRender);
+    }
+
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Pages/Accounts/UserPage.razor.css b/ImageBoardServerApp/Pages/Accounts/UserPage.razor.css
new file mode 100644
index 0000000..e69de29
diff --git a/ImageBoardServerApp/Pages/Basic/ReportPage.razor b/ImageBoardServerApp/Pages/Basic/ReportPage.razor
index 40ddb84..4cbcedd 100644
--- a/ImageBoardServerApp/Pages/Basic/ReportPage.razor
+++ b/ImageBoardServerApp/Pages/Basic/ReportPage.razor
@@ -23,7 +23,7 @@
         <br/>
         <span>Explain further (optional)</span>
         <div class="pd centered marg">
-            <RadzenTextArea Placeholder="Specify..." @bind-Value="@explaination" Cols="30" Rows="6"  Class="w-100"/>
+            <RadzenTextArea Placeholder="Specify..." @bind-Value="@explaination" Cols="30" Rows="6" Class="w-100"/>
         </div>
         <RadzenButton class="pd" Click="@onReportClick" Text="Report"></RadzenButton>
     </Authorized>
@@ -41,11 +41,11 @@
     [Parameter]
     [Required]
     public string type { get; set; }
-    
+
     [Parameter]
     [Required]
     public string board { get; set; }
-    
+
     [Parameter]
     [Required]
     public string id { get; set; }
@@ -58,12 +58,12 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr == null)
         {
             return;
         }
-        
+
         if (foundusr.TimeBanned != -1)
         {
             return;
@@ -94,7 +94,7 @@
         };
 
         List<ReportData> submittedReports = foundusr.RecivedReports;
-        foreach(var r in submittedReports)
+        foreach (var r in submittedReports)
         {
             if (r.ReportedPostID == reportData.ReportedPostID && r.ReportedCommentID == reportData.ReportedCommentID)
                 return;
@@ -103,4 +103,5 @@
         await ReportsRepository.createReportAsync(reportData);
         js.InvokeVoidAsync("window.close");
     }
+
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Pages/Moderation/ModMenu.razor b/ImageBoardServerApp/Pages/Moderation/ModMenu.razor
index e68a67c..c5f9351 100644
--- a/ImageBoardServerApp/Pages/Moderation/ModMenu.razor
+++ b/ImageBoardServerApp/Pages/Moderation/ModMenu.razor
@@ -31,9 +31,4 @@
         }
     }
 
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        await base.OnAfterRenderAsync(firstRender);
-    }
-
 }
\ No newline at end of file
diff --git a/ImageBoardServerApp/Shared/Components/Comment.razor b/ImageBoardServerApp/Shared/Components/Comment.razor
index 0cd4460..e059919 100644
--- a/ImageBoardServerApp/Shared/Components/Comment.razor
+++ b/ImageBoardServerApp/Shared/Components/Comment.razor
@@ -121,7 +121,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr.Role != "User" || comment.UserID == foundusr.UserID)
         {
             await TheManager.deleteComment(comment);
@@ -186,7 +186,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr != null && (foundusr.Role != "User" || comment.UserID == foundusr.UserID))
         {
             canDel = true;
diff --git a/ImageBoardServerApp/Shared/Components/Forms/CommentForm.razor b/ImageBoardServerApp/Shared/Components/Forms/CommentForm.razor
index 74dc807..342ab67 100644
--- a/ImageBoardServerApp/Shared/Components/Forms/CommentForm.razor
+++ b/ImageBoardServerApp/Shared/Components/Forms/CommentForm.razor
@@ -63,7 +63,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr == null)
         {
             hasErr = true;
@@ -90,7 +90,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr == null)
         {
             hasErr = true;
diff --git a/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor b/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor
index 30d80d9..18d0f9e 100644
--- a/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor
+++ b/ImageBoardServerApp/Shared/Components/Forms/PostForm.razor
@@ -69,7 +69,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr == null)
         {
             hasErr = true;
@@ -97,7 +97,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr == null)
         {
             hasErr = true;
diff --git a/ImageBoardServerApp/Shared/Components/Post.razor b/ImageBoardServerApp/Shared/Components/Post.razor
index 5a29b89..04ed894 100644
--- a/ImageBoardServerApp/Shared/Components/Post.razor
+++ b/ImageBoardServerApp/Shared/Components/Post.razor
@@ -157,7 +157,7 @@
         var cauthStateProvder = (CustomAuthenticationStateProvider)authStateProvider;
         var user = await cauthStateProvder.GetAuthenticationStateAsync();
         var usr = user.User;
-        UserData foundusr = await UsersRepository.getUserByIdAsync(int.Parse(usr.Identity.Name));
+        UserData foundusr = await UsersRepository.getUserByEmailRawAsync(usr.Identity.Name);
         if (foundusr.Role != "User" || post.UserID == foundusr.UserID)
         {
             await TheManager.deleteThread(post);