duplicate interface cleanup

Author: jakeoverall

CodeWorks.Auth.csproj

@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
 
     <PackageId>CodeWorks.Auth</PackageId>
-    <Version>0.0.4</Version>
+    <Version>0.0.5</Version>
     <Authors>CodeWorks</Authors>
     <Company>CodeWorks</Company>
     <Description>Flexible, pluggable authentication module for .NET APIs with JWT, email login, and MFA support.</Description>

Interfaces/IAccountIdentityStore.cs

@@ -9,7 +9,10 @@ public interface IAccountIdentityStore<TIdentity> where TIdentity : IAccountIden
 
   Task<TIdentity> FindByProviderAsync(string provider, string providerId);
 
-  
+  Task CreateAsync(TIdentity user);
+  Task DeleteAsync(string id);
+
+
 
   async public Task<TIdentity> MarkEmailVerifiedAsync(TIdentity user)
   {
@@ -25,4 +28,4 @@ async public Task<bool> IsEmailVerifiedAsync(string email)
     return user != null && user.IsEmailVerified;
   }
 
-}
+}

Interfaces/IAuthService.cs

@@ -0,0 +1,13 @@
+using CodeWorks.Auth.Models;
+
+namespace CodeWorks.Auth.Interfaces;
+
+public interface IAuthService<TIdentity> where TIdentity : IAccountIdentity
+{
+  Task<AuthResult<TIdentity>> LoginAsync(string email, string password);
+  Task<AuthResult<TIdentity>> RegisterAsync(TIdentity user, string password);
+  Task<AuthResult<TIdentity>> ResetPasswordAsync(string email, string newPassword);
+  Task<AuthResult<TIdentity>> RefreshAuthToken(string token, int refreshExtensionInHours = 1);
+  AuthResult<TIdentity> GenerateAuthToken(TIdentity user);
+
+}

Interfaces/IOAuthService.cs

@@ -3,12 +3,9 @@
 
 namespace CodeWorks.Auth.Interfaces;
 
-public interface IOAuthService<TUser> where TUser : IAccountIdentity
+public interface IOAuthService<TIdentity> where TIdentity : IAccountIdentity, new()
 {
-  Task<AuthResult<TUser>> HandleOAuthCallbackAsync(
-      ExternalLoginInfo loginInfo);
-
-  Task<string> GenerateOAuthStateAsync(string provider);
-
+  Task<AuthResult<TIdentity>> HandleOAuthCallbackAsync(ExternalLoginInfo loginInfo);
+  Task<string> GenerateOAuthStateAsync(string provider, string? returnUrl = null);
   Task<bool> ValidateOAuthStateAsync(string state);
 }

Interfaces/IUserTokenStore.cs

@@ -5,4 +5,4 @@ public interface IUserTokenStore
     Task SaveTokenAsync(TokenRecord token);
     Task<TokenRecord> GetValidTokenAsync(string token, EmailTokenPurpose purpose);
     Task MarkTokenUsedAsync(string token);
-}
+}

Services/AuthService.cs

@@ -6,16 +6,6 @@
 
 namespace CodeWorks.Auth.Services;
 
-public interface IAuthService<TIdentity> where TIdentity : IAccountIdentity
-{
-  Task<AuthResult<TIdentity>> LoginAsync(string email, string password);
-  Task<AuthResult<TIdentity>> RegisterAsync(TIdentity user, string password);
-  Task<AuthResult<TIdentity>> ResetPasswordAsync(string email, string newPassword);
-  Task<AuthResult<TIdentity>> RefreshAuthToken(string token, int refreshExtensionInHours = 1);
-  AuthResult<TIdentity> GenerateAuthToken(TIdentity user);
-
-}
-
 public class AuthService<TIdentity>(IAccountIdentityStore<TIdentity> store, IJwtService jwt) : IAuthService<TIdentity> where TIdentity : class, IAccountIdentity
 {
   private readonly IAccountIdentityStore<TIdentity> _store = store;

Services/OAuthService.cs

@@ -6,22 +6,15 @@
 
 namespace CodeWorks.Auth.Services;
 
-public interface IOAuthService<TIdentity> where TIdentity : IAccountIdentity, new()
-{
-    Task<AuthResult<TIdentity>> HandleOAuthCallbackAsync(ExternalLoginInfo loginInfo);
-    Task<string> GenerateOAuthStateAsync(string provider, string? returnUrl = null);
-    Task<bool> ValidateOAuthStateAsync(string state);
-}
-
 public class OAuthService<TIdentity> : IOAuthService<TIdentity> where TIdentity : class, IAccountIdentity, new()
 {
-    private readonly IUserStore<TIdentity> _userStore;
+    private readonly IAccountIdentityStore<TIdentity> _userStore;
     private readonly IAuthService<TIdentity> _authService;
     private readonly IOAuthStateStore _oauthStateStore;
     private readonly ILogger<OAuthService<TIdentity>> _logger;
 
     public OAuthService(
-        IUserStore<TIdentity> userStore,
+        IAccountIdentityStore<TIdentity> userStore,
         IAuthService<TIdentity> authService,
         IOAuthStateStore oauthStateStore,
         ILogger<OAuthService<TIdentity>> logger)
@@ -123,7 +116,7 @@ public async Task<AuthResult<TIdentity>> HandleOAuthCallbackAsync(ExternalLoginI
                     existingUser.ProfilePictureUrl = picture;
                 }
 
-                await _userStore.UpdateAsync(existingUser);
+                await _userStore.SaveAsync(existingUser);
 
                 var token = _authService.GenerateAuthToken(existingUser);
                 return AuthResult<TIdentity>.Success(existingUser, token.Token!);
@@ -177,15 +170,3 @@ public Task<bool> ValidateOAuthStateAsync(string state)
             });
     }
 }
-
-
-// Add to existing IUserStore interface
-public interface IUserStore<TUser> where TUser : IAccountIdentity
-{
-    Task<TUser> FindByEmailAsync(string email);
-    Task<TUser> FindByIdAsync(string id);
-    Task<TUser> FindByProviderAsync(string provider, string providerId);
-    Task CreateAsync(TUser user);
-    Task UpdateAsync(TUser user);
-    Task DeleteAsync(string id);
-}