feat: implement authentication handling and view navigation

Signed-off-by: Russell Camo <[email protected]>

GroomWise.Application/Enums/NavigationPage.cs

@@ -0,0 +1,12 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Application.Enums;
+
+public enum NavigationPage
+{
+ Login,
+ Main
+}

GroomWise.Application/GroomWise.Application.csproj

@@ -22,6 +22,12 @@
  <ItemGroup>
  <ProjectReference Include="..\GroomWise.Infrastructure\GroomWise.Infrastructure.csproj" />
 
+
+
+
+
+
+
  </ItemGroup>
 
 

GroomWise.Application/ViewModels/AppViewModel.cs

@@ -1,11 +1,43 @@
 // Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
-// 
+//
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using GroomWise.Application.Enums;
+using GroomWise.Domain.Interfaces;
+using GroomWise.Infrastructure.Authentication.Enums;
+using GroomWise.Infrastructure.Authentication.Interfaces;
+using GroomWise.Infrastructure.Navigation;
+using MvvmGen;
+
 namespace GroomWise.Application.ViewModels;
 
-public class AppViewModel
+[Inject(typeof(IAuthenticationService))]
+[Inject(typeof(IDialogFactory))]
+[ViewModel]
+[ViewModelGenerateInterface]
+public partial class AppViewModel
 {
-
-}
+ [Command]
+ private async Task Logout()
+ {
+ await Task.Run(async () =>
+ {
+ var dialogResult = DialogFactory.Create(
+ "GroomWise",
+ "Are you sure you want to log out?"
+ );
+
+ if (dialogResult == true)
+ {
+ var result = AuthenticationService.Logout();
+
+ await Task.Delay(500);
+ if (result.Equals(AuthenticationStatus.NotAuthenticated))
+ {
+ NavigationService.Instance?.Navigate(NavigationPage.Login);
+ }
+ }
+ });
+ }
+}

GroomWise.Application/ViewModels/LoginViewModel.cs

@@ -3,10 +3,12 @@
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using GroomWise.Application.Enums;
 using GroomWise.Application.Observables;
 using GroomWise.Domain.Enums;
 using GroomWise.Infrastructure.Authentication.Enums;
 using GroomWise.Infrastructure.Authentication.Interfaces;
+using GroomWise.Infrastructure.Navigation;
 using MvvmGen;
 using Swordfish.NET.Collections;
 
@@ -37,7 +39,7 @@ public partial class LoginViewModel
  [Command]
  private async Task Login()
  {
- await Task.Run(() =>
+ await Task.Run(async () =>
  {
  var result = AuthenticationService.Login(Username, Password);
 
@@ -78,7 +80,13 @@ private async Task Login()
  Description = "Login successful."
  }
  );
- Task.Delay(500);
+
+ Username = string.Empty;
+ Password = string.Empty;
+
+ await Task.Delay(1000);
+ Notifications.RemoveLast();
+ NavigationService.Instance?.Navigate(NavigationPage.Main);
  });
  }
 

GroomWise.Domain/Entities/Account.cs

@@ -3,16 +3,15 @@
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using GroomWise.Domain.Entities;
 using GroomWise.Domain.Interfaces;
-using LiteDB;
-
-namespace GroomWise.Domain.Entities;
+using Role = GroomWise.Domain.Enums.Role;
 
 public class Account : IEntity
 {
  public Guid Id { get; set; }
  public string? Username { get; set; }
  public string? Password { get; set; }
-
  public Employee Employee { get; set; }
+ public IList<Role> Roles { get; set; } = new List<Role>();
 }

GroomWise.Domain/Entities/Employee.cs

@@ -26,7 +26,4 @@ public record Employee : IEntity
 
  [BsonRef("appointments")]
  public IList<Appointment>? Appointments { get; set; }
-
- [BsonRef("roles")]
- public IList<Role>? Roles { get; set; }
 }

GroomWise.Domain/Enums/Role.cs

@@ -0,0 +1,15 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Domain.Enums;
+
+public enum Role
+{
+ Admin,
+ Manager,
+ Groomer,
+ User,
+ Custom
+}

GroomWise.Domain/Enums/ViewIdentifier.cs

@@ -0,0 +1,12 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+// 
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Domain.Enums;
+
+public enum ViewIdentifier
+{
+ Login,
+ Main
+}

GroomWise.Domain/Interfaces/IDialogFactory.cs

@@ -0,0 +1,11 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Domain.Interfaces;
+
+public interface IDialogFactory
+{
+ bool? Create(string messageBoxText, string caption);
+}

GroomWise.Infrastructure/Authentication/AuthenticationService.cs

@@ -12,6 +12,7 @@
 using GroomWise.Infrastructure.Session.Entities;
 using Russkyc.DependencyInjection.Attributes;
 using Russkyc.DependencyInjection.Enums;
+using Role = GroomWise.Domain.Enums.Role;
 
 namespace GroomWise.Infrastructure.Authentication;
 
@@ -29,21 +30,27 @@ public AuthenticationService(GroomWiseDbContext dbContext, IEncryptionService en
  _encryptionService = encryptionService;
  }
 
