From 63d571a6771639077f3df4f4e962cafbb0d5cc2c Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Tue, 20 Feb 2024 19:03:44 +0100 Subject: [PATCH 1/2] Revert "Replace "System.IdentityModel.Tokens.Jwt" with "Microsoft.IdentityModel.JsonWebTokens"" This reverts commit 156eb166c17b411e6d0ea65c3fd8a305c58c84d7. --- src/iRLeagueApiCore.Client/Http/DefaultTokenStore.cs | 6 ++++-- src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/iRLeagueApiCore.Client/Http/DefaultTokenStore.cs b/src/iRLeagueApiCore.Client/Http/DefaultTokenStore.cs index 21d3fc2a..d7a931c1 100644 --- a/src/iRLeagueApiCore.Client/Http/DefaultTokenStore.cs +++ b/src/iRLeagueApiCore.Client/Http/DefaultTokenStore.cs @@ -1,4 +1,6 @@ -using Microsoft.IdentityModel.JsonWebTokens; +using Microsoft.Extensions.Logging; +using System.IdentityModel.Tokens.Jwt; +using System.Reflection.Metadata; namespace iRLeagueApiCore.Client.Http; internal sealed class DefaultTokenStore : ITokenStore @@ -44,7 +46,7 @@ public async Task SetAccessTokenAsync(string token) if (string.IsNullOrEmpty(accessToken) == false) { // set expiration date - var jwtToken = new JsonWebTokenHandler().ReadToken(accessToken); + var jwtToken = new JwtSecurityTokenHandler().ReadToken(accessToken); AccessTokenExpires = jwtToken.ValidTo; } TokenChanged?.Invoke(this, EventArgs.Empty); diff --git a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj index eccb0e37..35d62114 100644 --- a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj +++ b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj @@ -6,7 +6,7 @@ - + From 3ff7f7ef8d07b58f1bef506a6b7997e9b97998a6 Mon Sep 17 00:00:00 2001 From: Simon Schulze Date: Tue, 20 Feb 2024 19:04:23 +0100 Subject: [PATCH 2/2] bump version to 0.11.1 --- src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj | 2 +- src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj index 35d62114..90bd8373 100644 --- a/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj +++ b/src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj @@ -13,7 +13,7 @@ Library net6.0 iRLeagueApiCore.Client - 0.11.0 + 0.11.1 Simon Schulze Simon Schulze This package contains shared objects for all members of the iRLeagueDatabase-iRLeagueApi stack diff --git a/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj b/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj index 6d91e191..15d051b8 100644 --- a/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj +++ b/src/iRLeagueApiCore.Server/iRLeagueApiCore.Server.csproj @@ -72,7 +72,7 @@ true - 0.11.0 + 0.11.1 enable