Skip to content

Commit 7e01cea

Browse files
committed
IM-695 Fix compile error
1 parent b55e62a commit 7e01cea

File tree

3 files changed

+31
-5
lines changed

3 files changed

+31
-5
lines changed

klab.authentication/src/main/java/org/integratedmodelling/klab/Authentication.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@
6262

6363
import com.google.common.collect.Sets;
6464

65+
import klab.commons.customProperties.utils.CustomPropertyUtils;
66+
6567
public enum Authentication implements IAuthenticationService {
6668

6769
/**
@@ -384,7 +386,7 @@ public IUserIdentity authenticate(ICertificate certificate) throws KlabAuthoriza
384386
NetworkSession networkSession = new NetworkSession(authentication.getUserData().getToken(), hub);
385387

386388
ret = new KlabUser(authentication.getUserData(), authentication.getAuthentication(), networkSession);
387-
389+
388390
Network.INSTANCE.buildNetwork(authentication);
389391

390392
Logging.INSTANCE.info("User " + ((IUserIdentity) ret).getUsername() + " logged in through hub " + hubNode.getId()
@@ -424,6 +426,7 @@ public IUserIdentity authenticate(ICertificate certificate) throws KlabAuthoriza
424426
}
425427

426428
if (ret != null) {
429+
CustomPropertyUtils.deserializeCustomProperties(ret.getGroups());
427430
registerIdentity(ret);
428431
}
429432

klab.hub/pom.xml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,9 @@
7777
<scope>import</scope>
7878
</dependency>
7979
</dependencies>
80+
8081
</dependencyManagement>
82+
8183
<dependencies>
8284

8385
<!-- This section is used for license and JWT generation -->
@@ -108,6 +110,11 @@
108110
<artifactId>org.integratedmodelling.klab.api</artifactId>
109111
<version>${klab.version}</version>
110112
</dependency>
113+
<dependency>
114+
<groupId>org.integratedmodelling</groupId>
115+
<artifactId>klab.commons</artifactId>
116+
<version>${klab.version}</version>
117+
</dependency>
111118
<dependency>
112119
<groupId>org.integratedmodelling</groupId>
113120
<artifactId>klab.authentication</artifactId>
@@ -226,10 +233,25 @@
226233
<version>6.0.20.Final</version>
227234
</dependency>
228235
<dependency>
229-
<groupId>com.fasterxml.jackson.datatype</groupId>
230-
<artifactId>jackson-datatype-jsr310</artifactId>
231-
<version>${jackson-version}</version>
232-
</dependency>
236+
<groupId>com.fasterxml.jackson.core</groupId>
237+
<artifactId>jackson-databind</artifactId>
238+
<version>2.12.4</version>
239+
</dependency>
240+
<dependency>
241+
<groupId>com.fasterxml.jackson.core</groupId>
242+
<artifactId>jackson-core</artifactId>
243+
<version>2.12.4</version>
244+
</dependency>
245+
<dependency>
246+
<groupId>com.fasterxml.jackson.core</groupId>
247+
<artifactId>jackson-annotations</artifactId>
248+
<version>2.12.4</version>
249+
</dependency>
250+
<dependency>
251+
<groupId>com.fasterxml.jackson.datatype</groupId>
252+
<artifactId>jackson-datatype-jsr310</artifactId>
253+
<version>2.12.4</version>
254+
</dependency>
233255
<dependency>
234256
<groupId>com.kjetland</groupId>
235257
<artifactId>mbknor-jackson-jsonschema_2.12</artifactId>

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@
9999
<module>authorities</module>
100100
<module>klab.authentication</module>
101101
<module>klab.activity</module>
102+
<module>klab.commons</module>
102103
</modules>
103104

104105
<properties>

0 commit comments

Comments
 (0)