make email address required for token generation and user registration.

Controllers/AdminController.cs

@@ -22,9 +22,14 @@ namespace CarCareTracker.Controllers
             };
             return View(viewModel);
         }
-        public IActionResult GenerateNewToken()
+        public IActionResult GenerateNewToken(string emailAddress)
         {
-            var result = _loginLogic.GenerateUserToken();
+            var result = _loginLogic.GenerateUserToken(emailAddress);
+            return Json(result);
+        }
+        public IActionResult DeleteToken(int tokenId)
+        {
+            var result = _loginLogic.DeleteUserToken(tokenId);
             return Json(result);
         }
     }

External/Implementations/TokenRecordDataAccess.cs

@@ -26,6 +26,15 @@ namespace CarCareTracker.External.Implementations
                 return tokenRecord ?? new Token();
             };
         }
+        public Token GetTokenRecordByEmailAddress(string emailAddress)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<Token>(tableName);
+                var tokenRecord = table.FindOne(Query.EQ(nameof(Token.EmailAddress), emailAddress));
+                return tokenRecord ?? new Token();
+            };
+        }
         public bool CreateNewToken(Token token)
         {
             using (var db = new LiteDatabase(dbName))

External/Implementations/UserRecordDataAccess.cs

@@ -26,6 +26,15 @@ namespace CarCareTracker.External.Implementations
                 return userRecord ?? new UserData();
             };
         }
+        public UserData GetUserRecordByEmailAddress(string emailAddress)
+        {
+            using (var db = new LiteDatabase(dbName))
+            {
+                var table = db.GetCollection<UserData>(tableName);
+                var userRecord = table.FindOne(Query.EQ(nameof(UserData.EmailAddress), emailAddress));
+                return userRecord ?? new UserData();
+            };
+        }
         public UserData GetUserRecordById(int userId)
         {
             using (var db = new LiteDatabase(dbName))

External/Interfaces/ITokenRecordDataAccess.cs

@@ -6,6 +6,7 @@ namespace CarCareTracker.External.Interfaces
     {
         public List<Token> GetTokens();
         public Token GetTokenRecordByBody(string tokenBody);
+        public Token GetTokenRecordByEmailAddress(string emailAddress);
         public bool CreateNewToken(Token token);
         public bool DeleteToken(int tokenId);
     }

External/Interfaces/IUserRecordDataAccess.cs

@@ -6,6 +6,7 @@ namespace CarCareTracker.External.Interfaces
     {
         public List<UserData> GetUsers();
         public UserData GetUserRecordByUserName(string userName);
+        public UserData GetUserRecordByEmailAddress(string emailAddress);
         public UserData GetUserRecordById(int userId);
         public bool SaveUserRecord(UserData userRecord);
         public bool DeleteUserRecord(int userId);

Logic/LoginLogic.cs

@@ -10,7 +10,8 @@ namespace CarCareTracker.Logic
 {
     public interface ILoginLogic
     {
-        bool GenerateUserToken();
+        bool GenerateUserToken(string emailAddress);
+        bool DeleteUserToken(int tokenId);
         OperationResponse RegisterNewUser(LoginModel credentials);
         OperationResponse ResetUserPassword(LoginModel credentials);
         UserData ValidateUserCredentials(LoginModel credentials);
@@ -33,12 +34,12 @@ namespace CarCareTracker.Logic
         {
             //validate their token.
             var existingToken = _tokenData.GetTokenRecordByBody(credentials.Token);
-            if (existingToken.Id == default)
+            if (existingToken.Id == default || existingToken.EmailAddress != credentials.EmailAddress)
             {
                 return new OperationResponse { Success = false, Message = "Invalid Token" };
             }
             //token is valid, check if username and password is acceptable and that username is unique.
-            if (string.IsNullOrWhiteSpace(credentials.UserName) || string.IsNullOrWhiteSpace(credentials.Password))
+            if (string.IsNullOrWhiteSpace(credentials.EmailAddress) || string.IsNullOrWhiteSpace(credentials.UserName) || string.IsNullOrWhiteSpace(credentials.Password))
             {
                 return new OperationResponse { Success = false, Message = "Neither username nor password can be blank" };
             }
@@ -47,6 +48,11 @@ namespace CarCareTracker.Logic
             {
                 return new OperationResponse { Success = false, Message = "Username already taken" };
             }
+            var existingUserWithEmail = _userData.GetUserRecordByEmailAddress(credentials.EmailAddress);
+            if (existingUserWithEmail.Id != default)
+            {
+                return new OperationResponse { Success = false, Message = "A user with that email already exists" };
+            }
             //username is unique then we delete the token and create the user.
             _tokenData.DeleteToken(existingToken.Id);
             var newUser = new UserData()
@@ -58,7 +64,8 @@ namespace CarCareTracker.Logic
             if (result)
             {
                 return new OperationResponse { Success = true, Message = "You will be redirected to the login page briefly." };
-            } else
+            }
+            else
             {
                 return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
             }
@@ -78,7 +85,8 @@ namespace CarCareTracker.Logic
                     UserName = credentials.UserName,
                     IsAdmin = true
                 };
-            } else
+            }
+            else
             {
                 //authenticate via DB.
                 var result = _userData.GetUserRecordByUserName(credentials.UserName);
@@ -86,7 +94,8 @@ namespace CarCareTracker.Logic
                 {
                     result.Password = string.Empty;
                     return result;
-                } else
+                }
+                else
                 {
                     return new UserData();
                 }
@@ -103,15 +112,27 @@ namespace CarCareTracker.Logic
             var result = _tokenData.GetTokens();
             return result;
         }
