refactor: distribute the domain folder

Security/Common/Domain/Caching/FirstAuthToken.cs

@@ -1,4 +1,6 @@
-namespace Mirea.Api.Security.Common.Domain.Caching;
+using Mirea.Api.Security.Common.Model;
+
+namespace Mirea.Api.Security.Common.Domain.Caching;
 
 internal class FirstAuthToken
 {

Security/Common/Domain/OAuthPayload.cs

@@ -1,6 +1,6 @@
-namespace Mirea.Api.Security.Common.Domain.OAuth2;
+namespace Mirea.Api.Security.Common.Domain;
 
-public class OAuthPayload
+internal class OAuthPayload
 {
     public required OAuthProvider Provider { get; set; }
     public required string Callback { get; set; }

Security/Common/Domain/OAuthProviderUrisData.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Mirea.Api.Security.Common.Domain.OAuth2;
+namespace Mirea.Api.Security.Common.Domain;
 
 internal readonly struct OAuthProviderUrisData
 {

Security/Common/Domain/RequestContextInfo.cs

@@ -7,7 +7,7 @@ namespace Mirea.Api.Security.Common.Domain;
 
 internal class RequestContextInfo
 {
-    public RequestContextInfo(HttpContext context, CookieOptionsParameters cookieOptions)
+    public RequestContextInfo(HttpContext context, Model.CookieOptions cookieOptions)
     {
         var ipEntity = context.Connection.RemoteIpAddress;
 

Security/Common/Model/CookieOptions.cs

@@ -1,16 +1,16 @@
 using Microsoft.AspNetCore.Http;
 using System;
 
-namespace Mirea.Api.Security.Common.Domain;
+namespace Mirea.Api.Security.Common.Model;
 
-public class CookieOptionsParameters
+public class CookieOptions
 {
     public required string Domain { get; set; }
     public required string Path { get; set; }
 
     internal void SetCookie(HttpContext context, string name, string value, DateTimeOffset? expires = null)
     {
-        var cookieOptions = new CookieOptions
+        var cookieOptions = new Microsoft.AspNetCore.Http.CookieOptions
         {
             Expires = expires,
             Path = Path,

Security/Common/Model/PasswordPolicy.cs

@@ -1,4 +1,4 @@
-namespace Mirea.Api.Security.Common.Domain;
+namespace Mirea.Api.Security.Common.Model;
 
 public class PasswordPolicy(
     int minimumLength = 8,

Security/Common/Model/TwoFactorAuthenticator.cs

@@ -1,4 +1,4 @@
-namespace Mirea.Api.Security.Common.Domain;
+namespace Mirea.Api.Security.Common.Model;
 
 public enum TwoFactorAuthenticator
 {

Security/Common/Model/User.cs

@@ -1,6 +1,7 @@
-using System.Collections.Generic;
+using Mirea.Api.Security.Common.Domain;
+using System.Collections.Generic;
 
-namespace Mirea.Api.Security.Common.Domain;
+namespace Mirea.Api.Security.Common.Model;
 
 public class User
 {

Security/Common/OAuth2/OAuthTokenResponse.cs

@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Security.Common.Domain.OAuth2;
+namespace Mirea.Api.Security.Common.OAuth2;
 
-public class OAuthTokenResponse
+internal class OAuthTokenResponse
 {
     [JsonPropertyName("access_token")]
     public required string AccessToken { get; set; }

Security/Common/OAuth2/UserInfo/GoogleUserInfo.cs

@@ -1,7 +1,8 @@
-using Mirea.Api.Security.Common.Interfaces;
+using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Interfaces;
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Security.Common.Domain.OAuth2.UserInfo;
+namespace Mirea.Api.Security.Common.OAuth2.UserInfo;
 
 internal class GoogleUserInfo : IUserInfo
 {

Security/Common/OAuth2/UserInfo/MailRuUserInfo.cs

@@ -1,7 +1,8 @@
-using Mirea.Api.Security.Common.Interfaces;
+using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Interfaces;
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Security.Common.Domain.OAuth2.UserInfo;
+namespace Mirea.Api.Security.Common.OAuth2.UserInfo;
 
 internal class MailRuUserInfo : IUserInfo
 {

Security/Common/OAuth2/UserInfo/YandexUserInfo.cs

@@ -1,7 +1,8 @@
-using Mirea.Api.Security.Common.Interfaces;
+using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Interfaces;
 using System.Text.Json.Serialization;
 
-namespace Mirea.Api.Security.Common.Domain.OAuth2.UserInfo;
+namespace Mirea.Api.Security.Common.OAuth2.UserInfo;
 
 internal class YandexUserInfo : IUserInfo
 {

Security/Common/ViewModel/LoginOAuth.cs

@@ -1,8 +1,8 @@
 using System;
 
-namespace Mirea.Api.Security.Common.Domain;
+namespace Mirea.Api.Security.Common.ViewModel;
 
-public class LoginOAuthResult
+public class LoginOAuth
 {
     public bool Success { get; set; }
     public required string Token { get; set; }

Security/Services/AuthService.cs

@@ -4,11 +4,13 @@ using Mirea.Api.Security.Common;
 using Mirea.Api.Security.Common.Domain;
 using Mirea.Api.Security.Common.Domain.Caching;
 using Mirea.Api.Security.Common.Interfaces;
+using Mirea.Api.Security.Common.Model;
 using System;
 using System.Security;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using CookieOptions = Mirea.Api.Security.Common.Model.CookieOptions;
 
 namespace Mirea.Api.Security.Services;
 
@@ -94,7 +96,7 @@ public class AuthService(ICacheService cache, IAccessToken accessTokenService, I
         throw new SecurityException("Authentication failed. Please check your credentials.");
     }
 
-    private async Task GenerateAuthTokensAsync(CookieOptionsParameters cookieOptions, HttpContext context,
+    private async Task GenerateAuthTokensAsync(CookieOptions cookieOptions, HttpContext context,
         RequestContextInfo requestContext, string userId, CancellationToken cancellation = default)
     {
         var refreshToken = GenerateRefreshToken();
@@ -118,23 +120,7 @@ public class AuthService(ICacheService cache, IAccessToken accessTokenService, I
             authToken.Fingerprint);
     }
 
-    public async Task<TwoFactorAuthenticator> LoginOAuthAsync(CookieOptionsParameters cookieOptions, HttpContext context, User user,
-        CancellationToken cancellation = default)
-    {
-        var requestContext = new RequestContextInfo(context, cookieOptions);
-
-        if (user.TwoFactorAuthenticator == TwoFactorAuthenticator.None)
-        {
-            await GenerateAuthTokensAsync(cookieOptions, context, requestContext, user.Id, cancellation);
-            return TwoFactorAuthenticator.None;
-        }
-
-        await StoreFirstAuthTokenInCache(user, requestContext, cancellation);
-
-        return user.TwoFactorAuthenticator;
-    }
-
-    public async Task<bool> LoginAsync(CookieOptionsParameters cookieOptions, HttpContext context, TwoFactorAuthenticator authenticator, string code,
+    public async Task<bool> LoginAsync(CookieOptions cookieOptions, HttpContext context, TwoFactorAuthenticator authenticator, string code,
         CancellationToken cancellation = default)
     {
         var requestContext = new RequestContextInfo(context, cookieOptions);
@@ -176,12 +162,12 @@ public class AuthService(ICacheService cache, IAccessToken accessTokenService, I
         return true;
     }
 
-    public async Task<TwoFactorAuthenticator> LoginAsync(CookieOptionsParameters cookieOptions, User user, HttpContext context, string password,
-        string username, CancellationToken cancellation = default)
+    private async Task<TwoFactorAuthenticator> LoginAsync(CookieOptions cookieOptions,
+        HttpContext context,
+        User user,
+        CancellationToken cancellation = default)
     {
         var requestContext = new RequestContextInfo(context, cookieOptions);
-        username = username.Trim();
-        await VerifyUserOrThrowError(requestContext, user, password, username, cancellation);
 
         if (user.TwoFactorAuthenticator == TwoFactorAuthenticator.None)
         {
@@ -194,7 +180,27 @@ public class AuthService(ICacheService cache, IAccessToken accessTokenService, I
         return user.TwoFactorAuthenticator;
     }
 
-    public async Task RefreshTokenAsync(CookieOptionsParameters cookieOptions, HttpContext context, CancellationToken cancellation = default)
+    public Task<TwoFactorAuthenticator> LoginOAuthAsync(CookieOptions cookieOptions,
+        HttpContext context,
+        User user,
+        CancellationToken cancellation = default) =>
+            LoginAsync(cookieOptions, context, user, cancellation);
+
+    public async Task<TwoFactorAuthenticator> LoginAsync(CookieOptions cookieOptions,
+        HttpContext context,
+        User user,
+        string password,
+        string username,
+        CancellationToken cancellation = default)
+    {
+        var requestContext = new RequestContextInfo(context, cookieOptions);
+        username = username.Trim();
+        await VerifyUserOrThrowError(requestContext, user, password, username, cancellation);
+
+        return await LoginAsync(cookieOptions, context, user, cancellation);
+    }
+
+    public async Task RefreshTokenAsync(CookieOptions cookieOptions, HttpContext context, CancellationToken cancellation = default)
     {
         const string defaultMessageError = "The session time has expired";
         var requestContext = new RequestContextInfo(context, cookieOptions);
@@ -271,7 +277,7 @@ public class AuthService(ICacheService cache, IAccessToken accessTokenService, I
         cookieOptions.SetCookie(context, CookieNames.RefreshToken, authToken.RefreshToken, DateTime.UtcNow.Add(Lifetime));
     }
 
-    public async Task LogoutAsync(CookieOptionsParameters cookieOptions, HttpContext context, CancellationToken cancellation = default)
+    public async Task LogoutAsync(CookieOptions cookieOptions, HttpContext context, CancellationToken cancellation = default)
     {
         var requestContext = new RequestContextInfo(context, cookieOptions);
 

Security/Services/OAuthService.cs

@@ -1,9 +1,10 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Mirea.Api.Security.Common.Domain;
-using Mirea.Api.Security.Common.Domain.OAuth2;
-using Mirea.Api.Security.Common.Domain.OAuth2.UserInfo;
 using Mirea.Api.Security.Common.Interfaces;
+using Mirea.Api.Security.Common.OAuth2;
+using Mirea.Api.Security.Common.OAuth2.UserInfo;
+using Mirea.Api.Security.Common.ViewModel;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -15,6 +16,7 @@ using System.Text;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
+using CookieOptions = Mirea.Api.Security.Common.Model.CookieOptions;
 
 namespace Mirea.Api.Security.Services;
 
@@ -165,6 +167,7 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
     }
 
     public Uri GetProviderRedirect(HttpContext context, CookieOptionsParameters cookieOptions, string redirectUri,
+    public Uri GetProviderRedirect(HttpContext context, CookieOptions cookieOptions, string redirectUri,
         OAuthProvider provider, Uri callback)
     {
         var (clientId, _) = providers[provider];
@@ -195,10 +198,10 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
     public (OAuthProvider Provider, Uri Redirect)[] GetAvailableProviders(string redirectUri) =>
         [.. providers.Select(x => (x.Key, new Uri(redirectUri.TrimEnd('/') + "/?provider=" + (int)x.Key)))];
 
-    public async Task<LoginOAuthResult> LoginOAuth(HttpContext context, CookieOptionsParameters cookieOptions,
+    public async Task<LoginOAuth> LoginOAuth(HttpContext context, CookieOptions cookieOptions,
         string redirectUrl, string code, string state, CancellationToken cancellation = default)
     {
-        var result = new LoginOAuthResult()
+        var result = new LoginOAuth()
         {
             Token = GeneratorKey.GenerateBase64(32)
         };

Security/Services/PasswordPolicyService.cs

@@ -1,4 +1,4 @@
-using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Model;
 using System.Linq;
 using System.Security;