diff --git a/pom.xml b/pom.xml
index a7ff337..64a6e98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,11 @@
+
+ org.apache.httpcomponents
+ httpclient
+ 4.3.4
+
diff --git a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java
index 7210e18..977790f 100644
--- a/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java
+++ b/src/main/java/org/gcube/dataanalysis/dataminer/poolmanager/util/SendMail.java
@@ -7,6 +7,10 @@ import java.util.LinkedList;
***REMOVED***
import org.apache.activemq.transport.stomp.Stomp.Headers.Send;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.util.EntityUtils;
***REMOVED***
import org.gcube.common.authorization.library.AuthorizationEntry;
***REMOVED***
@@ -44,7 +48,7 @@ public class SendMail extends StandardLocalInfraAlgorithm ***REMOVED***
***REMOVED*** put the sender, the recipients, subject and body of the mail here
subject = URLEncoder.encode(subject, "UTF-8");
body = URLEncoder.encode(body, "UTF-8");
- String requestParameters = "&sender=dataminer&recipients=" + this.getAdmins()/*this.username(SecurityTokenProvider.instance.get())*/ + "&subject=" + subject + "&body="
+ String requestParameters = "&sender=dataminer&recipients=" + this.getAdmins() + "&subject=" + subject + "&body="
+ body;
String response = HttpRequest.sendPostRequest(requestForMessage, requestParameters);
@@ -68,30 +72,60 @@ public class SendMail extends StandardLocalInfraAlgorithm ***REMOVED***
return entry.getClientInfo().getId();
***REMOVED***
- public String retrieveAdminRole() throws Exception ***REMOVED***
- String serviceAddress = InfraRetrieval.findEmailingSystemAddress(ScopeProvider.instance.get());
-
- if (!serviceAddress.endsWith("/"))
- serviceAddress = serviceAddress + "/";
-
- String requestForMessage = serviceAddress + "2/users/get-usernames-by-global-role";
- requestForMessage = requestForMessage.replace("https:***REMOVED***", "http:***REMOVED***").replace(":80", "");
- String requestParameters = "role-name=Administrator" + "&gcube-token=" + SecurityTokenProvider.instance.get();
-
- String response = HttpRequest.sendGetRequest(requestForMessage, requestParameters);
- System.out.println(response.toString());
-
- if (response == null) ***REMOVED***
- Exception e = new Exception("Error in querying the recipient");
- throw e;
- ***REMOVED***
- return response;
-
+***REMOVED*** public String retrieveAdminRole() throws Exception ***REMOVED***
+***REMOVED*** String serviceAddress = InfraRetrieval.findEmailingSystemAddress(ScopeProvider.instance.get());
***REMOVED***
+***REMOVED*** if (!serviceAddress.endsWith("/"))
+***REMOVED*** serviceAddress = serviceAddress + "/";
+***REMOVED***
+***REMOVED*** String requestForMessage = serviceAddress + "2/users/get-usernames-by-global-role";
+***REMOVED*** requestForMessage = requestForMessage.replace("https:***REMOVED***", "http:***REMOVED***").replace(":80", "");
+***REMOVED*** String requestParameters = "&role-name=Administrator" + "&gcube-token=" + SecurityTokenProvider.instance.get();
+***REMOVED***
+***REMOVED*** String response = HttpRequest.sendGetRequest(requestForMessage, requestParameters);
+***REMOVED*** System.out.println(response.toString());
+***REMOVED***
+***REMOVED*** if (response == null) ***REMOVED***
+***REMOVED*** Exception e = new Exception("Error in querying the recipient");
+***REMOVED*** throw e;
+***REMOVED*** ***REMOVED***
+***REMOVED*** return response;
+***REMOVED***
+***REMOVED******REMOVED***
+
+
+ public String getAdminRoles() throws Exception***REMOVED***
+
+ ***REMOVED*** discover social gcore endpoint
+
+ ***REMOVED***GcoreEndpointReader ep = new GcoreEndpointReader(ScopeProvider.instance.get());
+
+
+ String serviceAddress = InfraRetrieval.findEmailingSystemAddress(ScopeProvider.instance.get());
+
+
+ ***REMOVED***String serviceAddress = ep.getResourceEntyName();***REMOVED***"https:***REMOVED***socialnetworking1.d4science.org/social-networking-library-ws/rest/";
+ serviceAddress = serviceAddress.endsWith("/") ? serviceAddress : serviceAddress + "/";
+ serviceAddress+= "2/users/get-usernames-by-global-role?";
+ serviceAddress+= "role-name=Administrator" + "&gcube-token=" + SecurityTokenProvider.instance.get();
+
+ System.out.println("Url is " + serviceAddress);
+
+ CloseableHttpClient client = HttpClientBuilder.create().build();
+ HttpGet getReq = new HttpGet(serviceAddress);
+ getReq.setHeader("accept", "application/json");
+ getReq.setHeader("content-type", "application/json");
+ System.out.println(EntityUtils.toString(client.execute(getReq).getEntity()));
+
+ return EntityUtils.toString(client.execute(getReq).getEntity());
+
+***REMOVED***
+
+
public String getAdmins() throws Exception ***REMOVED***
List s = new LinkedList();
- JSONObject obj = new JSONObject(this.retrieveAdminRole());
+ JSONObject obj = new JSONObject(this.getAdminRoles());
JSONArray data = obj.getJSONArray("result");
if (data != null) ***REMOVED***
String[] names = new String[data.length()];
@@ -101,7 +135,6 @@ public class SendMail extends StandardLocalInfraAlgorithm ***REMOVED***
***REMOVED***
s.add(this.username(SecurityTokenProvider.instance.get()));
***REMOVED***
-
return s.toString().replace("[", "").replace("]", "");
***REMOVED***
@@ -136,18 +169,20 @@ public class SendMail extends StandardLocalInfraAlgorithm ***REMOVED***
***REMOVED***
public static void main(String[] args) throws Exception ***REMOVED***
- ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab");
- SecurityTokenProvider.instance.set("***REMOVED***");
+ ScopeProvider.instance.set("/d4science.research-infrastructures.eu/gCubeApps/RPrototypingLab");
+ SecurityTokenProvider.instance.set("***REMOVED***");
***REMOVED***ScopeProvider.instance.set("/gcube/devNext");
- ***REMOVED***SecurityTokenProvider.instance.set("***REMOVED***");
+ ***REMOVED***SecurityTokenProvider.instance.set("aa6eec71-fe07-43ab-bd1c-f03df293e430-98187548");
NotificationHelper nh = new NotificationHelper();
SendMail sm = new SendMail();
sm.sendNotification(nh.getFailedSubject(), nh.getFailedBody("test failed"));
***REMOVED*** sm.username(SecurityTokenProvider.instance.get());
- ***REMOVED*** sm.retrieveAdminRole();
+ ***REMOVED***sm.retrieveAdminRole();
+ ***REMOVED***sm.getAdminRoles();
+ ***REMOVED***System.out.println(sm.getAdmins());
***REMOVED***System.out.println(sm.getAdmins());
***REMOVED*** sm.sendNotification("test", "test");
***REMOVED***