zoriya/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-12-19 04:55:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch from int ids to guid

Browse Source
This commit is contained in:
Zoe Roux
2023-11-28 17:50:16 +01:00
parent 22348e1554
commit 070a94d87d
32 changed files with 94 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
back/src/Kyoo.Authentication/Controllers/TokenController.cs
View File

@@ -18,7 +18,6 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Security.Claims;
@@ -61,7 +60,7 @@ namespace Kyoo.Authentication
: string.Empty;
List<Claim> claims = new()
{
new Claim(Claims.Id, user.Id.ToString(CultureInfo.InvariantCulture)),
new Claim(Claims.Id, user.Id.ToString()),
new Claim(Claims.Name, user.Username),
new Claim(Claims.Permissions, permissions),
new Claim(Claims.Type, "access")
@@ -85,7 +84,7 @@ namespace Kyoo.Authentication
signingCredentials: credential,
claims: new[]
{
new Claim(Claims.Id, user.Id.ToString(CultureInfo.InvariantCulture)),
new Claim(Claims.Id, user.Id.ToString()),
new Claim(Claims.Guid, Guid.NewGuid().ToString()),
new Claim(Claims.Type, "refresh")
},
@@ -96,7 +95,7 @@ namespace Kyoo.Authentication
}
/// <inheritdoc />
public int GetRefreshTokenUserID(string refreshToken)
public Guid GetRefreshTokenUserID(string refreshToken)
{
SymmetricSecurityKey key = new(Encoding.UTF8.GetBytes(_options.Secret));
JwtSecurityTokenHandler tokenHandler = new();
@@ -120,7 +119,7 @@ namespace Kyoo.Authentication
if (principal.Claims.First(x => x.Type == Claims.Type).Value != "refresh")
throw new SecurityTokenException("Invalid token type. The token should be a refresh token.");
Claim identifier = principal.Claims.First(x => x.Type == Claims.Id);
if (int.TryParse(identifier.Value, out int id))
if (Guid.TryParse(identifier.Value, out Guid id))
return id;
throw new SecurityTokenException("Token not associated to any user.");
}