Merge branch 'Sprint/2020-22' into 'master'

Sprint/2020 22

See merge request coscine/api/sts!70

src/STS/Controllers/MergeController.cs

 using Coscine.Api.STS.Data;
 using Coscine.Api.STS.Utils;
-using Coscine.ApiCommons.Utils;
 using Coscine.Database.Models;
+using Coscine.JwtHandler;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using System;
@@ -129,7 +129,7 @@ namespace Coscine.Api.STS.Controllers
             {
                 var mergeToken = Request.Cookies[MERGETOKENKEY];
                 JWTHandler handler = new JWTHandler(Program.Configuration);
-                if (handler.ValidToken(mergeToken))
+                if (handler.IsTokenValid(mergeToken))
                 {
                     return handler.GetContents(mergeToken);
                 }

src/STS/STS.csproj

@@ -11,8 +11,8 @@
   <ItemGroup>
     <PackageReference Include="Coscine.Action" Version="1.16.0" />
     <PackageReference Include="Coscine.ActiveDirectory" Version="1.3.0" />
-    <PackageReference Include="Coscine.ApiCommons" Version="1.10.0" />
-    <PackageReference Include="Coscine.Database" Version="1.26.0" />
+    <PackageReference Include="Coscine.ApiCommons" Version="1.11.0" />
+    <PackageReference Include="Coscine.Database" Version="1.27.0" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Abstractions" Version="2.2.0" />
@@ -32,7 +32,7 @@
     <PackageReference Include="System.DirectoryServices.AccountManagement" Version="4.6.0" />
     <PackageReference Include="System.DirectoryServices.Protocols" Version="4.6.0" />
     <PackageReference Include="Sustainsys.Saml2.AspNetCore2" Version="2.3.0" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.6.0" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.7.1" />
   </ItemGroup>
 
   <ItemGroup>

src/STS/Utils/UrlGenerator.cs

-using Coscine.ApiCommons.Utils;
+using Coscine.JwtHandler;
 using Microsoft.AspNetCore.Http;
 using System.Collections.Generic;
 using System.Net;