Merge pull request #89 from BLink-Org/dev

Merge: 크롬 익스텐션 로그인 반영
BLink-Org · Mar 3, 2025 · d44ca75 · d44ca75
2 parents df3e10a + 6d0c9c2
commit d44ca75
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 3 deletions.
diff --git a/src/main/java/cmc/blink/domain/user/business/UserMapper.java b/src/main/java/cmc/blink/domain/user/business/UserMapper.java
@@ -27,6 +27,13 @@ public static User toUser(AuthRequest.AppleLoginRequestDto requestDto, String pr
                 .build();
     }
 
+    public static User toUser(AuthRequest.EmailLoginRequestDto requestDto, String provider) {
+        return User.builder()
+                .email(requestDto.getEmail())
+                .provider(provider)
+                .build();
+    }
+
     public static UserResponse.UserInfo toUserInfo(User user, boolean deleteRequest, LocalDate deleteRequestDate, int linkCount, int pinCount, int folderCount) {
         return UserResponse.UserInfo.builder()
                 .email(user.getEmail())

diff --git a/src/main/java/cmc/blink/global/security/AuthController.java b/src/main/java/cmc/blink/global/security/AuthController.java
@@ -48,4 +48,10 @@ public ApiResponseDto<?> logout(HttpServletRequest httpServletRequest, @RequestB
 
         return ApiResponseDto.of("토큰 재발급이 완료되었습니다.", authService.reissue(reissueRequestDto));
     }
+
+    @PostMapping("/login/email")
+    @Operation(summary = "크롬 익스텐션 로그인 API", description = "크롬 익스텐션용 로그인 API입니다.")
+public ApiResponseDto<AuthResponse.LoginResponseDto> login(@RequestBody AuthRequest.EmailLoginRequestDto requestDto) {
+        return ApiResponseDto.of(authService.chromeExtensionLogin(requestDto));
+    }
 }
diff --git a/src/main/java/cmc/blink/global/security/AuthService.java b/src/main/java/cmc/blink/global/security/AuthService.java
@@ -11,6 +11,7 @@
 import cmc.blink.domain.user.persistence.redis.RefreshToken;
 import cmc.blink.domain.user.persistence.redis.RefreshTokenRepository;
 import cmc.blink.global.exception.JwtAuthenticationException;
+import cmc.blink.global.exception.NotFoundException;
 import cmc.blink.global.exception.constant.ErrorCode;
 import cmc.blink.global.security.client.AppleAuthClient;
 import cmc.blink.global.security.client.GoogleTokenVerifierClient;
@@ -133,7 +134,40 @@ public AuthResponse.LoginResponseDto appleLogin(AuthRequest.AppleLoginRequestDto
 
     }
 
-    public String getAppleAccountId(String identityToken)
+
+    @Transactional
+    public AuthResponse.LoginResponseDto chromeExtensionLogin(AuthRequest.EmailLoginRequestDto dto) {
+
+        Optional<User> optionalUser = userQueryAdapter.findByEmail(dto.getEmail());
+
+        String language = dto.getLanguage();
+
+        User user;
+
+        if(optionalUser.isEmpty()){
+            user = UserMapper.toUser(dto, "chromeExtension");
+            userCommandAdapter.updateLastLoginTime(user);
+
+            linkService.saveDefaultLink(user, language);
+        }else{
+            user = optionalUser.get();
+
+            user.updateLoginTime();
+            userCommandAdapter.save(user);
+        }
+
+        UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(
+                user.getEmail(),
+                null,
+                Collections.singleton(new SimpleGrantedAuthority(Role.USER.getKey()))
+        );
+
+        Token token = tokenProvider.generateToken(authentication);
+
+        return AuthMapper.toLoginResponseDto(token);
+    }
+
+    private String getAppleAccountId(String identityToken)
             throws JsonProcessingException, AuthenticationException, NoSuchAlgorithmException,
             InvalidKeySpecException {
         Map headers = jwtValidator.parseHeaders(identityToken);

diff --git a/src/main/java/cmc/blink/global/security/config/SecurityConfig.java b/src/main/java/cmc/blink/global/security/config/SecurityConfig.java
@@ -30,7 +30,7 @@ public class SecurityConfig {
             "/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**",
             "/v3/api-docs/swagger-config", "/v3/api-docs",
             "/api/auth/login/google", "/api/auth/login/apple", "/api/auth/reissue",
-            "/health", "/favicon.ico"
+            "/health", "/favicon.ico", "/api/auth/login/email"
     };
 
     @Bean

diff --git a/src/main/java/cmc/blink/global/security/dto/AuthRequest.java b/src/main/java/cmc/blink/global/security/dto/AuthRequest.java
@@ -33,4 +33,13 @@ public static class LogoutRequestDto {
     public static class ReissueRequestDto {
         String refreshToken;
     }
+
+    @Getter
+    public static class EmailLoginRequestDto {
+
+        @Schema(description = "시스템 설정 언어", example = "한국어: KO / 영어: EN")
+        String language;
+
+        String email;
+    }
 }
diff --git a/src/main/java/cmc/blink/global/security/filter/JwtAuthFilter.java b/src/main/java/cmc/blink/global/security/filter/JwtAuthFilter.java
@@ -28,7 +28,7 @@ public class JwtAuthFilter extends OncePerRequestFilter {
     private static final String[] excludePath = {
             "/swagger", "/swagger-ui.html", "/swagger-ui/**", "/api-docs", "/api-docs/**", "/v3/api-docs/**", "/v3/api-docs/swagger-config",
             "/api/auth/login/google", "/api/auth/login/apple", "/api/auth/reissue", "/v3/api-docs",
-            "/health", "/favicon.ico"
+            "/health", "/favicon.ico", "/api/auth/login/email"
     };
 
     @Override