mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-03 05:34:21 -04:00
* Expand the list of potential favicon icons to grab. * Added a url mapping functionality to use alternative urls for fetching icons * Initial commit to streamline media encoding. No DB migration yet, No UI changes, no Task changes. * Started refactoring code so that webp queries use encoding format instead. * More refactoring to remove hardcoded webp references. * Moved manual migrations to their own folder to keep things organized. Manually drop the obsolete webp keys. * Removed old apis for converting media and now have one. Reworked where the conversion code was located and streamlined events and whatnot. * Make favicon encode setting aware * Cleaned up favicon conversion * Updated format counter to now just use Extension from MangaFile now that it's been out a while. * Tweaked jumpbar code to reduce a lookup to hashmap. * Added AVIF (8-bit only) support. * In UpdatePeopleList, use FirstOrDefault as Single adds extra checks that may not be needed. * You can now remove weblinks from edit series page and you can leave empty cells, they will just be removed on backend. * Forgot a file * Don't prompt to write a review, just show the pencil. It's the same amount of clicks if you do, less if you dont. * Fixed Refresh token using wrong Claim to look up the user. * Refactored how we refresh authentication to perform it every 10 m ins to ensure we always stay authenticated. * Changed Version update code to run more throughout the day. Updated some hangfire to newer method signatures.
105 lines
3.7 KiB
C#
105 lines
3.7 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IdentityModel.Tokens.Jwt;
|
|
using System.Linq;
|
|
using System.Security.Claims;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.Account;
|
|
using API.Entities;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Microsoft.Extensions.Configuration;
|
|
using Microsoft.IdentityModel.Tokens;
|
|
using static System.Security.Claims.ClaimTypes;
|
|
using JwtRegisteredClaimNames = Microsoft.IdentityModel.JsonWebTokens.JwtRegisteredClaimNames;
|
|
|
|
|
|
namespace API.Services;
|
|
|
|
public interface ITokenService
|
|
{
|
|
Task<string> CreateToken(AppUser user);
|
|
Task<TokenRequestDto?> ValidateRefreshToken(TokenRequestDto request);
|
|
Task<string> CreateRefreshToken(AppUser user);
|
|
}
|
|
|
|
|
|
public class TokenService : ITokenService
|
|
{
|
|
private readonly UserManager<AppUser> _userManager;
|
|
private readonly SymmetricSecurityKey _key;
|
|
private const string RefreshTokenName = "RefreshToken";
|
|
|
|
public TokenService(IConfiguration config, UserManager<AppUser> userManager)
|
|
{
|
|
|
|
_userManager = userManager;
|
|
_key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(config["TokenKey"] ?? string.Empty));
|
|
}
|
|
|
|
public async Task<string> CreateToken(AppUser user)
|
|
{
|
|
var claims = new List<Claim>
|
|
{
|
|
new Claim(JwtRegisteredClaimNames.Name, user.UserName!),
|
|
new Claim(ClaimTypes.NameIdentifier, user.Id.ToString()),
|
|
};
|
|
|
|
var roles = await _userManager.GetRolesAsync(user);
|
|
|
|
claims.AddRange(roles.Select(role => new Claim(Role, role)));
|
|
|
|
var credentials = new SigningCredentials(_key, SecurityAlgorithms.HmacSha512Signature);
|
|
var tokenDescriptor = new SecurityTokenDescriptor()
|
|
{
|
|
Subject = new ClaimsIdentity(claims),
|
|
Expires = DateTime.UtcNow.AddDays(14),
|
|
SigningCredentials = credentials
|
|
};
|
|
|
|
var tokenHandler = new JwtSecurityTokenHandler();
|
|
var token = tokenHandler.CreateToken(tokenDescriptor);
|
|
|
|
return tokenHandler.WriteToken(token);
|
|
}
|
|
|
|
public async Task<string> CreateRefreshToken(AppUser user)
|
|
{
|
|
await _userManager.RemoveAuthenticationTokenAsync(user, TokenOptions.DefaultProvider, RefreshTokenName);
|
|
var refreshToken = await _userManager.GenerateUserTokenAsync(user, TokenOptions.DefaultProvider, RefreshTokenName);
|
|
await _userManager.SetAuthenticationTokenAsync(user, TokenOptions.DefaultProvider, RefreshTokenName, refreshToken);
|
|
return refreshToken;
|
|
}
|
|
|
|
public async Task<TokenRequestDto?> ValidateRefreshToken(TokenRequestDto request)
|
|
{
|
|
try
|
|
{
|
|
var tokenHandler = new JwtSecurityTokenHandler();
|
|
var tokenContent = tokenHandler.ReadJwtToken(request.Token);
|
|
var username = tokenContent.Claims.FirstOrDefault(q => q.Type == JwtRegisteredClaimNames.Name)?.Value;
|
|
if (string.IsNullOrEmpty(username)) return null;
|
|
var user = await _userManager.FindByNameAsync(username);
|
|
if (user == null) return null; // This forces a logout
|
|
var validated = await _userManager.VerifyUserTokenAsync(user, TokenOptions.DefaultProvider, RefreshTokenName, request.RefreshToken);
|
|
if (!validated) return null;
|
|
await _userManager.UpdateSecurityStampAsync(user);
|
|
|
|
return new TokenRequestDto()
|
|
{
|
|
Token = await CreateToken(user),
|
|
RefreshToken = await CreateRefreshToken(user)
|
|
};
|
|
} catch (SecurityTokenExpiredException)
|
|
{
|
|
// Handle expired token
|
|
return null;
|
|
}
|
|
catch (Exception)
|
|
{
|
|
// Handle other exceptions
|
|
return null;
|
|
}
|
|
}
|
|
}
|