Context Navigation

Changes in / [7d8eeab:dad25fc]

Location:

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo

Files:

-              r7d8eeab
+              rdad25fc
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.NonNull;
-import mk.ukim.finki.it.reservengo.constants.JWTConstants;
 import mk.ukim.finki.it.reservengo.service.intf.JWTService;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 …
                                     @NonNull HttpServletResponse response,
                                     @NonNull FilterChain filterChain) throws ServletException, IOException {
         final String authHeader = request.getHeader(JWTConstants.HEADER);
+        final String authHeader = request.getHeader("Authorization");
         final String jwt;
         final String userEmail;
         if (authHeader == null || !authHeader.startsWith(JWTConstants.TOKEN_PREFIX)) {
+        if (authHeader == null || !authHeader.startsWith("Bearer ")) {
             filterChain.doFilter(request, response);
             return;
+        }
         jwt = authHeader.substring(JWTConstants.TOKEN_PREFIX.length());
+        jwt = authHeader.substring(7);
         userEmail = jwtService.extractUsername(jwt);

-              r7d8eeab
+              rdad25fc
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
-import mk.ukim.finki.it.reservengo.constants.JWTConstants;
 import mk.ukim.finki.it.reservengo.model.domain.User;
 import mk.ukim.finki.it.reservengo.service.intf.JWTService;
 …
 @Service
 public class JWTServiceImpl implements JWTService {
+    private static final String SECRET_KEY = "7bce06d6331e532e8c4c85e6eaae4217711768fe1aa582b4549c2722a8ef0497";
     @Override
     public String extractUsername(String token) {
 …
     @Override
     public Key getSignInKey() {
         byte[] keyBytes = Decoders.BASE64.decode(JWTConstants.SECRET_KEY);
+        byte[] keyBytes = Decoders.BASE64.decode(SECRET_KEY);
         return Keys.hmacShaKeyFor(keyBytes);
+    }
 …
                 .claim("id", user.getId())
                 .setIssuedAt(new Date())
                 .setExpiration(new Date(System.currentTimeMillis() + JWTConstants.EXPIRATION_TIME))
+                .setExpiration(new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24))
                 .signWith(getSignInKey(), SignatureAlgorithm.HS256)
                 .compact();

-              r7d8eeab
+              rdad25fc
 import mk.ukim.finki.it.reservengo.service.intf.AuthService;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 @RestController
 …
+    }
     @PostMapping(value = "/register/customer")
+    @PostMapping(value = "/register/customer", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<JWTAuthenticationResponseDTO> registerCustomer(@RequestBody JWTAuthenticationRequestDTO jwtAuthenticationRequestDTO) {
         return new ResponseEntity<>(authenticationService.registerCustomer(jwtAuthenticationRequestDTO), HttpStatus.CREATED);

-              r7d8eeab
+              rdad25fc
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 …
     @ExceptionHandler(BadCredentialsException.class)
     public ResponseEntity<String> handleBadCredentials(BadCredentialsException ex) {
         return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(ex.getMessage());
+        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Invalid email or password");
+    }
     @ExceptionHandler(EmailNotFoundException.class)
     public ResponseEntity<String> handleUserNotFound(EmailNotFoundException ex) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body("User not found");
+    }
     @ExceptionHandler(AuthenticationException.class)
     public ResponseEntity<String> handleUserNotFound(AuthenticationException ex) {
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(ex.getMessage());
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body("Authentication failed");
+    }
+}

-              r7d8eeab
+              rdad25fc
     @GetMapping("/info")
     public ResponseEntity<?> getUserPersonalInfo(@AuthenticationPrincipal User user) {
         User u = userService.findUser(user.getId());
         return ResponseEntity.ok(u);
+    public ResponseEntity<?> getUserPersonalInfo(@AuthenticationPrincipal User u) {
+        User user = userService.findUser(u.getId());
+        return ResponseEntity.ok(user);
+    }

Note: See TracChangeset for help on using the changeset viewer.