src/STS/Controllers/MergeController.cs

@@ -128,8 +128,8 @@ namespace Coscine.Api.STS.Controllers
             if (Request.Cookies.ContainsKey(MERGETOKENKEY))
             {
                 var mergeToken = Request.Cookies[MERGETOKENKEY];
-                JWTHandler handler = new JWTHandler(Program.Configuration);
-                if (handler.IsTokenValid(mergeToken))
+                var handler = new JWTHandler(Program.Configuration);
+                if (handler.TryValidateToken(mergeToken))
                 {
                     return handler.GetContents(mergeToken);
                 }

src/STS/STS.csproj

@@ -6,12 +6,12 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<TargetFramework>net6.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-		<Version>4.0.8</Version>
+		<Version>4.0.9</Version>
 	</PropertyGroup>
 	<PropertyGroup>
 		<Authors>RWTH Aachen University</Authors>
 		<Company>IT Center, RWTH Aachen University</Company>
-		<Copyright>2022 IT Center, RWTH Aachen University</Copyright>
+		<Copyright>2023 IT Center, RWTH Aachen University</Copyright>
 		<Description>STS is a part of the Coscine group.</Description>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageProjectUrl>https://git.rwth-aachen.de/coscine/backend/apis/STS</PackageProjectUrl>
@@ -21,6 +21,7 @@
 		<PackageReference Include="Coscine.Action" Version="3.*-*" />
 		<PackageReference Include="Coscine.ActiveDirectory" Version="2.*-*" />
 		<PackageReference Include="Coscine.ApiCommons" Version="2.*-*" />
+		<PackageReference Include="Coscine.JwtHandler" Version="2.*-*" />
 		<PackageReference Include="Coscine.Metadata" Version="2.*-*" />
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.4" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.4" />