-        public bool GenerateUserToken()
+        public bool GenerateUserToken(string emailAddress)
         {
+            //check if email address already has a token attached to it.
+            var existingToken = _tokenData.GetTokenRecordByEmailAddress(emailAddress);
+            if (existingToken.Id != default)
+            {
+                return false;
+            }
             var token = new Token()
             {
-                Body = Guid.NewGuid().ToString().Substring(0, 8)
+                Body = Guid.NewGuid().ToString().Substring(0, 8),
+                EmailAddress = emailAddress
             };
             var result = _tokenData.CreateNewToken(token);
             return result;
         }
+        public bool DeleteUserToken(int tokenId)
+        {
+            var result = _tokenData.DeleteToken(tokenId);
+            return result;
+        }
         public OperationResponse ResetUserPassword(LoginModel credentials)
         {
             //user might have forgotten their password.
@@ -126,7 +147,8 @@ namespace CarCareTracker.Logic
             if (result)
             {
                 return new OperationResponse { Success = true, Message = newPassword };
-            } else
+            }
+            else
             {
                 return new OperationResponse { Success = false, Message = "Something went wrong, please try again later." };
             }
@@ -150,7 +172,8 @@ namespace CarCareTracker.Logic
             File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(existingUserConfig));
             return true;
         }
-        public bool DeleteRootUserCredentials() {
+        public bool DeleteRootUserCredentials()
+        {
             var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath);
             var existingUserConfig = JsonSerializer.Deserialize<UserConfig>(configFileContents);
             if (existingUserConfig is not null)

Middleware/Authen.cs

@@ -99,7 +99,7 @@ namespace CarCareTracker.Middleware
                                 //if cookie is expired
                                 return AuthenticateResult.Fail("Expired credentials");
                             }
-                            else if (authCookie.UserData.Id == default || string.IsNullOrWhiteSpace(authCookie.UserData.UserName))
+                            else if (authCookie.UserData is null || authCookie.UserData.Id == default || string.IsNullOrWhiteSpace(authCookie.UserData.UserName))
                             {
                                 return AuthenticateResult.Fail("Corrupted credentials");
                             }

Models/Login/LoginModel.cs

@@ -4,6 +4,7 @@
     {
         public string UserName { get; set; }
         public string Password { get; set; }
+        public string EmailAddress { get; set; }
         public string Token { get; set; }
         public bool IsPersistent { get; set; } = false;
     }

Models/Login/Token.cs

@@ -4,5 +4,6 @@
     {
         public int Id { get; set; }
         public string Body { get; set; }
+        public string EmailAddress { get; set; }
     }
 }

Models/Login/UserData.cs

@@ -4,6 +4,7 @@
     {
         public int Id { get; set; }
         public string UserName { get; set; }
+        public string EmailAddress { get; set; }
         public string Password { get; set; }
         public bool IsAdmin { get; set; }
     }

