Compare commits
5 Commits
Author | SHA1 | Date |
---|---|---|
Alfredo Oliviero | 9bfa40bc1d | |
Massimiliano Assante | d9c73f679b | |
Massimiliano Assante | 669a8e248a | |
Massimiliano Assante | 40633c6ed9 | |
Massimiliano Assante | e82dfa44d1 |
10
CHANGELOG.md
10
CHANGELOG.md
|
@ -4,6 +4,16 @@
|
||||||
All notable changes to this project will be documented in this file.
|
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).
|
This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [v2.1.0-SNAPSHOT] - 2024-09-20
|
||||||
|
|
||||||
|
maven-parent 1.2.0
|
||||||
|
maven-portal-bom 4.0.0-SNAPSHOT
|
||||||
|
Feature #27999 - [StorageHub] downstream components to upgrade in order to work with storagehub 1.5.0
|
||||||
|
|
||||||
|
## [v2.0.4] - 2021-05-25
|
||||||
|
|
||||||
|
- Feature #21506: Updated to support new UMATokensProvider class
|
||||||
|
|
||||||
## [v2.0.3] - 2021-04-12
|
## [v2.0.3] - 2021-04-12
|
||||||
|
|
||||||
Just removed obsolete Home library deps from pom which were forgotten there in 6.8.0 release
|
Just removed obsolete Home library deps from pom which were forgotten there in 6.8.0 release
|
||||||
|
|
7
pom.xml
7
pom.xml
|
@ -6,14 +6,14 @@
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>maven-parent</artifactId>
|
<artifactId>maven-parent</artifactId>
|
||||||
<groupId>org.gcube.tools</groupId>
|
<groupId>org.gcube.tools</groupId>
|
||||||
<version>1.1.0</version>
|
<version>1.2.0</version>
|
||||||
<relativePath />
|
<relativePath />
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.gcube.portal.liferay</groupId>
|
<groupId>org.gcube.portal.liferay</groupId>
|
||||||
<artifactId>user-registration-hook</artifactId>
|
<artifactId>user-registration-hook</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>user-registration-hook Hook</name>
|
<name>user-registration-hook Hook</name>
|
||||||
<version>2.0.3</version>
|
<version>2.1.0-SNAPSHOT</version>
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</connection>
|
<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>
|
<developerConnection>scm:git:https://code-repo.d4science.org/gCubeSystem/${project.artifactId}.git</developerConnection>
|
||||||
|
@ -32,7 +32,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.distribution</groupId>
|
<groupId>org.gcube.distribution</groupId>
|
||||||
<artifactId>maven-portal-bom</artifactId>
|
<artifactId>maven-portal-bom</artifactId>
|
||||||
<version>3.6.1</version>
|
<version>4.0.0-SNAPSHOT</version>
|
||||||
<type>pom</type>
|
<type>pom</type>
|
||||||
<scope>import</scope>
|
<scope>import</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
@ -67,7 +67,6 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.gcube.portal</groupId>
|
<groupId>org.gcube.portal</groupId>
|
||||||
<artifactId>oidc-library-portal</artifactId>
|
<artifactId>oidc-library-portal</artifactId>
|
||||||
<version>[1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT)</version>
|
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -2,8 +2,8 @@ package org.gcube.portal.usersaccount;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.gcube.common.authorization.library.provider.AccessTokenProvider;
|
||||||
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
|
||||||
import org.gcube.common.authorization.library.provider.UmaJWTProvider;
|
|
||||||
|
|
||||||
import static org.gcube.common.authorization.client.Constants.authorizationService;
|
import static org.gcube.common.authorization.client.Constants.authorizationService;
|
||||||
import org.gcube.common.portal.PortalContext;
|
import org.gcube.common.portal.PortalContext;
|
||||||
|
@ -44,7 +44,7 @@ public class WorkspaceCreateAccountThread implements Runnable {
|
||||||
SecurityTokenProvider.instance.set(authorizationToken);
|
SecurityTokenProvider.instance.set(authorizationToken);
|
||||||
ScopeProvider.instance.set(context);
|
ScopeProvider.instance.set(context);
|
||||||
String previousToken = authorizationToken;
|
String previousToken = authorizationToken;
|
||||||
String previousUMAToken = UmaJWTProvider.instance.get();
|
String previousUMAToken = AccessTokenProvider.instance.get();
|
||||||
try {
|
try {
|
||||||
//get the super user
|
//get the super user
|
||||||
String infraContext = "/"+PortalContext.getConfiguration().getInfrastructureName();
|
String infraContext = "/"+PortalContext.getConfiguration().getInfrastructureName();
|
||||||
|
@ -83,12 +83,12 @@ public class WorkspaceCreateAccountThread implements Runnable {
|
||||||
shc = new StorageHubClient();
|
shc = new StorageHubClient();
|
||||||
shc.createUserAccount(currentUsername);
|
shc.createUserAccount(currentUsername);
|
||||||
SecurityTokenProvider.instance.set(previousToken);
|
SecurityTokenProvider.instance.set(previousToken);
|
||||||
UmaJWTProvider.instance.set(previousUMAToken);
|
AccessTokenProvider.instance.set(previousUMAToken);
|
||||||
_log.info("shub.createUserAccount performed for "+username + " with super mega admin (Hopefully)");
|
_log.info("shub.createUserAccount performed for "+username + " with super mega admin (Hopefully)");
|
||||||
}
|
}
|
||||||
_log.debug("shub.createUserAccount completed for "+username);
|
_log.debug("shub.createUserAccount completed for "+username);
|
||||||
SecurityTokenProvider.instance.set(previousToken);
|
SecurityTokenProvider.instance.set(previousToken);
|
||||||
UmaJWTProvider.instance.set(previousUMAToken);
|
AccessTokenProvider.instance.set(previousUMAToken);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
|
|
Loading…
Reference in New Issue