diff --git a/.github/workflows/CICD_DEVELOP.yml b/.github/workflows/CICD_DEVELOP.yml index 53ba64c..a501404 100644 --- a/.github/workflows/CICD_DEVELOP.yml +++ b/.github/workflows/CICD_DEVELOP.yml @@ -66,6 +66,7 @@ jobs: echo "spring.security.oauth2.client.registration.google.client-id=${{ secrets.OAUTH2_GOOGLE_CLIENT_ID }}" >> ./src/main/resources/application-oauth2.properties echo "spring.security.oauth2.client.registration.google.client-secret=${{ secrets.OAUTH2_GOOGLE_CLIENT_SECRET }}" >> ./src/main/resources/application-oauth2.properties echo "spring.security.oauth2.client.registration.google.scope=${{ secrets.OAUTH2_GOOGLE_SCOPE }}" >> ./src/main/resources/application-oauth2.properties + printf "%s\n" "${{ secrets.OAUTH2_NAVER_PROPERTIES }}" >> ./src/main/resources/application-oauth2.properties - name: Build with Gradle Wrapper # run: ./gradlew test -i diff --git a/.github/workflows/CI_TEST.yml b/.github/workflows/CI_TEST.yml index d5e982a..afbebfb 100644 --- a/.github/workflows/CI_TEST.yml +++ b/.github/workflows/CI_TEST.yml @@ -49,6 +49,7 @@ jobs: echo "spring.security.oauth2.client.registration.google.client-id=${{ secrets.OAUTH2_GOOGLE_CLIENT_ID }}" >> ./src/main/resources/application-oauth2.properties echo "spring.security.oauth2.client.registration.google.client-secret=${{ secrets.OAUTH2_GOOGLE_CLIENT_SECRET }}" >> ./src/main/resources/application-oauth2.properties echo "spring.security.oauth2.client.registration.google.scope=${{ secrets.OAUTH2_GOOGLE_SCOPE }}" >> ./src/main/resources/application-oauth2.properties + printf "%s\n" "${{ secrets.OAUTH2_NAVER_PROPERTIES }}" >> ./src/main/resources/application-oauth2.properties - name: Build with Gradle Wrapper run: ./gradlew build diff --git a/src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/CustomOauth2SuccessHandler.java b/src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/CustomOauth2SuccessHandler.java index d1bd1b0..3e08b2e 100644 --- a/src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/CustomOauth2SuccessHandler.java +++ b/src/main/java/org/fontory/fontorybe/authentication/adapter/inbound/CustomOauth2SuccessHandler.java @@ -12,6 +12,8 @@ import org.fontory.fontorybe.provide.domain.Provide; import org.springframework.security.core.Authentication; import org.springframework.security.oauth2.core.user.OAuth2User; +import org.springframework.security.web.DefaultRedirectStrategy; +import org.springframework.security.web.RedirectStrategy; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; @@ -25,6 +27,7 @@ public class CustomOauth2SuccessHandler implements AuthenticationSuccessHandler private final ObjectMapper objectMapper; private final AuthService authService; private final JwtTokenProvider jwtTokenProvider; +// private final RedirectStrategy redirectStrategy = new DefaultRedirectStrategy(); @Override public void onAuthenticationSuccess(HttpServletRequest request, @@ -43,6 +46,7 @@ public void onAuthenticationSuccess(HttpServletRequest request, attributes.put("refreshToken", tokens.getRefreshToken()); } +// redirectStrategy.sendRedirect(request, response, ""); response.setContentType("application/json"); response.setStatus(HttpServletResponse.SC_OK); response.getWriter().write(objectMapper.writeValueAsString(attributes)); diff --git a/src/main/java/org/fontory/fontorybe/authentication/domain/Auth2UserInfo.java b/src/main/java/org/fontory/fontorybe/authentication/domain/Auth2UserInfo.java index 8808b20..91a2c51 100644 --- a/src/main/java/org/fontory/fontorybe/authentication/domain/Auth2UserInfo.java +++ b/src/main/java/org/fontory/fontorybe/authentication/domain/Auth2UserInfo.java @@ -20,6 +20,10 @@ public static Auth2UserInfo getOAuth2UserInfo(Provider provider, Map { return new Auth2UserInfo((String) attributes.get(pk), Provider.GOOGLE, (String) attributes.get("email")); } + case NAVER -> { + Map naverAttributes = (Map) attributes.get(pk); + return new Auth2UserInfo((String) naverAttributes.get("id"), Provider.NAVER, (String) naverAttributes.get("email")); + } } throw new ProviderNotFoundException(String.valueOf(provider)); }