chore (Auth) : upadate refacto slo

Author: Abner-Evane

auth/src/main/java/org/entcore/auth/oauth/OAuthDataHandler.java

@@ -830,7 +830,7 @@ public void getUserIdByAssertionJwt(String clientId, String assertion, Handler<T
 	}
 
 	@Override
-	public void getAuthorizationsBySessionId(String sessionId, Handler<List<JsonObject>> handler) {
+	public void getAuthorizationsBySessionId(String sessionId, Handler<List<AuthInfo>> handler) {
 		if (sessionId != null) {
 			JsonObject queryData = new JsonObject()
 					.put("sessionId", sessionId)
@@ -842,7 +842,7 @@ public void getAuthorizationsBySessionId(String sessionId, Handler<List<JsonObje
 						handler.handle(Collections.emptyList());
 						return;
 					}
-					handler.handle(filterList(results));
+					handler.handle(filterAuth(results));
 				} else {
 					handler.handle(null);
 				}
@@ -852,20 +852,25 @@ public void getAuthorizationsBySessionId(String sessionId, Handler<List<JsonObje
 		}
 	}
 
-	private List<JsonObject> filterList(JsonArray data) {
-		List<JsonObject> array = new ArrayList<>();
+	private List<AuthInfo> filterAuth(JsonArray data) {
+		List<AuthInfo> array = new ArrayList<AuthInfo>();
 		for (int i = 0; i < data.size(); i++) {
-			JsonObject res = data.getJsonObject(i);
-			res.put("id", res.getString("_id"));
-			res.remove("_id");
-			res.remove("createdAt");
-			array.add(res);
+			JsonObject o = data.getJsonObject(i);
+			o.put("id", o.getString("_id"));
+			o.remove("_id");
+			o.remove("sessionId");
+			o.remove("createdAt");
+			ObjectMapper mapper = new ObjectMapper();
+			try {
+				array.add(mapper.readValue(o.encode(), AuthInfo.class));
+			} catch (IOException e) {
+				log.error(e);
+			}
 		}
 		return array;
 	}
-
 	@Override
-	public void getTokensByAuthId(String authId, Handler<List<JsonObject>> handler) {
+	public void getTokensByAuthId(String authId, Handler<List<AccessToken>> handler) {
 		if (authId != null) {
 			JsonObject query = new JsonObject().put("authId", authId);
 			mongo.find(ACCESS_TOKEN_COLLECTION, query, res -> {
@@ -881,7 +886,23 @@ public void getTokensByAuthId(String authId, Handler<List<JsonObject>> handler)
 				}
 			});
 		}
+	}
 
+	private List<AccessToken> filterList(JsonArray data) {
+		List<AccessToken> array = new ArrayList<>();
+		for (int i = 0; i < data.size(); i++) {
+			AccessToken res = new AccessToken();
+			JsonObject o = data.getJsonObject(i);
+			o.put("id", o.getString("_id"));
+			o.remove("_id");
+			res.setAuthId(o.getString("authId"));
+			res.setCreatedOn(MongoDb.parseIsoDate(o.getJsonObject("createdOn")));
+			res.setExpiresIn(o.getInteger("expiresIn"));
+			res.setIdToken(o.getString("id_token"));
+			res.setToken(o.getString("token"));
+			array.add(res);
+		}
+		return array;
 	}
 
 	@Override

auth/src/main/java/org/entcore/auth/services/OpenIdDataHandler.java

@@ -1,15 +1,11 @@
 package org.entcore.auth.services;
 
-import java.util.List;
 
 import io.vertx.core.eventbus.Message;
 import io.vertx.core.json.JsonObject;
 import jp.eisbahn.oauth2.server.async.Handler;
 
 public interface OpenIdDataHandler {
-       void getAuthorizationsBySessionId(String sessionId, Handler<List<JsonObject>> handler);
-
-       void getTokensByAuthId(String authId, Handler<List<JsonObject>> handler);
 
        void deleteTokensByAuthId(String authId);
 

gradle.properties

@@ -46,5 +46,4 @@ modMongoVersion=4.0-SNAPSHOT
 testContainerVersion=1.17.1
 micrometerMetricsVersion=3.9.5
 micrometerPrometheusVersion=1.1.0
-commonsCollectionsVersion=4.1
-oauth2ServerVersion=1.4.1-develop-wl-SNAPSHOT
+commonsCollectionsVersion=4.1