diff --git a/PeerAtCodeFramework.jar b/PeerAtCodeFramework.jar index 7caac46..fae30fc 100644 Binary files a/PeerAtCodeFramework.jar and b/PeerAtCodeFramework.jar differ diff --git a/src/dev/peerat/backend/Main.java b/src/dev/peerat/backend/Main.java index de2bd0d..a63157a 100644 --- a/src/dev/peerat/backend/Main.java +++ b/src/dev/peerat/backend/Main.java @@ -108,7 +108,7 @@ public class Main{ router.listen(config.getTcpPort(), config.useSsl()); } - private static void initRoutes(Router 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{