Compare commits
8 Commits
Author | SHA1 | Date |
---|---|---|
Massimiliano Assante | d9c73f679b | |
Massimiliano Assante | 669a8e248a | |
Massimiliano Assante | 40633c6ed9 | |
Massimiliano Assante | e82dfa44d1 | |
Massimiliano Assante | c964fea2b4 | |
Massimiliano Assante | 12a11644aa | |
Massimiliano Assante | bf740de4f6 | |
Massimiliano Assante | f634c525ef |
|
@ -0,0 +1,7 @@
|
|||
<root>
|
||||
<facet id="jst.jaxrs">
|
||||
<node name="libprov">
|
||||
<attribute name="provider-id" value="jaxrs-no-op-library-provider"/>
|
||||
</node>
|
||||
</facet>
|
||||
</root>
|
|
@ -5,4 +5,5 @@
|
|||
<installed facet="liferay.hook" version="6.0"/>
|
||||
<installed facet="wst.jsdt.web" version="1.0"/>
|
||||
<installed facet="java" version="1.8"/>
|
||||
<installed facet="jst.jaxrs" version="2.0"/>
|
||||
</faceted-project>
|
||||
|
|
|
@ -4,6 +4,14 @@
|
|||
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).
|
||||
|
||||
## [v2.0.4] - 2021-05-25
|
||||
|
||||
- Feature #21506: Updated to support new UMATokensProvider class
|
||||
|
||||
## [v2.0.3] - 2021-04-12
|
||||
|
||||
Just removed obsolete Home library deps from pom which were forgotten there in 6.8.0 release
|
||||
|
||||
## [v2.0.2] - 2020-11-13
|
||||
|
||||
Feature #20108, remove user deletion from ldap upon remove account (offloaded to keycloak)
|
||||
|
|
20
pom.xml
20
pom.xml
|
@ -13,7 +13,7 @@
|
|||
<artifactId>user-registration-hook</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<name>user-registration-hook Hook</name>
|
||||
<version>2.0.2</version>
|
||||
<version>2.0.4</version>
|
||||
<scm>
|
||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
||||
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||
|
@ -32,7 +32,7 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.distribution</groupId>
|
||||
<artifactId>maven-portal-bom</artifactId>
|
||||
<version>3.6.0</version>
|
||||
<version>3.6.3</version>
|
||||
<type>pom</type>
|
||||
<scope>import</scope>
|
||||
</dependency>
|
||||
|
@ -40,21 +40,6 @@
|
|||
</dependencyManagement>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>home-library</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>home-library-jcr</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.common</groupId>
|
||||
<artifactId>home-library-model</artifactId>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.gcube.core</groupId>
|
||||
<artifactId>common-encryption</artifactId>
|
||||
|
@ -82,7 +67,6 @@
|
|||
<dependency>
|
||||
<groupId>org.gcube.portal</groupId>
|
||||
<artifactId>oidc-library-portal</artifactId>
|
||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
|
|
@ -2,11 +2,15 @@ package org.gcube.portal.usersaccount;
|
|||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
|
||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||
|
||||
import static org.gcube.common.authorization.client.Constants.authorizationService;
|
||||
import org.gcube.common.portal.PortalContext;
|
||||
import org.gcube.common.scope.api.ScopeProvider;
|
||||
import org.gcube.common.storagehub.client.dsl.StorageHubClient;
|
||||
import org.gcube.common.storagehub.model.exceptions.UserNotAuthorizedException;
|
||||
import org.gcube.portal.oidc.lr62.OIDCUmaUtil;
|
||||
import org.gcube.vomanagement.usermanagement.RoleManager;
|
||||
import org.gcube.vomanagement.usermanagement.UserManager;
|
||||
import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager;
|
||||
|
@ -30,7 +34,9 @@ public class WorkspaceCreateAccountThread implements Runnable {
|
|||
|
||||
@Override
|
||||
public void run() {
|
||||
|
||||
getWS(newUserUserName, "/"+PortalContext.getConfiguration().getInfrastructureName());
|
||||
|
||||
}
|
||||
public static void getWS(String currentUsername, String context) {
|
||||
String username = currentUsername;
|
||||
|
@ -38,6 +44,7 @@ public class WorkspaceCreateAccountThread implements Runnable {
|
|||
SecurityTokenProvider.instance.set(authorizationToken);
|
||||
ScopeProvider.instance.set(context);
|
||||
String previousToken = authorizationToken;
|
||||
String previousUMAToken = AccessTokenProvider.instance.get();
|
||||
try {
|
||||
//get the super user
|
||||
String infraContext = "/"+PortalContext.getConfiguration().getInfrastructureName();
|
||||
|
@ -52,6 +59,7 @@ public class WorkspaceCreateAccountThread implements Runnable {
|
|||
}
|
||||
else {
|
||||
GCubeUser theAdmin = users.get(0);
|
||||
_log.debug("Using admin user: " + theAdmin.getUsername() + " to trigger ws creation for new user: " + username);
|
||||
String theAdminToken = PortalContext.getConfiguration().getCurrentUserToken(infraContext, theAdmin.getUsername());
|
||||
List<GCubeRole> theAdminRoles = rm.listRolesByUserAndGroup(theAdmin.getUserId(), groupId);
|
||||
List<String> rolesString = new ArrayList<String>();
|
||||
|
@ -59,10 +67,28 @@ public class WorkspaceCreateAccountThread implements Runnable {
|
|||
rolesString.add(gCubeRole.getRoleName());
|
||||
}
|
||||
authorizationService().setTokenRoles(theAdminToken, rolesString);
|
||||
_log.debug("setTokenRoles performed on context: " + infraContext + " with token" + theAdminToken + " ("+rolesString+")");
|
||||
SecurityTokenProvider.instance.set(theAdminToken);
|
||||
OIDCUmaUtil.provideConfiguredPortalClientUMATokenInThreadLocal("/" + PortalContext.getConfiguration().getInfrastructureName());
|
||||
_log.info("\n\n\n*** new authorizationService PortalClient UMA-Token In ThreadLocal done ****\n\n");
|
||||
StorageHubClient shc = new StorageHubClient();
|
||||
shc.createUserAccount(currentUsername);
|
||||
try {
|
||||
shc.createUserAccount(currentUsername);
|
||||
_log.info("\n*** shub.createUserAccount done for " + currentUsername);
|
||||
}
|
||||
catch (UserNotAuthorizedException e) {
|
||||
_log.error("shub.createUserAccount failed for "+username + " trying with super mega admin ...");
|
||||
theAdminToken = PortalContext.getConfiguration().getCurrentUserToken(infraContext, "lucio.lelii");
|
||||
SecurityTokenProvider.instance.set(theAdminToken);
|
||||
shc = new StorageHubClient();
|
||||
shc.createUserAccount(currentUsername);
|
||||
SecurityTokenProvider.instance.set(previousToken);
|
||||
AccessTokenProvider.instance.set(previousUMAToken);
|
||||
_log.info("shub.createUserAccount performed for "+username + " with super mega admin (Hopefully)");
|
||||
}
|
||||
_log.debug("shub.createUserAccount completed for "+username);
|
||||
SecurityTokenProvider.instance.set(previousToken);
|
||||
AccessTokenProvider.instance.set(previousUMAToken);
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
|
|
Loading…
Reference in New Issue