From f67cb50f411f2db5a61d0e645718ad40f863960d Mon Sep 17 00:00:00 2001
From: akastijn <akastijn@alttd.com>
Date: Tue, 5 Aug 2025 23:22:12 +0200
Subject: [PATCH] Refactor logging in `LoginController`, simplify
 `auth.service` token validation, and remove debug logs from
 `AppealComponent`.

---
 .../controllers/login/LoginController.java    |  4 ++-
 .../pages/forms/appeal/appeal.component.ts    |  2 --
 frontend/src/app/services/auth.service.ts     | 30 +++++++++----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java b/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java
index c07c00d..252cb78 100644
--- a/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java
+++ b/backend/src/main/java/com/alttd/altitudeweb/controllers/login/LoginController.java
@@ -93,6 +93,7 @@ public class LoginController implements LoginApi {
 
     @Override
     public ResponseEntity<UsernameDto> getUsername() {
+        log.debug("Loading username for logged in user");
         Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
 
         if (authentication == null || !(authentication.getPrincipal() instanceof OAuth2ResourceServerProperties.Jwt)) {
@@ -103,13 +104,14 @@ public class LoginController implements LoginApi {
         UUID uuid;
         try {
              uuid = UUID.fromString(stringUuid);
+             log.debug("Loaded username for logged in user {}", uuid);
         } catch (IllegalArgumentException e) {
             return ResponseEntity.badRequest().build();
         }
 
         UsernameDto usernameDto = new UsernameDto();
         usernameDto.setUsername(getUsername(uuid));
-
+        log.debug("Loaded username for logged in user {}", usernameDto.getUsername());
         return ResponseEntity.ok(usernameDto);
     }
 
diff --git a/frontend/src/app/pages/forms/appeal/appeal.component.ts b/frontend/src/app/pages/forms/appeal/appeal.component.ts
index 14d1b94..57ca30c 100644
--- a/frontend/src/app/pages/forms/appeal/appeal.component.ts
+++ b/frontend/src/app/pages/forms/appeal/appeal.component.ts
@@ -164,9 +164,7 @@ export class AppealComponent implements OnInit, AfterViewInit {
 
   public nextPage() {
     if (this.currentPageIndex === this.totalPages.length - 1) {
-      console.log('Adding page');
       this.totalPages.push(this.currentPageIndex + 1);
-      console.log(this.totalPages);
     }
     this.goToPage(this.currentPageIndex + 1);
   }
diff --git a/frontend/src/app/services/auth.service.ts b/frontend/src/app/services/auth.service.ts
index ac8616f..8dcd4cb 100644
--- a/frontend/src/app/services/auth.service.ts
+++ b/frontend/src/app/services/auth.service.ts
@@ -72,23 +72,23 @@ export class AuthService {
    */
   public checkAuthStatus(): boolean {
     const jwt = this.getJwt();
-    if (jwt) {
-      try {
-        // Check if token is expired
-        if (this.jwtHelper.isTokenExpired(jwt)) {
-          this.logout();
-          return false;
-        }
-
-        const claims = this.extractJwtClaims(jwt);
-        console.log("User claims: ", claims);
-        this.userClaimsSubject.next(claims);
-        this.isAuthenticatedSubject.next(true);
-        this.reloadUsername();
-        return true;
-      } catch (e) {
+    if (!jwt) {
+      return false;
+    }
+    try {
+      if (this.jwtHelper.isTokenExpired(jwt)) {
         this.logout();
+        return false;
       }
+
+      const claims = this.extractJwtClaims(jwt);
+      console.log("User claims: ", claims);
+      this.userClaimsSubject.next(claims);
+      this.isAuthenticatedSubject.next(true);
+      this.reloadUsername();
+      return true;
+    } catch (e) {
+      this.logout();
     }
     return false;
   }