From 72bda504aad3b2e6e69defe94c4ee91926b12c8f Mon Sep 17 00:00:00 2001
From: Moritz Kowalski <Moritz-Kowalski@gmx.de>
Date: Sun, 11 May 2025 17:17:28 +0200
Subject: [PATCH] Add secrets

---
 .gitignore                                    |  4 +++
 .../kickerelo/layout/KickerAppLayout.java     | 28 ++++++++++---------
 .../resources/application-test.properties     |  6 ++--
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7a847d..77c7396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@ target/
 data.mv.db
 src/main/bundles
 
+# for secrets
+.env
+.vscode
+
 ### IntelliJ IDEA ###
 .idea/modules.xml
 .idea/jarRepositories.xml
diff --git a/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java b/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java
index 176a842..9e8f39c 100644
--- a/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java
+++ b/src/main/java/org/kickerelo/kickerelo/layout/KickerAppLayout.java
@@ -33,20 +33,22 @@ public class KickerAppLayout extends AppLayout {
 
         // Add login/logout button
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth != null && auth.isAuthenticated() && !(auth instanceof AnonymousAuthenticationToken)) {
-        Anchor logoutLink = new Anchor("/logout", "Logout (" + auth.getName() + ")");
-        logoutLink.getElement().getStyle()
-                .set("margin-left", "auto")
-                .set("margin-right", "10px")
-                .set("align-self", "center");
-        addToNavbar(logoutLink);
+        boolean isAuthenticated = auth != null && auth.isAuthenticated() && !(auth instanceof AnonymousAuthenticationToken);
+
+        if (isAuthenticated) {
+            Anchor logoutLink = new Anchor("/logout", "Logout (" + auth.getName() + ")");
+            logoutLink.getElement().getStyle()
+                    .set("margin-left", "auto")
+                    .set("margin-right", "10px")
+                    .set("align-self", "center");
+            addToNavbar(logoutLink);
         } else {
-        Anchor loginLink = new Anchor("/oauth2/authorization/oidc", "Login");
-        loginLink.getElement().getStyle()
-                .set("margin-left", "auto")
-                .set("margin-right", "10px")
-                .set("align-self", "center");
-        addToNavbar(loginLink);
+            Anchor loginLink = new Anchor("/oauth2/authorization/oidc", "Login");
+            loginLink.getElement().getStyle()
+                    .set("margin-left", "auto")
+                    .set("margin-right", "10px")
+                    .set("align-self", "center");
+            addToNavbar(loginLink);
         }
 
         SideNav general = new SideNav("Allgemein");
diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties
index 0eece6b..314bb7d 100644
--- a/src/main/resources/application-test.properties
+++ b/src/main/resources/application-test.properties
@@ -10,9 +10,9 @@ spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 
 # == OIDC Configuration ==
-spring.security.oauth2.client.registration.oidc.client-id=client-id
-spring.security.oauth2.client.registration.oidc.client-secret=client-secret
+spring.security.oauth2.client.registration.oidc.client-id=${OIDC_CLIENT_ID}
+spring.security.oauth2.client.registration.oidc.client-secret=${OIDC_CLIENT_SECRET}
 spring.security.oauth2.client.registration.oidc.scope=openid,profile,email
 spring.security.oauth2.client.registration.oidc.redirect-uri={baseUrl}/login/oauth2/code/{registrationId}
 
-spring.security.oauth2.client.provider.oidc.issuer-uri=https://auth.fs.cs.uni-frankfurt.de/application/o/oidc/
+spring.security.oauth2.client.provider.oidc.issuer-uri=${OIDC_ISSUER_URI}