Merge pull request #309 from ssu-student-union/feat/#307_council_redi…

…rect Feat/#307 council redirect
ssu-student-union · Nov 1, 2024 · 96a913c · 96a913c
2 parents 86a0827 + 25de242
commit 96a913c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/src/pages/general/containers/GeneralRegisterSection.tsx b/src/pages/general/containers/GeneralRegisterSection.tsx
@@ -111,7 +111,10 @@ export function GeneralRegisterSection({ subSection1, buttonSection }: LoginForm
       });
 
       if (response.status === 200) {
-        if (redirectUrl != null) {
+        if (redirectUrl !== null) {
+          if (!accessToken) {
+            accessToken = response.data?.data?.accessToken;
+          }
           const separator = redirectUrl.includes('?') ? '&' : '?';
           const newRedirectUrl = `${redirectUrl}${separator}accessToken=${encodeURIComponent(accessToken)}`;
           localStorage.removeItem('redirectUrl');

diff --git a/src/pages/kakao/containers/RegisterButtonSection.tsx b/src/pages/kakao/containers/RegisterButtonSection.tsx
@@ -12,11 +12,7 @@ const handleLogin = () => {
   window.location.href = KAKAO_AUTH_URL;
 };
 
-interface type {
-  isRedirect?: boolean;
-}
-
-export function RegisterButtonSection({ isRedirect = false }: type) {
+export function RegisterButtonSection() {
   return (
     <div
       style={{
@@ -33,13 +29,11 @@ export function RegisterButtonSection({ isRedirect = false }: type) {
         <div onClick={handleLogin}>
           <KakaoButton />
         </div>
-        {!isRedirect && (
-          <Link to={'scouncil'}>
-            <div className="mt-[20px] text-[12px] font-medium not-italic leading-[130%] text-[#828282] underline">
-              학생자치기구 로그인
-            </div>
-          </Link>
-        )}
+        <Link to={'/register/scouncil'}>
+          <div className="mt-[20px] text-[12px] font-medium not-italic leading-[130%] text-[#828282] underline">
+            학생자치기구 로그인
+          </div>
+        </Link>
       </div>
     </div>
   );

diff --git a/src/pages/kakao/redirect/page.tsx b/src/pages/kakao/redirect/page.tsx
@@ -20,7 +20,7 @@ export function KakaoRegisterRedirectPage() {
           <RegisterTextSection />
         </div>
         <div className="z-99 absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 transform">
-          <RegisterButtonSection isRedirect={true} />
+          <RegisterButtonSection />
         </div>
         <div className="pointer-events-none absolute left-1/2 top-full mt-[-100px] -translate-x-1/2 -translate-y-1/2 transform">
           <RegisterTextSection />