diff --git a/CHANGELOG.md b/CHANGELOG.md index ac4463a..1936172 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v1.13.2-SNAPSHOT] + +- Migrated request to social-service-client [#23679] + + ## [v1.13.1] - Aligned code and wiki to the new requirements [#23167] diff --git a/pom.xml b/pom.xml index f8e3cc4..4625317 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.data-catalogue grsf-publisher-ws - 1.13.1 + 1.13.2-SNAPSHOT war grsf-publisher-ws Utility library to publish GRSF products on GRSF catalogue. @@ -56,6 +56,11 @@ org.gcube.common storagehub-client-library + + org.gcube.social-networking + social-service-client + [1.0.0, 2.0.0-SNAPSHOT) + org.jsoup diff --git a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java index f1f01ce..c1a400a 100644 --- a/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java +++ b/src/main/java/org/gcube/data_catalogue/grsf_publish_ws/utils/HelperMethods.java @@ -31,6 +31,7 @@ import org.gcube.datacatalogue.common.caches.CacheInterface; import org.gcube.resources.discovery.client.api.DiscoveryClient; import org.gcube.resources.discovery.client.queries.api.Query; import org.gcube.resources.discovery.client.queries.impl.QueryBox; +import org.gcube.social_networking.social_networking_client_library.UserClient; import org.jsoup.Jsoup; import org.jsoup.safety.Whitelist; import org.slf4j.LoggerFactory; @@ -134,19 +135,16 @@ public abstract class HelperMethods { * @return * @throws Exception */ - public static String getUserEmail(String context, String token){ + public static String getUserEmail(String context, String token) throws Exception{ // check in cache String result = null; if((result = (String) userEmailCache.get(token)) != null){ return result; }else{ - String baseUrl = new GcoreEndPointReaderSocial(context).getBasePath(); - String url = baseUrl.endsWith("/") ? baseUrl + "users/getUserEmail?gcube-token=" + token : - baseUrl + "/users/getUserEmail?gcube-token=" + token; - logger.debug("Request url is " + url); - result = executGETHttpRequest(url, 200); - userEmailCache.insert(token, result); + UserClient userClient = new UserClient(); + String email = userClient.getEmail(); + userEmailCache.insert(token, email); } return result; } @@ -158,19 +156,16 @@ public abstract class HelperMethods { * @return * @throws Exception */ - public static String getUserFullname(String context, String token){ + public static String getUserFullname(String context, String token) throws Exception{ // check in cache String result = null; if((result = (String) userFullnameCache.get(token)) != null){ return result; }else{ - String baseUrl = new GcoreEndPointReaderSocial(context).getBasePath(); - String url = baseUrl.endsWith("/") ? baseUrl + "users/getUserFullname?gcube-token=" + token : - baseUrl + "/users/getUserFullname?gcube-token=" + token; - logger.debug("Request url is " + url); - result = executGETHttpRequest(url, 200); - userFullnameCache.insert(token, result); + UserClient userClient = new UserClient(); + String fuulName = userClient.getFullName(); + userFullnameCache.insert(token, fuulName); } return result; }