Fixed jwt dependency update + added global exception handling for missing active programme(#10)

* Fixed jwt dependency update
* Add global exception handling for missing active programme

GitOrigin-RevId: f28b99c3bdecd9c7528b817713564ce072a6c516

Author: MDybek

.env-sample

@@ -1,6 +1,6 @@
 SERVICE_JWT_SECRET_KEY=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-SERVICE_DB_URL=jdbc:postgresql://localhost:5432/student-stats
+SERVICE_DB_URL=jdbc:postgresql://postgresdb:5432/student-stats
 SERVICE_DB_LOGIN=postgres
 SERVICE_DB_PASSWORD=postgres
 SERVICE_DB_NAME=student-stats

service/pom.xml

@@ -18,7 +18,7 @@
 		<usos4j.version>1.1.6</usos4j.version>
 		<springdoc.openapi.starter.version>2.8.6</springdoc.openapi.starter.version>
 		<jwt.version>0.12.6</jwt.version>
-		<jwt-api.version>0.11.5</jwt-api.version>
+		<jwt-api.version>0.12.6</jwt-api.version>
 		<sentry.starter.version>8.5.0</sentry.starter.version>
 		<opencsv.version>5.10</opencsv.version>
 		<apache.commons.version>1.14.0</apache.commons.version>

service/src/main/java/pl/wmsdev/auth/service/UsosTokenServiceImpl.java

@@ -29,8 +29,6 @@ public RequestTokenResponse getRequestToken(String universityId, String callback
 
     @Override
     public UsosAccessToken getAccessToken(UsosRequestToken requestToken, String verifier, String universityId) {
-        var usos = usosFactory.createUsos(universityId);
-
-	    return usos.getAccessToken(requestToken, verifier);
+	    return usosFactory.createUsos(universityId).getAccessToken(requestToken, verifier);
     }
 }

service/src/main/java/pl/wmsdev/data/service/programme/ProgrammeDetailsServiceImpl.java

@@ -6,8 +6,11 @@
 import pl.wmsdev.data.dto.ProgrammeDetails;
 import pl.wmsdev.usos4j.client.UsosUserAPI;
 import pl.wmsdev.usos4j.model.progs.UsosProgramme;
+import pl.wmsdev.usos4j.model.progs.UsosStudentProgramme;
 import pl.wmsdev.utils.converter.ProgrammeDetailsConverter;
+import pl.wmsdev.utils.exceptions.NotFoundException;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 @Service
@@ -20,8 +23,13 @@ public class ProgrammeDetailsServiceImpl implements ProgrammeDetailsService {
     @Async
     @Override
     public CompletableFuture<ProgrammeDetails> getProgrammeDetails() {
-        UsosProgramme programme = userApi.progs().student().get(0).programme(); // Every student has at least 1 programme
+        List<UsosStudentProgramme> programmes = userApi.progs().student();
 
+        if (programmes.isEmpty()) {
+            throw new NotFoundException("Student has no active study programme.");
+        }
+
+        UsosProgramme programme = programmes.get(0).programme();
         return CompletableFuture.completedFuture(programmeDetailsConverter.toProgrammeDetails(programme));
     }
 }

service/src/main/java/pl/wmsdev/handlers/GlobalExceptionHandler.java

@@ -0,0 +1,37 @@
+package pl.wmsdev.handlers;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import pl.wmsdev.utils.exceptions.NotFoundException;
+import pl.wmsdev.utils.dtos.ProblemDetailsDTO;
+
+@ControllerAdvice
+@Slf4j
+public class GlobalExceptionHandler {
+
+    @ExceptionHandler(NotFoundException.class)
+    public ResponseEntity<ProblemDetailsDTO> handleNoActiveProgrammeException(NotFoundException exception) {
+        return handleException(
+                exception,
+                HttpStatus.NOT_FOUND,
+                new ProblemDetailsDTO(exception.getMessage()));
+    }
+
+    private <T extends Exception> ResponseEntity<ProblemDetailsDTO> handleException(T exception, HttpStatus httpStatus, ProblemDetailsDTO problemDetails) {
+        logException(exception, problemDetails);
+
+        return ResponseEntity
+                .status(httpStatus)
+                .contentType(MediaType.APPLICATION_PROBLEM_JSON)
+                .body(problemDetails);
+    }
+
+    private <T extends Exception> void logException(T exception, ProblemDetailsDTO problemDetails) {
+        log.error(problemDetails.message(), exception);
+    }
+}
+

service/src/main/java/pl/wmsdev/security/JwtService.java

@@ -2,7 +2,6 @@
 
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jwts;
-import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
 import org.springframework.beans.factory.annotation.Value;
@@ -11,7 +10,7 @@
 import org.springframework.stereotype.Service;
 import pl.wmsdev.usos4j.model.auth.UsosAccessToken;
 
-import java.security.Key;
+import javax.crypto.SecretKey;
 import java.util.Date;
 import java.util.Map;
 import java.util.function.Function;
@@ -39,11 +38,11 @@ public String generateToken(String accessToken, String accessTokenSecret, String
 
         return Jwts
                 .builder()
-                .setClaims(claims)
-                .setSubject(userDetails.getUsername())
-                .setIssuedAt(new Date(System.currentTimeMillis()))
-                .setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 120))
-                .signWith(getSignInKey(), SignatureAlgorithm.HS256)
+                .claims(claims)
+                .subject(userDetails.getUsername())
+                .issuedAt(new Date(System.currentTimeMillis()))
+                .expiration(new Date(System.currentTimeMillis() + 1000 * 60 * 120))
+                .signWith(getSignInKey(), Jwts.SIG.HS256)
                 .compact();
     }
 
@@ -62,14 +61,14 @@ private Date extractExpiration(JwtToken token) {
 
     private Claims extractAllClaims(JwtToken token) {
         return Jwts
-                .parserBuilder()
-                .setSigningKey(getSignInKey())
+                .parser()
+                .verifyWith(getSignInKey())
                 .build()
-                .parseClaimsJws(token.jwt())
-                .getBody();
+                .parseSignedClaims(token.jwt())
+                .getPayload();
     }
 
-    private Key getSignInKey() {
+    private SecretKey getSignInKey() {
         byte[] keyBytes = Decoders.BASE64.decode(SECRET_KEY);
         return Keys.hmacShaKeyFor(keyBytes);
     }

service/src/main/java/pl/wmsdev/usos/model/Course.java

@@ -1,6 +1,5 @@
 package pl.wmsdev.usos.model;
 
-
 import lombok.Builder;
 import lombok.Data;
 import lombok.Getter;

service/src/main/java/pl/wmsdev/usos/model/PersonalData.java

@@ -23,5 +23,4 @@ public class PersonalData {
     private String usosProfileUrl;
     private String photoUrl;
     private List<Studies> studies;
-
 }

service/src/main/java/pl/wmsdev/utils/dtos/ProblemDetailsDTO.java

@@ -0,0 +1,4 @@
+package pl.wmsdev.utils.dtos;
+
+public record ProblemDetailsDTO(String message) {
+}

service/src/main/java/pl/wmsdev/utils/exceptions/NotFoundException.java

@@ -0,0 +1,8 @@
+package pl.wmsdev.utils.exceptions;
+
+public class NotFoundException extends RuntimeException {
+    public NotFoundException(String message) {
+        super(message);
+    }
+}
+