Views/Admin/Index.cshtml

@@ -1,29 +1,36 @@
-@model AdminViewModel
+@{
+    ViewData["Title"] = "Admin";
+}
+@model AdminViewModel
 <div class="container">
     <div class="row">
-        <div class="col-3">
+        <div class="col-5">
             <div class="row">
                 <button onclick="generateNewToken()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-pencil-square me-2"></i>Generate User Token</button>
             </div>
             <table class="table table-hover">
                 <thead>
                     <tr class="d-flex">
-                        <th scope="col" class="col-8">Token</th>
+                        <th scope="col" class="col-4">Token</th>
-                        <th scope="col" class="col-4">Delete</th>
+                        <th scope="col" class="col-6">Issued To</th>
+                        <th scope="col" class="col-2">Delete</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach (Token token in Model.Tokens)
                     {
-                        <tr class="d-flex" style="cursor:pointer;">
+                        <tr class="d-flex">
-                            <td class="col-8">@token.Body</td>
+                            <td class="col-4" style="cursor:pointer;" onclick="copyToClipboard(this)">@token.Body</td>
-                            <td class="col-4">@token.Id</td>
+                            <td class="col-6 text-truncate">@token.EmailAddress</td>
+                            <td class="col-2">
+                                <button type="button" class="btn btn-danger" onclick="deleteToken(@token.Id, this)"><i class="bi bi-trash"></i></button>
+                            </td>
                         </tr>
                     }
                 </tbody>
             </table>
         </div>
-        <div class="col-9">
+        <div class="col-7">
             <table class="table table-hover">
                 <thead>
                     <tr class="d-flex">
@@ -52,11 +59,43 @@
     function reloadPage() {
         window.location.reload();
     }
-    function generateNewToken(){
+    function deleteToken(tokenId) {
-        $.get('/Admin/GenerateNewToken', function (data) {
+        $.post(`/Admin/DeleteToken?tokenId=${tokenId}`, function (data) {
             if (data) {
                 reloadPage();
             }
         });
     }
+    function copyToClipboard(e) {
+        var textToCopy = e.textContent;
+        navigator.clipboard.writeText(textToCopy);
+        successToast("Copied to Clipboard");
+    }
+    function generateNewToken(){
+        Swal.fire({
+            title: 'Generate Token',
+            html: `
+                        <input type="text" id="inputEmail" class="swal2-input" placeholder="Email Address">
+                        `,
+            confirmButtonText: 'Generate',
+            focusConfirm: false,
+            preConfirm: () => {
+                const emailAddress = $("#inputEmail").val();
+                if (!emailAddress) {
+                    Swal.showValidationMessage(`Please enter an email address`)
+                }
+                return { emailAddress }
+            },
+        }).then(function (result) {
+            if (result.isConfirmed) {
+                $.get('/Admin/GenerateNewToken', {emailAddress: result.value.emailAddress}, function (data) {
+                    if (data) {
+                        reloadPage();
+                    } else {
+                        errorToast("An error occurred, make sure the email address doesn't already have a token generated for it.")
+                    }
+                });
+            }
+        });
+    }
 </script>

Views/Login/Registration.cshtml

@@ -12,6 +12,10 @@
                 <label for="inputToken">Token</label>
                 <input type="text" id="inputToken" class="form-control">
             </div>
+            <div class="form-group">
+                <label for="inputUserName">Email Address</label>
+                <input type="text" id="inputEmail" class="form-control">
+            </div>
             <div class="form-group">
                 <label for="inputUserName">Username</label>
                 <input type="text" id="inputUserName" class="form-control">

wwwroot/js/login.js

@@ -14,7 +14,8 @@ function performRegistration() {
     var token = $("#inputToken").val();
     var userName = $("#inputUserName").val();
     var userPassword = $("#inputUserPassword").val();
-    $.post('/Login/Register', { userName: userName, password: userPassword, token: token }, function (data) {
+    var userEmail = $("#inputEmail").val();
+    $.post('/Login/Register', { userName: userName, password: userPassword, token: token, emailAddress: userEmail }, function (data) {
         if (data.success) {
             successToast(data.message);
             setTimeout(function () { window.location.href = '/Login/Index' }, 500);