Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-11-03 19:17:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Prevent two accounts from behing linked to the same external account

Browse Source
This commit is contained in:
Zoe Roux 2024-03-10 15:23:17 +01:00
parent 25b7903c37
commit 08f3e9c06b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
back/src/Kyoo.Authentication/Controllers/OidcController.cs
View File

@ -112,9 +112,12 @@ public class OidcController(
return user; return user;
} }
public async Task<User> LinkAccount(Guid userId, string provider, string code) public async Task<User> LinkAccountOrLogin(Guid userId, string provider, string code)
{ {
(_, ExternalToken extToken) = await _TranslateCode(provider, code); (_, ExternalToken extToken) = await _TranslateCode(provider, code);
User? user = await users.GetByExternalId(provider, extToken.Id);
if (user != null)
return user;
return await users.AddExternalToken(userId, provider, extToken); return await users.AddExternalToken(userId, provider, extToken);
} }
} }

2
back/src/Kyoo.Authentication/Views/AuthApi.cs
View File

@ -173,7 +173,7 @@ namespace Kyoo.Authentication.Views
Guid? userId = User.GetId(); Guid? userId = User.GetId();
User user = userId.HasValue User user = userId.HasValue
? await oidc.LinkAccount(userId.Value, provider, code) ? await oidc.LinkAccountOrLogin(userId.Value, provider, code)
: await oidc.LoginViaCode(provider, code); : await oidc.LoginViaCode(provider, code);
return new JwtToken( return new JwtToken(
tokenController.CreateAccessToken(user, out TimeSpan expireIn), tokenController.CreateAccessToken(user, out TimeSpan expireIn),

2
back/tests/Kyoo.Tests/Database/RepositoryActivator.cs
View File

@ -59,7 +59,7 @@ namespace Kyoo.Tests.Database
SeasonRepository season = new(_NewContext(), thumbs.Object); SeasonRepository season = new(_NewContext(), thumbs.Object);
LibraryItemRepository libraryItem = new(_NewConnection(), new(null)); LibraryItemRepository libraryItem = new(_NewConnection(), new(null));
EpisodeRepository episode = new(_NewContext(), show, thumbs.Object); EpisodeRepository episode = new(_NewContext(), show, thumbs.Object);
UserRepository user = new(_NewContext(), _NewConnection(), new(null), thumbs.Object); UserRepository user = new(_NewContext(), _NewConnection(), new(null), thumbs.Object, new());
_repositories = new IBaseRepository[] _repositories = new IBaseRepository[]
{ {