From d39350aedfeb4e5f75f999aee2b29ff7c8d9cd56 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Wed, 23 Mar 2022 14:10:57 +0100 Subject: [PATCH] Trying to fix the support of clientID --- .../java/org/gcube/gcat/persistence/ckan/CKANUser.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java index 88f9ddd..2d1e9c6 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java @@ -121,13 +121,19 @@ public class CKANUser extends CKAN { * @return true if the display name and the full name has been updated */ private boolean checkAndSetEmail(ObjectNode objectNode) { - String portalEmail = SecretManagerProvider.instance.get().getUser().getEmail(); + User user = SecretManagerProvider.instance.get().getUser(); + String portalEmail = user.getEmail(); String ckanEmail = ""; if(objectNode.has(EMAIL)) { ckanEmail = objectNode.get(EMAIL).asText(); } - if(portalEmail!= null && portalEmail.compareTo(ckanEmail) != 0) { + if(portalEmail==null) { + String username = user.getUsername(); + String eMail = username + "@d4science.org"; + objectNode.put(EMAIL, eMail); + return true; + } else if(portalEmail.compareTo(ckanEmail) != 0) { objectNode.put(EMAIL, portalEmail); return true; }