From 66eb81210cd3f9f1cb64695f13ae4b31dc6246c8 Mon Sep 17 00:00:00 2001 From: jeffcheasey88 Date: Sat, 23 Sep 2023 17:19:29 +0200 Subject: [PATCH] Framework not updated? --- PeerAtCodeFramework.jar | Bin 516994 -> 516994 bytes src/dev/peerat/backend/Main.java | 2 +- .../routes/users/MailConfirmation.java | 13 ++++++------- .../peerat/backend/utils/FormResponse.java | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/PeerAtCodeFramework.jar b/PeerAtCodeFramework.jar index 7caac4628683602076027ac1291bf11ccbec453c..fae30fcbd015ebabef700328dfe55dbb7e1215b6 100644 GIT binary patch delta 8881 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 delta 8881 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 K+i!nQboxJT{$ router, DatabaseRepository repo, Configuration config){ + private static void initRoutes(Router router, DatabaseRepository repo, Configuration config) throws Exception{ Map playersWaiting = new HashMap<>(); Mail mail = config.getMail(); Locker groupLock = new Locker<>(); diff --git a/src/dev/peerat/backend/routes/users/MailConfirmation.java b/src/dev/peerat/backend/routes/users/MailConfirmation.java index f83adea..8043874 100644 --- a/src/dev/peerat/backend/routes/users/MailConfirmation.java +++ b/src/dev/peerat/backend/routes/users/MailConfirmation.java @@ -53,20 +53,19 @@ public class MailConfirmation extends FormResponse { String initUsersFilesPath, String gitToken, Map playersWaiting, - Mail mail){ + Mail mail) throws NoSuchAlgorithmException{ + this.databaseRepo = databaseRepo; this.router = router; this.usersFilesPath = initUsersFilesPath; this.gitToken = gitToken; this.playersWaiting = playersWaiting; this.mail = mail; - try { - generator = KeyPairGenerator.getInstance("RSA"); - generator.initialize(4096); - } catch (NoSuchAlgorithmException e){ - e.printStackTrace(); - } + + generator = KeyPairGenerator.getInstance("RSA"); + generator.initialize(4096); encoder = Base64.getEncoder(); + } @RouteDoc(path = "/confirmation", responseCode = 200, responseDescription = "L'utilisateur est inscrit") diff --git a/src/dev/peerat/backend/utils/FormResponse.java b/src/dev/peerat/backend/utils/FormResponse.java index aca7d23..eeb8689 100644 --- a/src/dev/peerat/backend/utils/FormResponse.java +++ b/src/dev/peerat/backend/utils/FormResponse.java @@ -18,8 +18,8 @@ public abstract class FormResponse implements Response{ this.checker = new HashMap<>(); } - public void validator(String key, Pattern regex){ - this.checker.put(key, regex); + public void validator(String key, String regex){ + this.checker.put(key, Pattern.compile(regex)); } public T json(HttpReader reader) throws Exception{