From 060d3b6bc93ef5cc2ab0e00fcb70f74b19d68f23 Mon Sep 17 00:00:00 2001
From: "L. Ellenbeck" <ellenbeck@itc.rwth-aachen.de>
Date: Mon, 16 Sep 2019 14:42:14 +0200
Subject: [PATCH] Fix: Add and change surname and givenname
(coscine/issues#280)
---
.gitignore | 5 ++++-
src/STS/Controllers/ORCiDController.cs | 14 ++++++++------
src/STS/STS.csproj | 3 ++-
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/.gitignore b/.gitignore
index d2df1da..b0823ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -264,7 +264,10 @@ paket-files/
__pycache__/
*.pyc
-#cake
+# cake
tools/*
!tools/packages.config
dist/
+
+# linq2db clutter
+src/.tools/*
diff --git a/src/STS/Controllers/ORCiDController.cs b/src/STS/Controllers/ORCiDController.cs
index 5d005e8..bc24587 100644
--- a/src/STS/Controllers/ORCiDController.cs
+++ b/src/STS/Controllers/ORCiDController.cs
@@ -33,8 +33,8 @@ namespace Coscine.STS.Controllers
if (ModelState.IsValid)
{
var claimsPrincipal = ORCiDHandler.VerifiyORCiDJWT(model.ORCiD_JWT);
- string surName = "";
- string givenName = "";
+ string surname = "";
+ string givenname = "";
string ORCiD = "";
foreach (var claim in claimsPrincipal.Claims)
{
@@ -44,11 +44,11 @@ namespace Coscine.STS.Controllers
}
else if(claim.Type == ClaimTypes.Surname)
{
- surName = claim.Value;
+ surname = claim.Value;
}
else if(claim.Type == ClaimTypes.GivenName)
{
- givenName = claim.Value;
+ givenname = claim.Value;
}
}
@@ -67,8 +67,10 @@ namespace Coscine.STS.Controllers
UserPlainModel userPlainModel = new UserPlainModel(Program.Configuration);
var user = new User
{
- DisplayName = surName + " " + givenName,
- EmailAddress = ORCiD + "@orcid.org"
+ DisplayName = givenname + " " + surname,
+ EmailAddress = ORCiD + "@orcid.org",
+ Surname = surname,
+ Givenname = givenname
};
userPlainModel.Insert(user);
externalIdModel.Insert(new ExternalId
diff --git a/src/STS/STS.csproj b/src/STS/STS.csproj
index d3a277d..e5478a9 100644
--- a/src/STS/STS.csproj
+++ b/src/STS/STS.csproj
@@ -9,7 +9,8 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="Coscine.ApiCommons" Version="1.2.0" />
+ <PackageReference Include="Coscine.ApiCommons" Version="1.2.1" />
+ <PackageReference Include="Coscine.Database" Version="1.5.1" />
<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" />
--
GitLab