diff --git a/src/main/java/se/ton/t210/configuration/TokenFilterConfig.java b/src/main/java/se/ton/t210/configuration/TokenFilterConfig.java index 8323db6..365c072 100644 --- a/src/main/java/se/ton/t210/configuration/TokenFilterConfig.java +++ b/src/main/java/se/ton/t210/configuration/TokenFilterConfig.java @@ -32,10 +32,15 @@ public FilterRegistrationBean addAccessTokenFilter() { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>(); filterRegistrationBean.setFilter(new TokenFilter(tokenSecret, accessTokenCookieKey)); filterRegistrationBean.addUrlPatterns( - "/api/reissue/token", "/html/dashboard.html", "/html/personal-information.html", "/html/record.html", + "/html/application-information1.html", + "/html/application-information2.html", + "/html/application-information3.html", + "/html/application-information4.html", + "/html/application-information5.html", + "/html/application-information6.html", "/html/setting-account.html" ); return filterRegistrationBean; @@ -45,7 +50,9 @@ public FilterRegistrationBean addAccessTokenFilter() { public FilterRegistrationBean addRefreshTokenFilter() { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>(); filterRegistrationBean.setFilter(new TokenFilter(tokenSecret, refreshTokenCookieKey)); - filterRegistrationBean.addUrlPatterns("/api/reissue/token"); + filterRegistrationBean.addUrlPatterns( + "/api/reissue/token" + ); return filterRegistrationBean; } @@ -53,7 +60,9 @@ public FilterRegistrationBean addRefreshTokenFilter() { public FilterRegistrationBean addEmailTokenFilter() { FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean<>(); filterRegistrationBean.setFilter(new TokenFilter(tokenSecret, emailAuthTokenCookieKey)); - filterRegistrationBean.addUrlPatterns("/api/member/signUp"); + filterRegistrationBean.addUrlPatterns( + "/api/member/signUp" + ); return filterRegistrationBean; } } diff --git a/src/main/java/se/ton/t210/configuration/filter/TokenFilter.java b/src/main/java/se/ton/t210/configuration/filter/TokenFilter.java index af4dd73..141fe9d 100644 --- a/src/main/java/se/ton/t210/configuration/filter/TokenFilter.java +++ b/src/main/java/se/ton/t210/configuration/filter/TokenFilter.java @@ -32,7 +32,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse secret.validateToken(refreshToken); } catch (AuthException e) { response.setStatus(HttpStatus.UNAUTHORIZED.value()); - response.sendRedirect("/html/error-401.html"); + response.sendRedirect("/html/sign-in.html"); response.getOutputStream().write(e.getMessage().getBytes()); return; } diff --git a/src/main/java/se/ton/t210/controller/PageController.java b/src/main/java/se/ton/t210/controller/PageController.java new file mode 100644 index 0000000..2cf63bf --- /dev/null +++ b/src/main/java/se/ton/t210/controller/PageController.java @@ -0,0 +1,34 @@ +package se.ton.t210.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import se.ton.t210.configuration.annotation.LoginMember; +import se.ton.t210.domain.type.ApplicationType; +import se.ton.t210.dto.LoginMemberInfo; + +@Controller +public class PageController { + + @GetMapping("/html/application-information") + public String information(@LoginMember LoginMemberInfo memberInfo) { + if(memberInfo.getApplicationType() == ApplicationType.PoliceOfficerMale) { + return "redirect:/html/application-information1.html"; + } + if(memberInfo.getApplicationType() == ApplicationType.PoliceOfficerFemale) { + return "redirect:/html/application-information2.html"; + } + if(memberInfo.getApplicationType() == ApplicationType.FireOfficerMale) { + return "redirect:/html/application-information3.html"; + } + if(memberInfo.getApplicationType() == ApplicationType.FireOfficerFemale) { + return "redirect:/html/application-information4.html"; + } + if(memberInfo.getApplicationType() == ApplicationType.CorrectionalOfficerFemale) { + return "redirect:/html/application-information5.html"; + } + if(memberInfo.getApplicationType() == ApplicationType.CorrectionalOfficerMale) { + return "redirect:/html/application-information6.html"; + } + return "/html/application-information1.html"; + } +} diff --git a/src/main/java/se/ton/t210/utils/encript/SeedUtils.java b/src/main/java/se/ton/t210/utils/encript/SeedUtils.java index 8ed0be5..ddd131f 100644 --- a/src/main/java/se/ton/t210/utils/encript/SeedUtils.java +++ b/src/main/java/se/ton/t210/utils/encript/SeedUtils.java @@ -39,5 +39,4 @@ public static String decode(String encodedSeedKey, String encodedText) { throw new InnerServiceException("fail seed cbc decrypt."); } } - } diff --git a/src/main/resources/static/js/dashboard.js b/src/main/resources/static/js/dashboard.js index 7051ae3..e5a00f5 100644 --- a/src/main/resources/static/js/dashboard.js +++ b/src/main/resources/static/js/dashboard.js @@ -15,7 +15,7 @@ menu03Container.addEventListener("click", function (e) { const menu04Container = document.getElementById("menu04Container") menu04Container.addEventListener("click", function (e) { - window.location.href = "../html/application-information1.html"; + window.location.href = "../html/application-information"; });