#1284 Fixed duplicate key error for currentUser endpoint when logging to duplicate keycloak

dragonpoo · dragonpoo · commit e42b8324d8e2 · 2024-11-22T12:04:20.000-05:00
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java
@@ -418,7 +418,7 @@ protected Map<String, Object> convertConnections(Set<Connection> connections) {
         return connections.stream()
                 .filter(connection -> !AuthSourceConstants.EMAIL.equals(connection.getSource()) &&
                         !AuthSourceConstants.PHONE.equals(connection.getSource()))
-                .collect(Collectors.toMap(Connection::getSource, Connection::getRawUserInfo));
+                .collect(Collectors.toMap(Connection::getAuthId, Connection::getRawUserInfo));
     }
 
     protected String convertEmail(Set<Connection> connections) {

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ protected Map<String, Object> convertConnections(Set<Connection> connections) {`
`418`	`418`	`return connections.stream()`
`419`	`419`	`.filter(connection -> !AuthSourceConstants.EMAIL.equals(connection.getSource()) &&`
`420`	`420`	`!AuthSourceConstants.PHONE.equals(connection.getSource()))`
`421`		`- .collect(Collectors.toMap(Connection::getSource, Connection::getRawUserInfo));`
	`421`	`+ .collect(Collectors.toMap(Connection::getAuthId, Connection::getRawUserInfo));`
`422`	`422`	`}`
`423`	`423`
`424`	`424`	`protected String convertEmail(Set<Connection> connections) {`