From 87148368a5c68a9fd91120582ec05ca19cd10e8c Mon Sep 17 00:00:00 2001
From: "L. Ellenbeck" <ellenbeck@itc.rwth-aachen.de>
Date: Mon, 2 Nov 2020 12:05:21 +0100
Subject: [PATCH] WIP: fixed get token coscine/issues#1125
---
src/Database.T4/Properties/AssemblyInfo.cs | 2 +-
src/Database.Tests/Properties/AssemblyInfo.cs | 2 +-
src/Database/Models/ApiTokenModel.cs | 9 +++++++--
src/Database/Properties/AssemblyInfo.cs | 2 +-
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/Database.T4/Properties/AssemblyInfo.cs b/src/Database.T4/Properties/AssemblyInfo.cs
index 2b083c6..9a9185b 100644
--- a/src/Database.T4/Properties/AssemblyInfo.cs
+++ b/src/Database.T4/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.T4")]
[assembly: AssemblyVersion("1.26.0")]
[assembly: AssemblyFileVersion("1.26.0")]
-[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0003")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0004")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
diff --git a/src/Database.Tests/Properties/AssemblyInfo.cs b/src/Database.Tests/Properties/AssemblyInfo.cs
index 762e170..a3c7429 100644
--- a/src/Database.Tests/Properties/AssemblyInfo.cs
+++ b/src/Database.Tests/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database.Tests")]
[assembly: AssemblyVersion("1.26.0")]
[assembly: AssemblyFileVersion("1.26.0")]
-[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0003")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0004")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
diff --git a/src/Database/Models/ApiTokenModel.cs b/src/Database/Models/ApiTokenModel.cs
index 4b6ae1f..0f776d6 100644
--- a/src/Database/Models/ApiTokenModel.cs
+++ b/src/Database/Models/ApiTokenModel.cs
@@ -44,8 +44,13 @@ namespace Coscine.Database.Models
public ApiTokenObject GetToken(string userId, string token)
{
- var t = GetWhere(x => x.UserId.ToString() == userId && x.Token.ToLower() == token.ToLower());
- if(t == null)
+ return GetToken(new Guid(userId), token);
+ }
+
+ public ApiTokenObject GetToken(Guid userId, string token)
+ {
+ var t = GetWhere(x => x.UserId == userId && x.Token.ToLower() == token.ToLower());
+ if (t == null)
{
return null;
}
diff --git a/src/Database/Properties/AssemblyInfo.cs b/src/Database/Properties/AssemblyInfo.cs
index 356b223..1493261 100644
--- a/src/Database/Properties/AssemblyInfo.cs
+++ b/src/Database/Properties/AssemblyInfo.cs
@@ -11,6 +11,6 @@ using System.Reflection;
[assembly: AssemblyProduct("Database")]
[assembly: AssemblyVersion("1.26.0")]
[assembly: AssemblyFileVersion("1.26.0")]
-[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0003")]
+[assembly: AssemblyInformationalVersion("1.26.0-topic-1125-apito0004")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
--
GitLab