diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java index 5d1b194..d50ebca 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREs.java @@ -49,7 +49,7 @@ public class MyVREs implements EntryPoint { RootPanel.get("myVREsDIV").add(new VresPanel(params)); } else { - myVREsService.getUserQualifierToken(params.context, params.state, params.clientId, params.redirectURI, new AsyncCallback() { + myVREsService.getOAuthTempCode(params.context, params.state, params.clientId, params.redirectURI, new AsyncCallback() { @Override public void onSuccess(AuthorizationBean result) { if (result.isSuccess()) { diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java index 305d427..f93caa8 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsService.java @@ -18,5 +18,5 @@ public interface MyVREsService extends RemoteService { String getSiteLandingPagePath(); - AuthorizationBean getUserQualifierToken(String context, String state, String clientId, String authorisedRedirectURL); + AuthorizationBean getOAuthTempCode(String context, String state, String clientId, String authorisedRedirectURL); } diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java index 5122b9e..90353f2 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/MyVREsServiceAsync.java @@ -15,7 +15,7 @@ public interface MyVREsServiceAsync { void getSiteLandingPagePath(AsyncCallback callback); - void getUserQualifierToken(String context, String state, String clientId, String authorisedRedirectURI, + void getOAuthTempCode(String context, String state, String clientId, String authorisedRedirectURI, AsyncCallback callback); } diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java b/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java index 31004d4..7ea4384 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java @@ -8,6 +8,7 @@ import org.gcube.portlet.user.my_vres.client.widgets.ClickableVRE; import org.gcube.portlet.user.my_vres.shared.VRE; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.ScriptInjector; import com.google.gwt.dom.client.Style.Unit; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; @@ -33,7 +34,7 @@ public class VresPanel extends Composite { private HorizontalPanel imagesPanel = new HorizontalPanel(); private Image loadingImage = new Image(loading); private LinkedHashMap> cachedVREs = null; - + boolean hasVres = false; public VresPanel(GetParameters params) { @@ -48,10 +49,14 @@ public class VresPanel extends Composite { catPanel.setWidth("95%"); loadVREs(params); initWidget(mainPanel); + //change the portlet title only if is an authorisation + if (params != null) + ScriptInjector.fromString("$wnd.jQuery(\".portlet-title-text\").text('Please select in which of your VREs you approve this application');").inject(); + } private void loadVREs(final GetParameters params) { - + mainPanel.add(loadingImage); myVREsService.getUserVREs(new AsyncCallback>>() { @@ -92,9 +97,14 @@ public class VresPanel extends Composite { hasVREs = true; ClickableVRE vreButton = new ClickableVRE(myVREsService, vre, (i < LOAD_MAX_IMAGE_NO), params); flowPanel.add(vreButton); + //do not show the add more placeholder VRE is is an authorisation + if (params != null && vre.getName().compareTo("") == 0) { + mainPanel.remove(catPanel); + flowPanel.remove(vreButton); + } i++; } - + mainPanel.add(flowPanel); } } @@ -107,9 +117,9 @@ public class VresPanel extends Composite { } } - - - + + + diff --git a/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java b/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java index 56fd1c5..1660087 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/client/widgets/ClickableVRE.java @@ -7,6 +7,7 @@ import org.gcube.portlet.user.my_vres.shared.AuthorizationBean; import org.gcube.portlet.user.my_vres.shared.VRE; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.ScriptInjector; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.MouseOverEvent; @@ -62,7 +63,7 @@ public class ClickableVRE extends HTML { if (params != null) { addClickHandler(new ClickHandler() { public void onClick(ClickEvent event) { - myVREsService.getUserQualifierToken(vre.getContext(), params.getState(), params.getClientId(), params.getRedirectURI(), new AsyncCallback() { + myVREsService.getOAuthTempCode(vre.getContext(), params.getState(), params.getClientId(), params.getRedirectURI(), new AsyncCallback() { @Override public void onSuccess(AuthorizationBean result) { if (result.isSuccess()) { @@ -121,8 +122,8 @@ public class ClickableVRE extends HTML { } }); - - } + + } diff --git a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java index 8fd530c..054a9d6 100644 --- a/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java +++ b/src/main/java/org/gcube/portlet/user/my_vres/server/MyVREsServiceImpl.java @@ -57,7 +57,6 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer * needed when querying for authorised services in authentication */ public static final String REDIRECT_URL = "RedirectURL"; - private static final String SERVICE_ENDPOINT_CATEGORY = "OnlineService"; public static final String ADD_MORE_CATEGORY = "Add More"; public static final String ADD_MORE_IMAGE_PATH= "images/More.png"; @@ -263,7 +262,7 @@ public class MyVREsServiceImpl extends RemoteServiceServlet implements MyVREsSer } @Override - public AuthorizationBean getUserQualifierToken(String context, String state, String clientId, String redirectURL) { + public AuthorizationBean getOAuthTempCode(String context, String state, String clientId, String redirectURL) { String infraName = PortalContext.getConfiguration().getInfrastructureName(); if (clientId == null || clientId.compareTo("")== 0) { return new AuthorizationBean(null, null, false, "client_id is null, you MUST register your application to allow users connect with their D4Science Credentials");