From 5dc363268708def62cc549561440a43fe32be654 Mon Sep 17 00:00:00 2001
From: Lobo <andreas.dahm@gmail.com>
Date: Sat, 4 Apr 2026 10:43:18 +0200
Subject: [PATCH] Cleaned a little bit up

---
 .../configuration/security/SecurityConfig.java             | 2 ++
 .../domain/login/controller/mapper/ApiMapper.java          | 2 +-
 src/main/java/auth_service/domain/login/model/User.java    | 2 +-
 .../domain/login/persistence/mapper/EntityMapper.java      | 2 +-
 .../auth_service/domain/login/service/LoginService.java    | 7 ++-----
 src/main/resources/application.yaml                        | 2 +-
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/auth_service/configuration/security/SecurityConfig.java b/src/main/java/auth_service/configuration/security/SecurityConfig.java
index 4894832..18de67b 100644
--- a/src/main/java/auth_service/configuration/security/SecurityConfig.java
+++ b/src/main/java/auth_service/configuration/security/SecurityConfig.java
@@ -4,6 +4,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpMethod;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -83,6 +84,7 @@ public class SecurityConfig {
                 .sessionManagement(session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS))
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers(WHITE_LIST_URLS).permitAll()
+                        .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
                         .anyRequest().authenticated()
                 )
                 .addFilterBefore(jwtAuthFilter, UsernamePasswordAuthenticationFilter.class);
diff --git a/src/main/java/auth_service/domain/login/controller/mapper/ApiMapper.java b/src/main/java/auth_service/domain/login/controller/mapper/ApiMapper.java
index d17ebf8..8da6103 100644
--- a/src/main/java/auth_service/domain/login/controller/mapper/ApiMapper.java
+++ b/src/main/java/auth_service/domain/login/controller/mapper/ApiMapper.java
@@ -8,6 +8,6 @@ public abstract class ApiMapper {
     }
 
     public static User toModel(LoginRequest loginRequest) {
-        return User.builder().email(loginRequest.email()).encryptedPassword(loginRequest.password()).build();
+        return User.builder().email(loginRequest.email()).password(loginRequest.password()).build();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/auth_service/domain/login/model/User.java b/src/main/java/auth_service/domain/login/model/User.java
index b67221a..0126171 100644
--- a/src/main/java/auth_service/domain/login/model/User.java
+++ b/src/main/java/auth_service/domain/login/model/User.java
@@ -8,5 +8,5 @@ import lombok.Data;
 public class User {
     private long id;
     private String email;
-    private String encryptedPassword;
+    private String password;
 }
\ No newline at end of file
diff --git a/src/main/java/auth_service/domain/login/persistence/mapper/EntityMapper.java b/src/main/java/auth_service/domain/login/persistence/mapper/EntityMapper.java
index 1221fd8..ec2fccc 100644
--- a/src/main/java/auth_service/domain/login/persistence/mapper/EntityMapper.java
+++ b/src/main/java/auth_service/domain/login/persistence/mapper/EntityMapper.java
@@ -14,7 +14,7 @@ public abstract class EntityMapper {
         if (entity != null) {
             model.setId(entity.getId());
             model.setEmail(entity.getEmail());
-            model.setEncryptedPassword(entity.getPassword());
+            model.setPassword(entity.getPassword());
         }
 
         return model;
diff --git a/src/main/java/auth_service/domain/login/service/LoginService.java b/src/main/java/auth_service/domain/login/service/LoginService.java
index 2451c4e..fecc628 100644
--- a/src/main/java/auth_service/domain/login/service/LoginService.java
+++ b/src/main/java/auth_service/domain/login/service/LoginService.java
@@ -19,11 +19,8 @@ public class LoginService {
     private final JwtService jwtService;
 
     public String login(User userToLogin) {
-        var userEntity = minimalUserRepository.findByEmail(userToLogin.getEmail()).orElseThrow(() -> new UserNotFoundException("User not found with given email"));
-
-        log.info("Login attempt for user {}", passwordEncoder.encode(userToLogin.getEncryptedPassword()) + " " + userEntity.getEncryptedPassword());
-
-        var loginSuccessful = passwordEncoder.matches(userToLogin.getEncryptedPassword(), userEntity.getEncryptedPassword());
+        var userFromDatabase = minimalUserRepository.findByEmail(userToLogin.getEmail()).orElseThrow(() -> new UserNotFoundException("User not found with given email"));
+        var loginSuccessful = passwordEncoder.matches(userToLogin.getPassword(), userFromDatabase.getPassword());
         if (!loginSuccessful) {
             throw new InvalidCredentialsException("Invalid credentials");
         }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 60d82c2..da2d737 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -7,7 +7,7 @@ spring:
   profiles:
     active: dev # Default profile for local startup
   jpa:
-    open-in-view: false
+    open-in-view: true
   flyway:
     # Force Flyway to be enabled
     enabled: true