Skip to content

Commit 1748555

Browse files
authored
[Fix] Set Login Redirection (#64)
* fix(auth): set redirection to SPA * refactor(*): organize constants more specific - platform - discord - spa
1 parent f4de763 commit 1748555

File tree

7 files changed

+35
-15
lines changed

7 files changed

+35
-15
lines changed

src/main/java/gdsc/konkuk/platformcore/application/auth/CustomAuthenticationSuccessHandler.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package gdsc.konkuk.platformcore.application.auth;
22

3+
import static gdsc.konkuk.platformcore.global.consts.SPAConstants.SPA_ADMIN_LOGIN_REDIRECT_URL;
4+
35
import gdsc.konkuk.platformcore.application.member.exceptions.MemberErrorCode;
46
import gdsc.konkuk.platformcore.application.member.exceptions.UserNotFoundException;
57
import gdsc.konkuk.platformcore.domain.member.entity.Member;
68
import gdsc.konkuk.platformcore.domain.member.repository.MemberRepository;
79
import jakarta.servlet.http.HttpServletRequest;
810
import jakarta.servlet.http.HttpServletResponse;
11+
import java.io.IOException;
912
import java.nio.charset.StandardCharsets;
1013
import lombok.RequiredArgsConstructor;
1114
import org.springframework.http.MediaType;
@@ -24,7 +27,7 @@ public class CustomAuthenticationSuccessHandler extends SimpleUrlAuthenticationS
2427
@Override
2528
public void onAuthenticationSuccess(
2629
HttpServletRequest request, HttpServletResponse response,
27-
Authentication authentication) {
30+
Authentication authentication) throws IOException {
2831

2932
OidcUser oidcUser = (OidcUser) authentication.getPrincipal();
3033
Member member = memberRepository.findByEmail(oidcUser.getEmail())
@@ -34,5 +37,6 @@ public void onAuthenticationSuccess(
3437
response.addHeader("Authorization", "Bearer " + token);
3538
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
3639
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
40+
response.sendRedirect(SPA_ADMIN_LOGIN_REDIRECT_URL);
3741
}
3842
}

src/main/java/gdsc/konkuk/platformcore/controller/attendance/AttendanceController.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package gdsc.konkuk.platformcore.controller.attendance;
22

33
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.apiPath;
4+
import static gdsc.konkuk.platformcore.global.consts.SPAConstants.SPA_ADMIN_ATTENDANCE_FAIL_REDIRECT_URL;
5+
import static gdsc.konkuk.platformcore.global.consts.SPAConstants.SPA_ADMIN_ATTENDANCE_SUCCESS_REDIRECT_URL;
46
import static org.springframework.http.HttpStatusCode.valueOf;
57

68
import gdsc.konkuk.platformcore.application.attendance.AttendanceService;
@@ -53,12 +55,12 @@ public ResponseEntity<?> attend(@PathVariable Long attendanceId, @RequestParam S
5355
Long currentId = SecurityUtils.getCurrentUserId();
5456
attendanceService.attend(currentId, attendanceId, qrUuid);
5557
HttpHeaders headers = new HttpHeaders();
56-
headers.add("Location", "https://admin.gdsc-konkuk.dev/attendance-return/success");
58+
headers.add("Location", SPA_ADMIN_ATTENDANCE_SUCCESS_REDIRECT_URL);
5759
return new ResponseEntity<>(headers,
5860
valueOf(HttpServletResponse.SC_TEMPORARY_REDIRECT));
5961
} catch (Exception e) {
6062
HttpHeaders headers = new HttpHeaders();
61-
headers.add("Location", "https://admin.gdsc-konkuk.dev/attendance-return/fail");
63+
headers.add("Location", SPA_ADMIN_ATTENDANCE_FAIL_REDIRECT_URL);
6264
return new ResponseEntity<>(headers,
6365
valueOf(HttpServletResponse.SC_TEMPORARY_REDIRECT));
6466
}

src/main/java/gdsc/konkuk/platformcore/external/discord/DiscordMessage.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package gdsc.konkuk.platformcore.external.discord;
22

3-
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_DESCRIPTION;
4-
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_TIME_TEXT;
5-
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_TITLE;
3+
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_DESCRIPTION;
4+
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_TIME_TEXT;
5+
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_TITLE;
66

77
import java.io.Serializable;
88
import java.time.LocalDateTime;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package gdsc.konkuk.platformcore.global.consts;
2+
3+
public class DiscordConstants {
4+
5+
public static final String DISCORD_ERROR_TITLE = "\uD83E\uDDE8 치명적인 서버 에러 발생!";
6+
public static final String DISCORD_ERROR_DESCRIPTION =
7+
"\uD83C\uDD98 서버에서 치명적인 에러가 발생했습니다. 빠르게 확인해주세요. \uD83C\uDD98";
8+
public static final String DISCORD_ERROR_TIME_TEXT = "\uD83D\uDD50 에러 발생 시간 : ";
9+
}

src/main/java/gdsc/konkuk/platformcore/global/consts/PlatformConstants.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,9 @@ public class PlatformConstants {
1313
"https://member.gdsc-konkuk.dev", "https://landing.gdsc-konkuk.dev");
1414

1515
public static final Integer SOFT_DELETE_RETENTION_MONTHS = 3;
16-
17-
public static final String LOGIN_NAME = "id";
18-
public static final String API_PREFIX = "/api/v1";
19-
2016
public static final String EMAIL_RECEIVER_NAME_REGEXP = "\\{이름}";
2117

22-
public static final String DISCORD_ERROR_TITLE = "\uD83E\uDDE8 치명적인 서버 에러 발생!";
23-
public static final String DISCORD_ERROR_DESCRIPTION =
24-
"\uD83C\uDD98 서버에서 치명적인 에러가 발생했습니다. 빠르게 확인해주세요. \uD83C\uDD98";
25-
public static final String DISCORD_ERROR_TIME_TEXT = "\uD83D\uDD50 에러 발생 시간 : ";
18+
public static final String API_PREFIX = "/api/v1";
2619

2720
public static String apiPath(String path) {
2821
return API_PREFIX + path;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package gdsc.konkuk.platformcore.global.consts;
2+
3+
public class SPAConstants {
4+
5+
public static final String SPA_ADMIN_BASE_URL = "https://admin.gdsc-konkuk.dev";
6+
public static final String SPA_ADMIN_LOGIN_REDIRECT_URL =
7+
SPA_ADMIN_BASE_URL + "/oauth/callback";
8+
public static final String SPA_ADMIN_ATTENDANCE_SUCCESS_REDIRECT_URL =
9+
SPA_ADMIN_BASE_URL + "/attendance-return/success";
10+
public static final String SPA_ADMIN_ATTENDANCE_FAIL_REDIRECT_URL =
11+
SPA_ADMIN_BASE_URL + "/attendance-return/fail";
12+
}

src/test/java/gdsc/konkuk/platformcore/external/discord/DiscordMessageTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package gdsc.konkuk.platformcore.external.discord;
22

3-
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_TITLE;
3+
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_TITLE;
44
import static org.junit.jupiter.api.Assertions.assertEquals;
55

66
import gdsc.konkuk.platformcore.application.email.exceptions.EmailErrorCode;

0 commit comments

Comments
 (0)