From 7b40c6edea72bc42c7f0933929736eefaffddb5e Mon Sep 17 00:00:00 2001
From: jeffcheasey88 <jeffcheasey88@peerat.dev>
Date: Sun, 26 Jan 2025 11:16:20 +0100
Subject: [PATCH] Fix given dependencies

---
 src/dev/peerat/backend/Main.java                          | 4 ++--
 src/dev/peerat/backend/routes/Swagger.java                | 2 +-
 src/dev/peerat/backend/routes/users/MailConfirmation.java | 8 ++++----
 src/dev/peerat/backend/routes/users/Register.java         | 5 +++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/dev/peerat/backend/Main.java b/src/dev/peerat/backend/Main.java
index efaa6f9..c5d01cd 100644
--- a/src/dev/peerat/backend/Main.java
+++ b/src/dev/peerat/backend/Main.java
@@ -146,8 +146,8 @@ public class Main{
 	}
 
 	private static void initRoutes(Router<PeerAtUser> router, DatabaseRepository repo, Configuration config) throws Exception{
-		router.registerPackages(new DependencyInjector()
-				.of(repo, router, config, new RouteExtracter(router))
+		router.registerPackages("dev.peerat.backend.routes",new DependencyInjector()
+				.of(repo, router, config, new RouteExtracter(router), config.getMail())
 				.of("waitting", new HashMap<>())
 				.of("leaderboard", new Locker<>())
 				.of("groups", new Locker<>()));
diff --git a/src/dev/peerat/backend/routes/Swagger.java b/src/dev/peerat/backend/routes/Swagger.java
index afe35d4..05a1e4f 100644
--- a/src/dev/peerat/backend/routes/Swagger.java
+++ b/src/dev/peerat/backend/routes/Swagger.java
@@ -17,7 +17,7 @@ public class Swagger implements Response{
 	
 	public Swagger(RouteExtracter extracter, Configuration config){
 		try{
-			this.json = extracter.swagger(config.getTokenIssuer()).toString();
+//			this.json = extracter.swagger(config.getTokenIssuer()).toString();
 		}catch(Exception e){
 			e.printStackTrace();
 			json = "{}";
diff --git a/src/dev/peerat/backend/routes/users/MailConfirmation.java b/src/dev/peerat/backend/routes/users/MailConfirmation.java
index a222c2c..20c9bbf 100644
--- a/src/dev/peerat/backend/routes/users/MailConfirmation.java
+++ b/src/dev/peerat/backend/routes/users/MailConfirmation.java
@@ -29,6 +29,7 @@ import javax.net.ssl.HttpsURLConnection;
 import org.jose4j.json.internal.json_simple.JSONAware;
 import org.jose4j.json.internal.json_simple.JSONObject;
 
+import dev.peerat.backend.Configuration;
 import dev.peerat.backend.bonus.extract.RouteDoc;
 import dev.peerat.backend.model.PeerAtUser;
 import dev.peerat.backend.repository.DatabaseAuthRepository;
@@ -58,15 +59,14 @@ public class MailConfirmation extends FormResponse{
 	public MailConfirmation(
 			DatabaseRepository databaseRepo,
 			Router<PeerAtUser> router,
-			@Injection("usersFiles") String initUsersFilesPath,
-			@Injection("gitToken") String gitToken,
+			Configuration config,
 			@Injection("waitting") Map<String, String> playersWaiting,
 			Mail mail) throws NoSuchAlgorithmException{
 		
 		this.databaseRepo = databaseRepo.getAuthRepository();
 		this.router = router;
-		this.usersFilesPath = initUsersFilesPath;
-		this.gitToken = gitToken;
+		this.usersFilesPath = config.getUsersFiles();
+		this.gitToken = config.getGitToken();
 		this.playersWaiting = playersWaiting;
 		this.mail = mail;
 		
diff --git a/src/dev/peerat/backend/routes/users/Register.java b/src/dev/peerat/backend/routes/users/Register.java
index 3d22561..bbea631 100644
--- a/src/dev/peerat/backend/routes/users/Register.java
+++ b/src/dev/peerat/backend/routes/users/Register.java
@@ -11,6 +11,7 @@ import java.util.Random;
 import java.util.UUID;
 import java.util.regex.Matcher;
 
+import dev.peerat.backend.Configuration;
 import dev.peerat.backend.bonus.extract.RouteDoc;
 import dev.peerat.backend.repository.DatabaseAuthRepository;
 import dev.peerat.backend.repository.DatabaseRepository;
@@ -31,11 +32,11 @@ public class Register extends FormResponse{
 	private String host;
 	private List<Random> randoms;
 
-	public Register(DatabaseRepository databaseRepo, @Injection("waitting") Map<String, String> playersWaiting, Mail mail, @Injection("issuer") String host){
+	public Register(DatabaseRepository databaseRepo, @Injection("waitting") Map<String, String> playersWaiting, Mail mail, Configuration config){
 		this.databaseRepo = databaseRepo.getAuthRepository();
 		this.playersWaiting = playersWaiting;
 		this.mail = mail;
-		this.host = host;
+		this.host = config.getTokenIssuer();
 		this.randoms = new ArrayList<>();
 		
 		Random random = new Random();