- public void Register(string username, string password, Guid employeeId)
+ public void Register(
+ string username,
+ string password,
+ Role role = Role.User,
+ Guid? employeeId = null
+ )
  {
- var employee = _dbContext.Employees.Get(employee => employee.Id.Equals(employeeId));
+ var account = new Account();
+ account.Username = _encryptionService.Hash(username);
+ account.Password = _encryptionService.Hash(password);
+ account.Roles.Add(role);
 
- if (employee is null)
+ if (employeeId is not null)
  {
- return;
- }
+ var employee = _dbContext.Employees.Get(employee => employee.Id.Equals(employeeId));
 
- var account = new Account
- {
- Username = _encryptionService.Hash(username),
- Password = _encryptionService.Hash(password),
- Employee = employee
- };
+ if (employee is not null)
+ {
+ account.Employee = employee;
+ }
+ }
 
  _dbContext.Accounts.Insert(account);
  }
@@ -71,11 +78,11 @@ public AuthenticationStatus Login(string username, string password)
  return AuthenticationStatus.Authenticated;
  }
 
- public string Update(
+ public UpdateStatus Update(
  string username,
  string password,
- string newUsername = "",
- string newPassword = ""
+ string newUsername,
+ string newPassword
  )
  {
  var account = _dbContext.Accounts.Get(
@@ -86,7 +93,7 @@ public AuthenticationStatus Login(string username, string password)
 
  if (account is null)
  {
- return "Account does not exist.";
+ return UpdateStatus.InvalidAccount;
  }
 
  if (!string.IsNullOrEmpty(username))
@@ -99,18 +106,23 @@ public AuthenticationStatus Login(string username, string password)
  account.Password = _encryptionService.Hash(newPassword);
  }
 
- _dbContext.Accounts.Update(account.Id, account);
+ bool executeUpdate = _dbContext.Accounts.Update(account.Id, account);
+
+ if (executeUpdate)
+ {
+ return UpdateStatus.Success;
+ }
 
- return "Account successfully updated";
+ return UpdateStatus.Fail;
  }
 
- public string Logout()
+ public AuthenticationStatus Logout()
  {
  lock (_lock)
  {
  _sessionInfo = null!;
  }
- return "Logout successful.";
+ return AuthenticationStatus.NotAuthenticated;
  }
 
  public SessionInfo? GetSession()

GroomWise.Infrastructure/Authentication/Enums/AuthenticationStatus.cs

@@ -9,5 +9,6 @@ public enum AuthenticationStatus
 {
  InvalidPassword,
  InvalidAccount,
- Authenticated
+ Authenticated,
+ NotAuthenticated
 }

GroomWise.Infrastructure/Authentication/Enums/UpdateStatus.cs

@@ -0,0 +1,13 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Infrastructure.Authentication.Enums;
+
+public enum UpdateStatus
+{
+ InvalidAccount,
+ Success,
+ Fail
+}

GroomWise.Infrastructure/Authentication/Interfaces/IAuthenticationService.cs

@@ -3,23 +3,20 @@
 // Unauthorized copying or redistribution of all files, in source and binary forms via any medium
 // without written, signed consent from the author is strictly prohibited.
 
+using GroomWise.Domain.Enums;
 using GroomWise.Infrastructure.Authentication.Enums;
 using GroomWise.Infrastructure.Session.Entities;
 
 namespace GroomWise.Infrastructure.Authentication.Interfaces;
 
 public interface IAuthenticationService
 {
- void Register(string username, string password, Guid employeeId);
+ void Register(string username, string password, Role role = Role.User, Guid? employeeId = null);
+
  AuthenticationStatus Login(string username, string password);
 
- string Update(
- string username,
- string password,
- string newUsername = "",
- string newPassword = ""
- );
+ UpdateStatus Update(string username, string password, string newUsername, string newPassword);
 
- string Logout();
+ AuthenticationStatus Logout();
  SessionInfo? GetSession();
 }

GroomWise.Infrastructure/Encryption/CredentialStore.cs

@@ -13,19 +13,18 @@ public partial class CredentialStore
 {
  public void Save(string key, string value)
  {
- using var credential = new Credential
- {
- Target = key,
- Password = value,
- Type = CredentialType.Generic,
- PersistanceType = PersistanceType.LocalComputer
- };
+ using var credential = new Credential();
+ credential.Target = key;
+ credential.Password = value;
+ credential.Type = CredentialType.Generic;
+ credential.PersistanceType = PersistanceType.LocalComputer;
  credential.Save();
  }
 
  public string Get(string key)
  {
- using var credential = new Credential { Target = key };
+ using var credential = new Credential();
+ credential.Target = key;
  credential.Load();
  return credential.Password;
  }

GroomWise.Infrastructure/GroomWise.Infrastructure.csproj

@@ -31,4 +31,12 @@
  <None Remove=".env" />
  </ItemGroup>
 
+
+
+
+
+
+
+
+
 </Project>

GroomWise.Infrastructure/Navigation/Interfaces/INavigationService.cs

@@ -0,0 +1,15 @@
+// Copyright (C) 2023 Russell Camo (Russkyc).- All Rights Reserved
+//
+// Unauthorized copying or redistribution of all files, in source and binary forms via any medium
+// without written, signed consent from the author is strictly prohibited.
+
+namespace GroomWise.Infrastructure.Navigation.Interfaces;
+
+public interface INavigationService
+{
+ static INavigationService Instance { get; }
+ IWindow CurrentWindow { get; }
+ void Add(Enum key, IWindow instance);
+ void Add(Enum key, IPage instance);
+ void Navigate(Enum key);
+}