Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix] Set Login Redirection #64

Merged
merged 2 commits into from
Jan 1, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package gdsc.konkuk.platformcore.application.auth;

import static gdsc.konkuk.platformcore.global.consts.SPAConstants.SPA_ADMIN_LOGIN_REDIRECT_URL;

import gdsc.konkuk.platformcore.application.member.exceptions.MemberErrorCode;
import gdsc.konkuk.platformcore.application.member.exceptions.UserNotFoundException;
import gdsc.konkuk.platformcore.domain.member.entity.Member;
import gdsc.konkuk.platformcore.domain.member.repository.MemberRepository;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
Expand All @@ -24,7 +27,7 @@ public class CustomAuthenticationSuccessHandler extends SimpleUrlAuthenticationS
@Override
public void onAuthenticationSuccess(
HttpServletRequest request, HttpServletResponse response,
Authentication authentication) {
Authentication authentication) throws IOException {

OidcUser oidcUser = (OidcUser) authentication.getPrincipal();
Member member = memberRepository.findByEmail(oidcUser.getEmail())
Expand All @@ -34,5 +37,6 @@ public void onAuthenticationSuccess(
response.addHeader("Authorization", "Bearer " + token);
response.setContentType(MediaType.APPLICATION_JSON_VALUE);
response.setCharacterEncoding(StandardCharsets.UTF_8.name());
response.sendRedirect(SPA_ADMIN_LOGIN_REDIRECT_URL);
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package gdsc.konkuk.platformcore.controller.attendance;

import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.apiPath;
import static gdsc.konkuk.platformcore.global.consts.SPAConstants.SPA_ADMIN_ATTENDANCE_FAIL_REDIRECT_URL;
import static gdsc.konkuk.platformcore.global.consts.SPAConstants.SPA_ADMIN_ATTENDANCE_SUCCESS_REDIRECT_URL;
import static org.springframework.http.HttpStatusCode.valueOf;

import gdsc.konkuk.platformcore.application.attendance.AttendanceService;
Expand Down Expand Up @@ -53,12 +55,12 @@ public ResponseEntity<?> attend(@PathVariable Long attendanceId, @RequestParam S
Long currentId = SecurityUtils.getCurrentUserId();
attendanceService.attend(currentId, attendanceId, qrUuid);
HttpHeaders headers = new HttpHeaders();
headers.add("Location", "https://admin.gdsc-konkuk.dev/attendance-return/success");
headers.add("Location", SPA_ADMIN_ATTENDANCE_SUCCESS_REDIRECT_URL);
return new ResponseEntity<>(headers,
valueOf(HttpServletResponse.SC_TEMPORARY_REDIRECT));
} catch (Exception e) {
HttpHeaders headers = new HttpHeaders();
headers.add("Location", "https://admin.gdsc-konkuk.dev/attendance-return/fail");
headers.add("Location", SPA_ADMIN_ATTENDANCE_FAIL_REDIRECT_URL);
return new ResponseEntity<>(headers,
valueOf(HttpServletResponse.SC_TEMPORARY_REDIRECT));
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package gdsc.konkuk.platformcore.external.discord;

import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_DESCRIPTION;
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_TIME_TEXT;
import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_TITLE;
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_DESCRIPTION;
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_TIME_TEXT;
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_TITLE;

import java.io.Serializable;
import java.time.LocalDateTime;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package gdsc.konkuk.platformcore.global.consts;

public class DiscordConstants {

public static final String DISCORD_ERROR_TITLE = "\uD83E\uDDE8 치명적인 서버 에러 발생!";
public static final String DISCORD_ERROR_DESCRIPTION =
"\uD83C\uDD98 서버에서 치명적인 에러가 발생했습니다. 빠르게 확인해주세요. \uD83C\uDD98";
public static final String DISCORD_ERROR_TIME_TEXT = "\uD83D\uDD50 에러 발생 시간 : ";
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,9 @@ public class PlatformConstants {
"https://member.gdsc-konkuk.dev", "https://landing.gdsc-konkuk.dev");

public static final Integer SOFT_DELETE_RETENTION_MONTHS = 3;

public static final String LOGIN_NAME = "id";
public static final String API_PREFIX = "/api/v1";

public static final String EMAIL_RECEIVER_NAME_REGEXP = "\\{이름}";

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

public static String apiPath(String path) {
return API_PREFIX + path;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package gdsc.konkuk.platformcore.global.consts;

public class SPAConstants {

public static final String SPA_ADMIN_BASE_URL = "https://admin.gdsc-konkuk.dev";
public static final String SPA_ADMIN_LOGIN_REDIRECT_URL =
SPA_ADMIN_BASE_URL + "/oauth/callback";
public static final String SPA_ADMIN_ATTENDANCE_SUCCESS_REDIRECT_URL =
SPA_ADMIN_BASE_URL + "/attendance-return/success";
public static final String SPA_ADMIN_ATTENDANCE_FAIL_REDIRECT_URL =
SPA_ADMIN_BASE_URL + "/attendance-return/fail";
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package gdsc.konkuk.platformcore.external.discord;

import static gdsc.konkuk.platformcore.global.consts.PlatformConstants.DISCORD_ERROR_TITLE;
import static gdsc.konkuk.platformcore.global.consts.DiscordConstants.DISCORD_ERROR_TITLE;
import static org.junit.jupiter.api.Assertions.assertEquals;

import gdsc.konkuk.platformcore.application.email.exceptions.EmailErrorCode;
Expand Down
Loading