From 20ae0142495478122b8e191c5318350040da9910 Mon Sep 17 00:00:00 2001 From: Luca Frosini Date: Tue, 7 Dec 2021 14:32:47 +0100 Subject: [PATCH] Switched code to use authorization-utils improvements --- pom.xml | 6 ----- .../thread/FakeModerationThread.java | 2 +- .../moderation/thread/zulip/ZulipStream.java | 2 +- .../gcube/gcat/persistence/ckan/CKANUser.java | 27 ++++++++++--------- .../gcat/persistence/ckan/CKANUserCache.java | 2 +- .../persistence/ckan/CKANPackageTest.java | 6 ++--- 6 files changed, 20 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index cc0d897..e715a59 100644 --- a/pom.xml +++ b/pom.xml @@ -148,12 +148,6 @@ [1.0.0,2.0.0-SNAPSHOT) - - org.gcube.common - keycloak-client - [1.0.0,2.0.0-SNAPSHOT) - - io.taliox zulip-java-rest diff --git a/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java b/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java index cf342f8..f12c59f 100644 --- a/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java +++ b/src/main/java/org/gcube/gcat/moderation/thread/FakeModerationThread.java @@ -21,7 +21,7 @@ public class FakeModerationThread extends ModerationThread { @Override public void postUserMessage(CMItemStatus cmItemStatus, String userMessage) throws Exception { logger.info("{} is sending a message to the {} for item '{}' (id={}). ItemStatus={}, Message=\"{}\"", - SecretManager.instance.get().getUsername(), + SecretManager.instance.get().getUser().getUsername(), ModerationThread.class.getSimpleName(), itemName, itemID, cmItemStatus, userMessage); } diff --git a/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java b/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java index 42cb61e..3b5e6b7 100644 --- a/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java +++ b/src/main/java/org/gcube/gcat/moderation/thread/zulip/ZulipStream.java @@ -47,7 +47,7 @@ public class ZulipStream extends ModerationThread { } protected ZulipRestExecutor getZulipRestExecutor() { - ZulipAuth zulipAuth = new ZulipAuth(SecretManager.instance.get().getUsername()); + ZulipAuth zulipAuth = new ZulipAuth(SecretManager.instance.get().getUser().getUsername()); return new ZulipRestExecutor(zulipAuth.getEmail(), zulipAuth.getAPIKey(), zulipAuth.getSite()); } 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 a5c9956..30f647a 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUser.java @@ -8,6 +8,7 @@ import javax.ws.rs.core.Response.Status; import org.gcube.com.fasterxml.jackson.databind.node.ObjectNode; import org.gcube.common.authorization.utils.manager.SecretManager; +import org.gcube.common.authorization.utils.user.User; import org.gcube.gcat.api.moderation.Moderated; import org.gcube.gcat.api.roles.Role; import org.gcube.gcat.utils.RandomString; @@ -64,7 +65,7 @@ public class CKANUser extends CKAN { ObjectNode objectNode = mapper.createObjectNode(); objectNode.put(NAME, name); objectNode.put(PASSWORD, randomString.nextString()); - checkAndSetEMail(objectNode); + checkAndSetEmail(objectNode); checkAndSetFullName(objectNode); checkAndSetJobTitle(objectNode); return create(getAsString(objectNode)); @@ -81,7 +82,7 @@ public class CKANUser extends CKAN { * @return true if the display name and the full name has been updated in objectNode */ private boolean checkAndSetJobTitle(ObjectNode objectNode) { - String jobTitle = SecretManager.instance.get().getTitle(); + String jobTitle = SecretManager.instance.get().getUser().getAbout(); String ckanJobTitle = ""; if(objectNode.has(ABOUT)) { @@ -119,8 +120,8 @@ public class CKANUser extends CKAN { * @param objectNode * @return true if the display name and the full name has been updated */ - private boolean checkAndSetEMail(ObjectNode objectNode) { - String portalEmail = SecretManager.instance.get().getEMail(); + private boolean checkAndSetEmail(ObjectNode objectNode) { + String portalEmail = SecretManager.instance.get().getUser().getEmail(); String ckanEmail = ""; if(objectNode.has(EMAIL)) { @@ -141,7 +142,7 @@ public class CKANUser extends CKAN { ObjectNode objectNode = (ObjectNode) result; boolean toBeUpdated = false; - toBeUpdated = checkAndSetEMail(objectNode) || toBeUpdated; + toBeUpdated = checkAndSetEmail(objectNode) || toBeUpdated; toBeUpdated = checkAndSetFullName(objectNode) || toBeUpdated; toBeUpdated = checkAndSetJobTitle(objectNode) || toBeUpdated; @@ -193,7 +194,7 @@ public class CKANUser extends CKAN { } public static String getCKANUsername() { - String username = SecretManager.instance.get().getUsername(); + String username = SecretManager.instance.get().getUser().getUsername(); return getCKANUsername(username); } @@ -214,7 +215,7 @@ public class CKANUser extends CKAN { public Role getRole() { if(role == null) { role = Role.MEMBER; - Collection roles = SecretManager.instance.get().getRoles(); + Collection roles = SecretManager.instance.get().getUser().getRoles(); for(String portalRole : roles) { Role gotRole = Role.getRoleFromPortalRole(portalRole); if(gotRole != null && gotRole.ordinal() > role.ordinal()) { @@ -251,23 +252,23 @@ public class CKANUser extends CKAN { public boolean isCatalogueModerator() { if(catalogueModerator == null) { - catalogueModerator = SecretManager.instance.get().getRoles().contains(Moderated.CATALOGUE_MODERATOR); + catalogueModerator = SecretManager.instance.get().getUser().getRoles().contains(Moderated.CATALOGUE_MODERATOR); } return catalogueModerator; } public String getSurnameName(){ - SecretManager sm = SecretManager.instance.get(); - return String.format("%s %s", sm.getSurname(), sm.getName()).trim(); + User user = SecretManager.instance.get().getUser(); + return String.format("%s %s", user.getFamilyName(), user.getGivenName()).trim(); } public String getNameSurname() { - SecretManager sm = SecretManager.instance.get(); - return String.format("%s %s", sm.getName(), sm.getSurname()).trim(); + User user = SecretManager.instance.get().getUser(); + return String.format("%s %s", user.getGivenName(), user.getFamilyName()).trim(); } public String getEMail() { - return SecretManager.instance.get().getEMail(); + return SecretManager.instance.get().getUser().getEmail(); } } \ No newline at end of file diff --git a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java index c813b17..9ff1f8c 100644 --- a/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java +++ b/src/main/java/org/gcube/gcat/persistence/ckan/CKANUserCache.java @@ -44,7 +44,7 @@ public abstract class CKANUserCache { userCachePerContext.put(context, userCache); } - String gcubeUsername = SecretManager.instance.get().getUsername(); + String gcubeUsername = SecretManager.instance.get().getUser().getUsername(); CKANUser ckanUser = userCache.get(gcubeUsername); if(ckanUser == null) { ckanUser = new CKANUser(); diff --git a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java index 6914f0d..114ea02 100644 --- a/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java +++ b/src/test/java/org/gcube/gcat/persistence/ckan/CKANPackageTest.java @@ -640,7 +640,7 @@ public class CKANPackageTest extends ContextTest { // logger.debug("{}", res); } - @Ignore + // @Ignore @Test public void deleteAllItemsInAllOrganizations() { CKANPackage ckanPackage = new CKANPackage(); @@ -648,8 +648,8 @@ public class CKANPackageTest extends ContextTest { mvm.add(GCatConstants.OWN_ONLY_QUERY_PARAMETER, "false"); UriInfo uriInfo = getUriInfo(mvm); ckanPackage.setUriInfo(uriInfo); -// String res = ckanPackage.deleteAll(true); -// logger.debug("{}", res); + String res = ckanPackage.deleteAll(true); + logger.debug("{}", res); } @Test