[Bug] :: Firebase bug fix

Team-C0nnect · May 23, 2024 · c096433 · c096433
1 parent a1095a5
commit c096433
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/src/main/java/com/project/qvick/domain/auth/client/api/AuthController.java b/src/main/java/com/project/qvick/domain/auth/client/api/AuthController.java
@@ -54,7 +54,7 @@ public RefreshTokenResponse refresh(RefreshTokenRequest request){
 
     @PostMapping("/firebase")
     @Operation(summary = "firebase 인증", description = "firebase 인증 서비스")
-    public void firebase(FirebaseRequest request){
+    public void firebase(@Validated @RequestBody FirebaseRequest request){
         authService.firebase(request);
     }
 

diff --git a/src/main/java/com/project/qvick/domain/auth/service/AuthServiceImpl.java b/src/main/java/com/project/qvick/domain/auth/service/AuthServiceImpl.java
@@ -21,6 +21,8 @@
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.Jws;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -29,6 +31,7 @@
 @RequiredArgsConstructor
 public class AuthServiceImpl implements AuthService{
 
+    private static final Logger log = LoggerFactory.getLogger(AuthServiceImpl.class);
     private final UserRepository userRepository;
     private final UserMapper userMapper;
     private final UserUtil userUtil;
@@ -84,7 +87,8 @@ public void firebase(FirebaseRequest request){
         User user = userUtil.findUser();
         if(StringUtils.hasText(request.getFcmToken())){
             firebaseNotificationService.saveToken(user.getEmail(), request.getFcmToken());
-        }throw BadRequestException.EXCEPTION;
+            log.info("firebaseNotificationService.saveToken success");
+        }
     }
 
 }
diff --git a/src/main/java/com/project/qvick/domain/user/client/dto/User.java b/src/main/java/com/project/qvick/domain/user/client/dto/User.java
@@ -9,9 +9,9 @@
 
 @Getter
 @Setter
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 public class User {
 
     private Long id;

diff --git a/src/main/java/com/project/qvick/global/security/auth/CustomUserDetails.java b/src/main/java/com/project/qvick/global/security/auth/CustomUserDetails.java
@@ -14,24 +14,26 @@
 public class CustomUserDetails implements UserDetails {
 
     private final User user;
-    private Collection<? extends GrantedAuthority> authorities;
+    private final Collection<? extends GrantedAuthority> authorities;
 
-    private CustomUserDetails(final User user, final Collection<? extends GrantedAuthority> authorities) {
-        this.user = user;
-        this.authorities = authorities;
-    }
+//    private CustomUserDetails(final User user, final Collection<? extends GrantedAuthority> authorities) {
+//        this.user = user;
+//        this.authorities = authorities;
+//    }
 
     public CustomUserDetails(final User user) {
         this.user = user;
+        this.authorities = Collections.singleton(() -> user.getUserRole().getKey());
     }
 
-    public static CustomUserDetails create(User user) {
-        return new CustomUserDetails(user, Collections.singleton((GrantedAuthority) user.getUserRole()::getKey));
-    }
+//    public static CustomUserDetails create(User user) {
+//        return new CustomUserDetails(user, Collections.singleton((GrantedAuthority) user.getUserRole()::getKey));
+//    }
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return Collections.singleton((GrantedAuthority) user.getUserRole()::getKey);
+//        return Collections.singleton((GrantedAuthority) user.getUserRole()::getKey);
+        return authorities;
     }
 
     @Override

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -10,7 +10,6 @@ spring:
     password: ${secrets.DB_PASSWORD}
     driver-class-name: com.mysql.cj.jdbc.Driver
 
-
   jpa:
     database: mysql
     database-platform: org.hibernate.dialect.MySQL8Dialect