From f397ce6c7202571acc278aab02b296a49de358c1 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Mon, 4 May 2020 17:19:23 +0300 Subject: [PATCH] Fixed issue when creating new users --- .../authentication/AbstractAuthenticationService.java | 6 +++--- dmp-db-scema/updates/08/02_Add_missing_columns.sql | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java index 78c6a9830..6d08acb0c 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/services/operations/authentication/AbstractAuthenticationService.java @@ -134,10 +134,10 @@ public abstract class AbstractAuthenticationService implements AuthenticationSer .name(profile.getName()).verified_email(profile.getIsVerified()) .email(profile.getEmail()).created(new Date()).lastloggedin(new Date()) .additionalinfo("{\"data\":{\"avatar\":{\"url\":\"" + profile.getAvatarUrl() - + "\"}},{\"zenodoToken\":\"" + profile.getZenodoId() - + "\", \"expirationDate\": \"" + Instant.now().plusSeconds(profile.getZenodoExpire()).toEpochMilli() + + "\"},\"zenodoToken\":\"" + profile.getZenodoId() + + "\", \"expirationDate\": \"" + Instant.now().plusSeconds((profile.getZenodoExpire() != null ? profile.getZenodoExpire(): 0)).toEpochMilli() + "\", \"zenodoRefresh\": \"" + profile.getZenodoRefresh() - + (profile.getProvider() == TokenValidatorFactoryImpl.LoginProvider.ZENODO ? "\", \"zenodoEmail\": \"" + profile.getEmail() : "") +"\"}") + + (profile.getProvider() == TokenValidatorFactoryImpl.LoginProvider.ZENODO ? "\", \"zenodoEmail\": \"" + profile.getEmail() : "") +"\"}}") .authorization_level((short) 1).usertype((short) 1) .build(); diff --git a/dmp-db-scema/updates/08/02_Add_missing_columns.sql b/dmp-db-scema/updates/08/02_Add_missing_columns.sql index 4036dcdc7..2cecd31cb 100644 --- a/dmp-db-scema/updates/08/02_Add_missing_columns.sql +++ b/dmp-db-scema/updates/08/02_Add_missing_columns.sql @@ -14,4 +14,10 @@ ALTER TABLE public."DatasetProfile" ADD COLUMN "Version" integer; ALTER TABLE public."Grant" -ADD COLUMN "Type" numeric NOT NULL; \ No newline at end of file +ADD COLUMN "Type" numeric NOT NULL; + +ALTER TABLE public."DatasetDataRepository" +ADD COLUMN "Data" character varying; + +ALTER TABLE public."DatasetService" +ADD COLUMN "Data" character varying; \ No newline at end of file