sec: do not return the error text to the user

ApiDto/Common/OAuthAction.cs

@@ -0,0 +1,17 @@
+namespace Mirea.Api.Dto.Common;
+
+/// <summary>
+/// Defines the actions that can be performed with an OAuth token.
+/// </summary>
+public enum OAuthAction
+{
+    /// <summary>
+    /// The action to log in the user using the provided OAuth token.
+    /// </summary>
+    Login,
+
+    /// <summary>
+    /// The action to bind an OAuth provider to the user's account.
+    /// </summary>
+    Bind
+}

Endpoint/Common/MapperDto/PasswordPolicyConverter.cs

@@ -1,17 +1,17 @@
-using Mirea.Api.Dto.Common;
+using PasswordPolicy = Mirea.Api.Dto.Common.PasswordPolicy;
 
 namespace Mirea.Api.Endpoint.Common.MapperDto;
 
 public static class PasswordPolicyConverter
 {
-    public static Security.Common.Domain.PasswordPolicy ConvertFromDto(this PasswordPolicy policy) =>
+    public static Security.Common.Model.PasswordPolicy ConvertFromDto(this PasswordPolicy policy) =>
         new(policy.MinimumLength,
             policy.RequireLetter,
             policy.RequireLettersDifferentCase,
             policy.RequireDigit,
             policy.RequireSpecialCharacter);
 
-    public static PasswordPolicy ConvertToDto(this Security.Common.Domain.PasswordPolicy policy) =>
+    public static PasswordPolicy ConvertToDto(this Security.Common.Model.PasswordPolicy policy) =>
         new()
         {
             MinimumLength = policy.MinimumLength,

Endpoint/Common/MapperDto/TwoFactorAuthenticationConverter.cs

@@ -1,24 +1,23 @@
 using Mirea.Api.Dto.Common;
-using Mirea.Api.Security.Common.Domain;
 using System;
 
 namespace Mirea.Api.Endpoint.Common.MapperDto;
 
 public static class TwoFactorAuthenticationConverter
 {
-    public static TwoFactorAuthentication ConvertToDto(this TwoFactorAuthenticator authenticator) =>
+    public static TwoFactorAuthentication ConvertToDto(this Security.Common.Model.TwoFactorAuthenticator authenticator) =>
         authenticator switch
         {
-            TwoFactorAuthenticator.None => TwoFactorAuthentication.None,
-            TwoFactorAuthenticator.Totp => TwoFactorAuthentication.TotpRequired,
+            Security.Common.Model.TwoFactorAuthenticator.None => TwoFactorAuthentication.None,
+            Security.Common.Model.TwoFactorAuthenticator.Totp => TwoFactorAuthentication.TotpRequired,
             _ => throw new ArgumentOutOfRangeException(nameof(authenticator), authenticator, null)
         };
 
-    public static TwoFactorAuthenticator ConvertFromDto(this TwoFactorAuthentication authentication) =>
+    public static Security.Common.Model.TwoFactorAuthenticator ConvertFromDto(this TwoFactorAuthentication authentication) =>
         authentication switch
         {
-            TwoFactorAuthentication.None => TwoFactorAuthenticator.None,
-            TwoFactorAuthentication.TotpRequired => TwoFactorAuthenticator.Totp,
+            TwoFactorAuthentication.None => Security.Common.Model.TwoFactorAuthenticator.None,
+            TwoFactorAuthentication.TotpRequired => Security.Common.Model.TwoFactorAuthenticator.Totp,
             _ => throw new ArgumentOutOfRangeException(nameof(authentication), authentication, null)
         };
 }

Endpoint/Common/MapperDto/UserConverter.cs

@@ -0,0 +1,20 @@
+using Mirea.Api.Endpoint.Configuration.Model;
+using Mirea.Api.Security.Common.Model;
+
+namespace Mirea.Api.Endpoint.Common.MapperDto;
+
+public static class UserConverter
+{
+    public static User ConvertToSecurity(this Admin data) =>
+        new()
+        {
+            Id = 1.ToString(),
+            Email = data.Email,
+            Username = data.Username,
+            PasswordHash = data.PasswordHash,
+            Salt = data.Salt,
+            SecondFactorToken = data.Secret,
+            TwoFactorAuthenticator = data.TwoFactorAuthenticator,
+            OAuthProviders = data.OAuthProviders
+        };
+}

Endpoint/Configuration/Core/Middleware/CustomExceptionHandlerMiddleware.cs

@@ -34,10 +34,10 @@ public class CustomExceptionHandlerMiddleware(RequestDelegate next, ILogger<Cust
 
         var problemDetails = new ProblemDetails
         {
-            Type = "https://tools.ietf.org/html/rfc9110#section-15.6",
+            Type = "https://tools.ietf.org/html/rfc9110#section-15.6.1",
             Title = "An unexpected error occurred.",
             Status = StatusCodes.Status500InternalServerError,
-            Detail = exception.Message,
+            Detail = "Please provide this traceId to the administrator for further investigation.",
             Extensions = new Dictionary<string, object?>()
             {
                 { "traceId", traceId }

Endpoint/Configuration/Model/Admin.cs

@@ -1,5 +1,6 @@
 using Mirea.Api.Endpoint.Common.Services;
 using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Model;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.Json;

Endpoint/Configuration/Model/GeneralConfig.cs

@@ -1,6 +1,6 @@
 using Mirea.Api.Endpoint.Common.Services;
 using Mirea.Api.Endpoint.Configuration.Model.GeneralSettings;
-using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Model;
 using System.IO;
 using System.Text.Json;
 using System.Text.Json.Serialization;

Endpoint/Controllers/Configuration/SetupController.cs

@@ -18,7 +18,7 @@ using Mirea.Api.Endpoint.Common.Services;
 using Mirea.Api.Endpoint.Configuration.Model;
 using Mirea.Api.Endpoint.Configuration.Model.GeneralSettings;
 using Mirea.Api.Endpoint.Configuration.Validation.Validators;
-using Mirea.Api.Security.Common.Domain;
+using Mirea.Api.Security.Common.Model;
 using Mirea.Api.Security.Services;
 using MySqlConnector;
 using Npgsql;
@@ -32,6 +32,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Cryptography;
+using CookieOptions = Microsoft.AspNetCore.Http.CookieOptions;
 using PasswordPolicy = Mirea.Api.Dto.Common.PasswordPolicy;
 
 namespace Mirea.Api.Endpoint.Controllers.Configuration;
@@ -539,7 +540,7 @@ public class SetupController(
     [TokenAuthentication]
     public ActionResult<bool> SetPasswordPolicy([FromBody] PasswordPolicy? policy = null)
     {
-        GeneralConfig.PasswordPolicy = policy?.ConvertFromDto() ?? new Security.Common.Domain.PasswordPolicy();
+        GeneralConfig.PasswordPolicy = policy?.ConvertFromDto() ?? new Security.Common.Model.PasswordPolicy();
         cache.Set("password", true);
         return true;
     }

Endpoint/Controllers/V1/AuthController.cs

@@ -11,13 +11,15 @@ using Mirea.Api.Endpoint.Common.Exceptions;
 using Mirea.Api.Endpoint.Common.MapperDto;
 using Mirea.Api.Endpoint.Common.Services;
 using Mirea.Api.Endpoint.Configuration.Model;
-using Mirea.Api.Security.Common.Domain;
 using Mirea.Api.Security.Services;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Diagnostics;
 using System.Linq;
+using System.Security.Claims;
 using System.Threading.Tasks;
+using CookieOptions = Mirea.Api.Security.Common.Model.CookieOptions;
 using OAuthProvider = Mirea.Api.Security.Common.Domain.OAuthProvider;
 
 namespace Mirea.Api.Endpoint.Controllers.V1;
@@ -26,7 +28,7 @@ namespace Mirea.Api.Endpoint.Controllers.V1;
 public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<GeneralConfig> generalConfig, AuthService auth,
     PasswordHashService passwordService, OAuthService oAuthService) : BaseController
 {
-    private CookieOptionsParameters GetCookieParams() =>
+    private CookieOptions GetCookieParams() =>
         new()
         {
             Domain = HttpContext.GetCurrentDomain(),
@@ -53,6 +55,19 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
         return $"<!DOCTYPE html><html lang=ru><head><meta charset=UTF-8><meta content=\"width=device-width,initial-scale=1\"name=viewport><link href=\"https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap\"rel=stylesheet><style>body{{background-color:#121212;color:#fff;font-family:Roboto,sans-serif;display:flex;justify-content:center;align-items:center;height:100vh;margin:0;text-align:center}}.container{{max-width:600px;padding:20px;border-radius:8px;background-color:#1e1e1e;box-shadow:0 4px 20px rgba(0,0,0,.5)}}h1{{font-size:24px;margin-bottom:20px}}</style><title>{title}</title></head><body><div class=container><h1>{title}</h1>{blockInfo}<p style=font-size:14px;color:silver;>{message}</p><code style=font-size:12px;color:gray;>TraceId={traceId}</code></div>{script}</body></html>";
     }
 
+    /// <summary>
+    /// Handles the callback from an OAuth2 provider and finalizes the authorization process.
+    /// </summary>
+    /// <remarks>
+    /// This method processes the response from an OAuth provider after the user authorizes the application. 
+    /// Upon successful authorization, it redirects the user back to the specified callback URL.
+    /// </remarks>
+    /// <param name="code">The authorization code returned by the OAuth provider.</param>
+    /// <param name="state">The state parameter to ensure the request's integrity and prevent CSRF attacks.</param>
+    /// <returns>
+    /// An HTML response indicating the success or failure of the authorization process. 
+    /// If a callback URL is provided, the user will be redirected to it.
+    /// </returns>
     [HttpGet("OAuth2")]
     [BadRequestResponse]
     [Produces("text/html")]
@@ -69,7 +84,7 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
                 traceId,
                 true), "text/html");
 
-        var result = await oAuthService.LoginOAuth(HttpContext, GetCookieParams(),
+        var result = await oAuthService.LoginOAuth(GetCookieParams(), HttpContext,
                 HttpContext.GetApiUrl(Url.Action("OAuth2")!), code, state);
 
         string? callbackUrl = null;
@@ -122,7 +137,7 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
         if (!callback.IsAbsoluteUri)
             throw new ControllerArgumentException("The callback URL must be absolute.");
 
-        return Redirect(oAuthService.GetProviderRedirect(HttpContext, GetCookieParams(),
+        return Redirect(oAuthService.GetProviderRedirect(GetCookieParams(), HttpContext,
             HttpContext.GetApiUrl(Url.Action("OAuth2")!),
             (OAuthProvider)provider,
             callback).AbsoluteUri);
@@ -150,6 +165,67 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
             })
             .ConvertToDto());
 
+    /// <summary>
+    /// Processes the OAuth token
+    /// </summary>
+    /// <param name="token">The OAuth token used for authentication or binding.</param>
+    /// <param name="action">The action to be performed: Login or Bind.</param>
+    /// <returns>If <see cref="OAuthAction.Bind"/> return Ok. If <see cref="OAuthAction.Login"/> return <see cref="TwoFactorAuthentication"/></returns>
+    [HttpGet("HandleToken")]
+    [MaintenanceModeIgnore]
+    [BadRequestResponse]
+    public async Task<ActionResult> HandleToken([FromQuery][MinLength(2)] string token, [FromQuery] OAuthAction action)
+    {
+        var (oAuthUser, error, isSuccess, provider) = await oAuthService.GetOAuthUser(GetCookieParams(), HttpContext, token);
+
+        if (!isSuccess || oAuthUser == null || provider == null)
+            throw new ControllerArgumentException(error ?? "Token processing error.");
+
+        switch (action)
+        {
+            case OAuthAction.Login:
+                return Ok(await auth.LoginOAuthAsync(GetCookieParams(), HttpContext, user.Value.ConvertToSecurity(), oAuthUser, provider.Value));
+
+            case OAuthAction.Bind:
+                var userId = HttpContext.User.FindFirstValue(ClaimTypes.NameIdentifier);
+                var admin = user.Value;
+
+                if (string.IsNullOrEmpty(userId) || !int.TryParse(userId, out var result) || result != 1)
+                    return Unauthorized(new ProblemDetails
+                    {
+                        Type = "https://tools.ietf.org/html/rfc9110#section-15.5.2",
+                        Title = "Unauthorized",
+                        Status = StatusCodes.Status401Unauthorized,
+                        Detail = "The user is not logged in to link accounts.",
+                        Extensions = new Dictionary<string, object?>()
+                        {
+                            { "traceId", Activity.Current?.Id ?? HttpContext.TraceIdentifier }
+                        }
+                    });
+
+                if (admin.OAuthProviders != null && admin.OAuthProviders.ContainsKey(provider.Value))
+                    return Conflict(new ProblemDetails
+                    {
+                        Type = "https://tools.ietf.org/html/rfc9110#section-15.5.10",
+                        Title = "Conflict",
+                        Status = StatusCodes.Status409Conflict,
+                        Detail = "This OAuth provider is already associated with the account.",
+                        Extensions = new Dictionary<string, object?>()
+                        {
+                            { "traceId", Activity.Current?.Id ?? HttpContext.TraceIdentifier }
+                        }
+                    });
+
+                admin.OAuthProviders ??= [];
+                admin.OAuthProviders.Add(provider.Value, oAuthUser);
+                admin.SaveSetting();
+
+                return Ok();
+            default:
+                throw new ControllerArgumentException("The action cannot be processed.");
+        }
+    }
+
     /// <summary>
     /// Logs in a user using their username or email and password.
     /// </summary>
@@ -163,18 +239,9 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
 
         var tokenResult = await auth.LoginAsync(
             GetCookieParams(),
-            new User
-            {
-                Id = 1.ToString(),
-                Username = userEntity.Username,
-                Email = userEntity.Email,
-                PasswordHash = userEntity.PasswordHash,
-                Salt = userEntity.Salt,
-                TwoFactorAuthenticator = userEntity.TwoFactorAuthenticator,
-                SecondFactorToken = userEntity.Secret,
-                OAuthProviders = userEntity.OAuthProviders
-            },
-            HttpContext, request.Password, request.Username);
+            HttpContext,
+            userEntity.ConvertToSecurity(),
+            request.Password, request.Username);
 
         return Ok(tokenResult.ConvertToDto());
     }
@@ -186,11 +253,8 @@ public class AuthController(IOptionsSnapshot<Admin> user, IOptionsSnapshot<Gener
     /// <returns>A boolean indicating whether the two-factor authentication was successful.</returns>
     [HttpPost("2FA")]
     [BadRequestResponse]
-    public async Task<ActionResult<bool>> TwoFactorAuth([FromBody] TwoFactorAuthRequest request)
-    {
-        var tokenResult = await auth.LoginAsync(GetCookieParams(), HttpContext, request.Method.ConvertFromDto(), request.Code);
-        return Ok(tokenResult);
-    }
+    public async Task<ActionResult<bool>> TwoFactorAuth([FromBody] TwoFactorAuthRequest request) =>
+        await auth.LoginAsync(GetCookieParams(), HttpContext, request.Method.ConvertFromDto(), request.Code);
 
     /// <summary>
     /// Refreshes the authentication token using the existing refresh token.

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/Caching/OAuthUserExtension.cs

@@ -0,0 +1,9 @@
+namespace Mirea.Api.Security.Common.Domain.Caching;
+
+internal class OAuthUserExtension
+{
+    public string? Message { get; set; }
+    public bool IsSuccess { get; set; }
+    public required OAuthProvider? Provider { get; set; }
+    public OAuthUser? User { get; set; }
+}

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,37 @@ 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,
+        OAuthUser oAuthUser,
+        OAuthProvider provider,
+        CancellationToken cancellation = default)
+    {
+        if (user.OAuthProviders == null || !user.OAuthProviders.TryGetValue(provider, out var value))
+            throw new SecurityException($"This provider '{Enum.GetName(provider)}' is not linked to the account.");
+
+        if (value.Id != oAuthUser.Id)
+            throw new SecurityException("This account was not linked");
+
+        return 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 +287,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,11 @@
 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.Domain.Caching;
 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 +17,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;
 
@@ -164,7 +167,15 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         }
     }
 
-    public Uri GetProviderRedirect(HttpContext context, CookieOptionsParameters cookieOptions, string redirectUri,
+    private Task StoreOAuthUserInCache(string key, OAuthUserExtension data, CancellationToken cancellation) =>
+        cache.SetAsync(
+            key,
+            JsonSerializer.SerializeToUtf8Bytes(data),
+            slidingExpiration: TimeSpan.FromMinutes(15),
+            cancellationToken: cancellation);
+
+
+    public Uri GetProviderRedirect(CookieOptions cookieOptions, HttpContext context, string redirectUri,
         OAuthProvider provider, Uri callback)
     {
         var (clientId, _) = providers[provider];
@@ -195,24 +206,37 @@ 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(CookieOptions cookieOptions, HttpContext context,
         string redirectUrl, string code, string state, CancellationToken cancellation = default)
     {
-        var result = new LoginOAuthResult()
+        var result = new LoginOAuth()
         {
             Token = GeneratorKey.GenerateBase64(32)
         };
+
         var parts = state.Split('_');
 
         if (parts.Length != 2)
         {
             result.ErrorMessage = "The request data is invalid or malformed.";
+
+            await StoreOAuthUserInCache(result.Token, new OAuthUserExtension()
+            {
+                Message = result.ErrorMessage,
+                Provider = null
+            }, cancellation);
+
             return result;
         }
 
         var payload = DecryptPayload(parts[0]);
         var checksum = parts[1];
 
+        var cacheData = new OAuthUserExtension()
+        {
+            Provider = payload.Provider
+        };
+
         result.Callback = new Uri(payload.Callback);
 
         if (!providers.TryGetValue(payload.Provider, out var providerInfo) ||
@@ -223,6 +247,10 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
                 state);
 
             result.ErrorMessage = "Invalid authorization request. Please try again later.";
+            cacheData.Message = result.ErrorMessage;
+
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -230,6 +258,7 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         var checksumRequest = GetHmacString(requestInfo);
 
         result.ErrorMessage = "Authorization failed. Please try again later.";
+        cacheData.Message = result.ErrorMessage;
 
         if (checksumRequest != checksum)
         {
@@ -240,6 +269,8 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
                 checksum
             );
 
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -255,6 +286,8 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
                 payload.Provider,
                 checksum);
 
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -272,6 +305,8 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
             logger.LogWarning(ex, "Failed to retrieve user information from provider {Provider}",
                 payload.Provider);
 
+            await StoreOAuthUserInCache(result.Token, cacheData, cancellation);
+
             return result;
         }
 
@@ -281,12 +316,75 @@ public class OAuthService(ILogger<OAuthService> logger, Dictionary<OAuthProvider
         result.ErrorMessage = null;
         result.Success = true;
 
-        await cache.SetAsync(
-            result.Token,
-            JsonSerializer.SerializeToUtf8Bytes(user),
-            absoluteExpirationRelativeToNow: TimeSpan.FromMinutes(15),
-            cancellationToken: cancellation);
+        await StoreOAuthUserInCache(result.Token, new OAuthUserExtension
+        {
+            IsSuccess = true,
+            User = user,
+            Provider = payload.Provider
+        }, cancellation);
 
         return result;
     }
+
+    public async Task<(OAuthUser? User, string? Message, bool IsSuccess, OAuthProvider? Provider)>
+        GetOAuthUser(CookieOptions cookieOptions, HttpContext context, string token, CancellationToken cancellation = default)
+    {
+        var requestInfo = new RequestContextInfo(context, cookieOptions);
+
+        var result = await cache.GetAsync<OAuthUserExtension>(token, cancellation);
+        string tokenFailedKey = $"{requestInfo.Fingerprint}_oauth_token_failed";
+
+        if (result == null)
+        {
+            var failedTokenAttemptsCount = await cache.GetAsync<int?>(
+                tokenFailedKey,
+                cancellation) ?? 1;
+
+            var failedTokenCacheExpiration = TimeSpan.FromHours(1);
+
+            if (failedTokenAttemptsCount > 5)
+            {
+                logger.LogWarning(
+                    "Multiple unsuccessful token attempts detected. Token {Token}, Fingerprint: {Fingerprint}. Attempt count: {AttemptCount}.",
+                    token,
+                    requestInfo.Fingerprint,
+                    failedTokenAttemptsCount);
+
+                return (null, "Too many unsuccessful token attempts. Please try again later.", false, null);
+            }
+
+            logger.LogInformation(
+                "Cache data not found or expired for token: {Token}. Fingerprint: {Fingerprint}. Attempt count: {AttemptNumber}.",
+                token,
+                requestInfo.Fingerprint,
+                failedTokenAttemptsCount);
+
+            await cache.SetAsync(tokenFailedKey,
+                failedTokenAttemptsCount + 1,
+                slidingExpiration: failedTokenCacheExpiration,
+                cancellationToken: cancellation);
+
+            return (null, "Invalid or expired token.", false, null);
+        }
+
+        await cache.RemoveAsync(tokenFailedKey, cancellation);
+
+        const string log = "Cache data retrieved for token: {Token}. Fingerprint: {Fingerprint}.";
+
+        if (result.User != null)
+            logger.LogInformation(log + " Provider: {Provider}. UserId: {UserId}.",
+                token,
+                requestInfo.Fingerprint,
+                result.User.Id,
+                result.Provider);
+        else if (result.Provider != null)
+            logger.LogInformation(log + " Provider: {Provider}.",
+                token,
+                requestInfo.Fingerprint,
+                result.Provider);
+        else
+            logger.LogInformation(log, token, requestInfo.Fingerprint);
+
+        return (result.User, result.Message, result.IsSuccess, result.Provider);
+    }
 }

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;