Making remote engine working with new comments feature

integratedmodelling · Feb 28, 2024 · e2ec9f9 · e2ec9f9
1 parent d490e66
commit e2ec9f9
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 9 deletions.
diff --git a/klab.authentication/src/main/java/org/integratedmodelling/klab/auth/KlabUser.java b/klab.authentication/src/main/java/org/integratedmodelling/klab/auth/KlabUser.java
@@ -38,9 +38,10 @@ public KlabUser(AuthenticatedIdentity userData,String authToken, NetworkSession
 		this.parent = networkSession;
 	}
 
-	public KlabUser(String username, String token, List<GrantedAuthority> authorities) {
+	public KlabUser(String username, String jwtToken, String authToken, List<GrantedAuthority> authorities) {
 		super(username);
-		this.token = token;
+		this.id = jwtToken;
+		this.token = authToken;
 		this.authorities.addAll(authorities);
 	}
 

diff --git a/klab.authentication/src/main/java/org/integratedmodelling/klab/auth/UserIdentity.java b/klab.authentication/src/main/java/org/integratedmodelling/klab/auth/UserIdentity.java
@@ -120,6 +120,10 @@ public boolean isEnabled() {
     public String getId() {
         return id;
     }
+
+    public void setId(String id) {
+        this.id = id;
+    }
 
     @Override
     public <T extends IIdentity> T getParentIdentity(Class<T> type) {

diff --git a/...org/integratedmodelling/klab/engine/rest/security/PreauthenticatedUserDetailsService.java b/...org/integratedmodelling/klab/engine/rest/security/PreauthenticatedUserDetailsService.java
@@ -60,7 +60,8 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
         }
 
         // anonymous or local user
-        return new KlabUser(username, NameGenerator.newName(), authorities);
+        String tokens = NameGenerator.newName();
+        return new KlabUser(username, tokens, tokens, authorities);
     }
 
 }
diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/EngineAuthResponeFactory.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/EngineAuthResponeFactory.java
@@ -207,7 +207,7 @@ private EngineAuthenticationResponse remoteEngine(ProfileResource profile, Strin
 	    		IdentityReference userIdentity = new IdentityReference(engine.getUsername(), engine.getEmailAddress(),
 	    				LocalDateTime.now().toString());
 	    		AuthenticatedIdentity authenticatedIdentity = new AuthenticatedIdentity(userIdentity, engine.getGroups(),
-	    				LocalDateTime.now().plusDays(90).toString(), engine.getToken());
+	    				LocalDateTime.now().plusDays(90).toString(), engine.getId());
 
 	    		ArrayList<GroupEntry> expired = profile.expiredGroupEntries();
 	    		ArrayList<GroupEntry> expiring = profile.expiringGroupEntries();
@@ -323,7 +323,7 @@ private EngineUser localEngineUser(ProfileResource profile) {
 		EngineUser engine = new EngineUser(profile.getUsername(), null);
 		String token = new JwtToken().createEngineJwtToken(profile);
 		engine.setEmailAddress(profile.getEmail());
-		engine.setToken(token);
+		engine.setId(token);
 		engine.getGroups().addAll(profile.getGroupsList());
 		return engine;
 	}
@@ -332,7 +332,7 @@ private EngineUser remoteEngineUser(ProfileResource profile) {
 		EngineUser engine = new EngineUser(profile.getUsername(), null);
 		String token = new JwtToken().createEngineJwtToken(profile);
 		engine.setEmailAddress(profile.getEmail());
-		engine.setToken(token);
+		engine.setId(token);
 		engine.getGroups().addAll(profile.getGroupsList());
 		return engine;
 	}

diff --git a/...ucts/cloud/src/main/java/org/integratedmodelling/klab/engine/services/HubUserProfile.java b/...ucts/cloud/src/main/java/org/integratedmodelling/klab/engine/services/HubUserProfile.java
@@ -29,6 +29,8 @@ public class HubUserProfile {
 	private List<GroupEntry> groupEntries;
 	@JsonInclude(Include.NON_NULL)
 	private String jwtToken;
+	@JsonInclude(Include.NON_NULL)
+	private String authToken;
 
 	public List<String> getRoles() {
 		return roles;
@@ -69,5 +71,13 @@ public String getJwtToken() {
     public void setJwtToken(String jwtToken) {
         this.jwtToken = jwtToken;
     }
+
+    public String getAuthToken() {
+        return authToken;
+    }
+
+    public void setAuthToken(String authToken) {
+        this.authToken = authToken;
+    }
 
 }
diff --git a/...ucts/cloud/src/main/java/org/integratedmodelling/klab/engine/services/HubUserService.java b/...ucts/cloud/src/main/java/org/integratedmodelling/klab/engine/services/HubUserService.java
@@ -77,9 +77,10 @@ public ResponseEntity<?> login(RemoteUserAuthenticationRequest login) {
 			}
 			if (result != null && result.getStatusCode().is2xxSuccessful()) {
 				HubUserProfile profile = result.getBody().getProfile();
+				String authToken = result.getBody().getAuthentication().getTokenString();
+				profile.setAuthToken(authToken);
 				RemoteUserLoginResponse response = getLoginResponse(profile, null);
-				String token = result.getBody().getAuthentication().getTokenString();
-				response.setAuthorization(token);
+				response.setAuthorization(authToken);
 				return ResponseEntity.status(HttpStatus.ACCEPTED).body(response);
 			} else {
 	            throw new KlabAuthorizationException("Failed to login user: " + login.getUsername());
@@ -168,7 +169,8 @@ private Session processProfile(HubUserProfile profile) {
 			groups.add(group);
 		});
 
-		KlabUser user = new KlabUser(profile.getName(), profile.getJwtToken(), authorities);
+		KlabUser user = new KlabUser(profile.getName(), profile.getJwtToken(),
+				profile.getAuthToken(), authorities);
 		user.setEmailAddress(profile.getEmail());
 		user.getGroups().addAll(groups);