Compare commits
No commits in common. "41b5bb571b7b2c3b98e20a6cda6d0e8fb2cd716f" and "612efcb91cc660221f1731fbe6b3c9380e47c9fa" have entirely different histories.
41b5bb571b
...
612efcb91c
@ -60,12 +60,6 @@ public class AuthController(IOptionsSnapshot<Admin> user, AuthService auth, Pass
|
|||||||
[ApiExplorerSettings(IgnoreApi = true)]
|
[ApiExplorerSettings(IgnoreApi = true)]
|
||||||
public void OnActionExecuted(ActionExecutedContext context) { }
|
public void OnActionExecuted(ActionExecutedContext context) { }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Handles user authentication by verifying the username/email and password,
|
|
||||||
/// then generating and returning an authentication token if successful.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="request">The login request containing the username/email and password.</param>
|
|
||||||
/// <returns>A TokenResponse containing the access token and its expiry if successful, otherwise an Unauthorized response.</returns>
|
|
||||||
[HttpPost("Login")]
|
[HttpPost("Login")]
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
public async Task<ActionResult<TokenResponse>> Login([FromBody] LoginRequest request)
|
public async Task<ActionResult<TokenResponse>> Login([FromBody] LoginRequest request)
|
||||||
@ -93,10 +87,6 @@ public class AuthController(IOptionsSnapshot<Admin> user, AuthService auth, Pass
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Refreshes the authentication token using the existing refresh token.
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>A TokenResponse containing the new access token and its expiry if successful, otherwise an Unauthorized response.</returns>
|
|
||||||
[HttpGet("ReLogin")]
|
[HttpGet("ReLogin")]
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
public async Task<ActionResult<TokenResponse>> ReLogin()
|
public async Task<ActionResult<TokenResponse>> ReLogin()
|
||||||
@ -130,10 +120,6 @@ public class AuthController(IOptionsSnapshot<Admin> user, AuthService auth, Pass
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Logs the user out by clearing the refresh token and performing any necessary cleanup.
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>An Ok response if the logout was successful.</returns>
|
|
||||||
[HttpGet("Logout")]
|
[HttpGet("Logout")]
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
[Authorize]
|
[Authorize]
|
||||||
@ -147,10 +133,6 @@ public class AuthController(IOptionsSnapshot<Admin> user, AuthService auth, Pass
|
|||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves the role of the authenticated user.
|
|
||||||
/// </summary>
|
|
||||||
/// <returns>The role of the authenticated user.</returns>
|
|
||||||
[HttpGet("GetRole")]
|
[HttpGet("GetRole")]
|
||||||
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
|
||||||
[Authorize]
|
[Authorize]
|
||||||
|
@ -6,7 +6,6 @@ using Mirea.Api.DataAccess.Application;
|
|||||||
using Mirea.Api.DataAccess.Persistence;
|
using Mirea.Api.DataAccess.Persistence;
|
||||||
using Mirea.Api.DataAccess.Persistence.Common;
|
using Mirea.Api.DataAccess.Persistence.Common;
|
||||||
using Mirea.Api.Endpoint.Common.Interfaces;
|
using Mirea.Api.Endpoint.Common.Interfaces;
|
||||||
using Mirea.Api.Endpoint.Common.Model;
|
|
||||||
using Mirea.Api.Endpoint.Common.Services;
|
using Mirea.Api.Endpoint.Common.Services;
|
||||||
using Mirea.Api.Endpoint.Configuration.AppConfig;
|
using Mirea.Api.Endpoint.Configuration.AppConfig;
|
||||||
using Mirea.Api.Endpoint.Configuration.General;
|
using Mirea.Api.Endpoint.Configuration.General;
|
||||||
@ -38,8 +37,6 @@ public class Program
|
|||||||
builder.Configuration.AddConfiguration(EnvironmentConfiguration.GetEnvironment());
|
builder.Configuration.AddConfiguration(EnvironmentConfiguration.GetEnvironment());
|
||||||
builder.Configuration.AddJsonFile(PathBuilder.Combine(GeneralConfig.FilePath), optional: true, reloadOnChange: true);
|
builder.Configuration.AddJsonFile(PathBuilder.Combine(GeneralConfig.FilePath), optional: true, reloadOnChange: true);
|
||||||
builder.Services.Configure<GeneralConfig>(builder.Configuration);
|
builder.Services.Configure<GeneralConfig>(builder.Configuration);
|
||||||
builder.Configuration.AddJsonFile(PathBuilder.Combine(Admin.PathToSave), optional: true, reloadOnChange: true);
|
|
||||||
builder.Services.Configure<Admin>(builder.Configuration);
|
|
||||||
|
|
||||||
builder.Host.AddCustomSerilog();
|
builder.Host.AddCustomSerilog();
|
||||||
AddDatabase(builder.Services, builder.Configuration);
|
AddDatabase(builder.Services, builder.Configuration);
|
||||||
|
@ -81,18 +81,14 @@ public class AuthService(ICacheService cache, IAccessToken accessTokenService, I
|
|||||||
var (token, expireIn) = GenerateAccessToken(authToken.UserId);
|
var (token, expireIn) = GenerateAccessToken(authToken.UserId);
|
||||||
await RevokeAccessToken(authToken.AccessToken);
|
await RevokeAccessToken(authToken.AccessToken);
|
||||||
|
|
||||||
var newRefreshToken = GenerateRefreshToken();
|
|
||||||
|
|
||||||
authToken.AccessToken = token;
|
authToken.AccessToken = token;
|
||||||
authToken.RefreshToken = newRefreshToken;
|
|
||||||
|
|
||||||
await SetAuthTokenDataToCache(request.Fingerprint, authToken, cancellation);
|
await SetAuthTokenDataToCache(request.Fingerprint, authToken, cancellation);
|
||||||
|
|
||||||
return new AuthTokenResponse
|
return new AuthTokenResponse
|
||||||
{
|
{
|
||||||
AccessToken = token,
|
AccessToken = token,
|
||||||
AccessExpiresIn = expireIn,
|
AccessExpiresIn = expireIn,
|
||||||
RefreshToken = newRefreshToken,
|
RefreshToken = GenerateRefreshToken(),
|
||||||
RefreshExpiresIn = DateTime.UtcNow.Add(Lifetime)
|
RefreshExpiresIn = DateTime.UtcNow.Add(Lifetime)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user