-
-
BlokWorks
-
-
-
-
{children}
diff --git a/src/components/__common/Layout/constants/index.ts b/src/components/Layout/constants/index.ts
similarity index 100%
rename from src/components/__common/Layout/constants/index.ts
rename to src/components/Layout/constants/index.ts
diff --git a/src/components/__common/Layout/index.tsx b/src/components/Layout/index.tsx
similarity index 100%
rename from src/components/__common/Layout/index.tsx
rename to src/components/Layout/index.tsx
diff --git a/src/hooks/useSilentAuth.tsx b/src/hooks/useSilentAuth.tsx
new file mode 100644
index 0000000..3f39332
--- /dev/null
+++ b/src/hooks/useSilentAuth.tsx
@@ -0,0 +1,46 @@
+import { useAuthStore } from '@/stores';
+import { ACCESS_TOKEN_NAME, REFREASH_TOKEN_NAME } from '@/utils';
+import { getCookie, deleteCookie } from 'cookies-next';
+import { usePathname, useRouter } from 'next/navigation';
+import { useCallback, useEffect } from 'react';
+
+function useSilentAuth() {
+ const router = useRouter();
+ // todo fix
+ const SDT_AT = getCookie(ACCESS_TOKEN_NAME) ?? '';
+ const { loggedIn, setSignIn, setSignOut } = useAuthStore();
+ const pathname = usePathname();
+
+ useEffect(() => {
+ if (SDT_AT && !loggedIn) {
+ setSignIn();
+ }
+ }, [SDT_AT, loggedIn, setSignIn]);
+
+ /**
+ * handle Logout
+ */
+ const handleLogout = useCallback(async () => {
+ deleteCookie(ACCESS_TOKEN_NAME);
+ deleteCookie(REFREASH_TOKEN_NAME);
+ setSignOut();
+ }, [setSignOut]);
+
+ /**
+ * not Server redirect
+ */
+ useEffect(() => {
+ if (
+ !loggedIn &&
+ !SDT_AT &&
+ !(pathname.includes('login') || pathname.includes('reset-password'))
+ ) {
+ router.push(`/login`);
+ handleLogout();
+ }
+ }, [SDT_AT, handleLogout, loggedIn, pathname, router, setSignOut]);
+
+ return {};
+}
+
+export default useSilentAuth;
diff --git a/src/stores/useAuthStore.ts b/src/stores/useAuthStore.ts
index 98d4f8d..ae773b6 100644
--- a/src/stores/useAuthStore.ts
+++ b/src/stores/useAuthStore.ts
@@ -1,20 +1,11 @@
import { create } from 'zustand';
import { devtools } from 'zustand/middleware';
-export interface ProfileType {
- id: string;
- sub: string;
- iat: number;
- exp: number;
-}
-
/**
* Auth State Type
*/
export interface AuthStateType {
loggedIn: boolean;
- email: string | null;
- profile: ProfileType | null;
}
/**
@@ -22,8 +13,7 @@ export interface AuthStateType {
*/
export interface AuthActionType {
- setSignIn: (by: ProfileType) => void;
- setEmail: (by: string) => void;
+ setSignIn: () => void;
setSignOut: () => void;
}
@@ -33,19 +23,14 @@ export const useAuthStore = create
()(
devtools(
(set): AuthStoreType => ({
loggedIn: false,
- email: null,
- profile: null,
- setSignIn: (by: ProfileType) =>
+ setSignIn: () =>
set(() => ({
- profile: { ...by },
loggedIn: true,
})),
- setEmail: (by: string) => set(() => ({ email: by })),
setSignOut: () =>
set(() => ({
loggedIn: false,
- email: null,
})),
}),
{ name: 'auth' },
diff --git a/src/utils/QueryClientProvider/QueryClientProviider.tsx b/src/utils/QueryClientProvider/QueryClientProviider.tsx
new file mode 100644
index 0000000..4673557
--- /dev/null
+++ b/src/utils/QueryClientProvider/QueryClientProviider.tsx
@@ -0,0 +1,18 @@
+'use client';
+
+import React from 'react';
+import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
+import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
+
+function Providers({ children }: React.PropsWithChildren) {
+ const [client] = React.useState(new QueryClient());
+
+ return (
+
+ {children}
+
+
+ );
+}
+
+export default Providers;
diff --git a/src/utils/QueryClientProvider/index.tsx b/src/utils/QueryClientProvider/index.tsx
new file mode 100644
index 0000000..5d237b3
--- /dev/null
+++ b/src/utils/QueryClientProvider/index.tsx
@@ -0,0 +1 @@
+export { default } from './QueryClientProviider';
diff --git a/src/components/__common/StyledComponentProvider/StyledComponentProvider.tsx b/src/utils/StyledComponentProvider/StyledComponentProvider.tsx
similarity index 71%
rename from src/components/__common/StyledComponentProvider/StyledComponentProvider.tsx
rename to src/utils/StyledComponentProvider/StyledComponentProvider.tsx
index 18a171e..507fb8e 100644
--- a/src/components/__common/StyledComponentProvider/StyledComponentProvider.tsx
+++ b/src/utils/StyledComponentProvider/StyledComponentProvider.tsx
@@ -1,7 +1,7 @@
-"use client";
-import React, { useState } from "react";
-import { useServerInsertedHTML } from "next/navigation";
-import { ServerStyleSheet, StyleSheetManager } from "styled-components";
+'use client';
+import React, { useState } from 'react';
+import { useServerInsertedHTML } from 'next/navigation';
+import { ServerStyleSheet, StyleSheetManager } from 'styled-components';
export default function StyledComponentsRegistry({
children,
@@ -18,7 +18,7 @@ export default function StyledComponentsRegistry({
return styles;
});
- if (typeof window !== "undefined") return <>{children};
+ if (typeof window !== 'undefined') return <>{children};
return (
diff --git a/src/components/__common/StyledComponentProvider/index.tsx b/src/utils/StyledComponentProvider/index.tsx
similarity index 100%
rename from src/components/__common/StyledComponentProvider/index.tsx
rename to src/utils/StyledComponentProvider/index.tsx
diff --git a/src/utils/cookies.ts b/src/utils/cookies.ts
deleted file mode 100644
index 73e6d66..0000000
--- a/src/utils/cookies.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Cookies } from 'react-cookie';
-import { CookieSetOptions } from 'universal-cookie';
-
-const cookies = new Cookies();
-
-export const REFREASH_TOKEN_NAME = 'SDT_RT';
-export const ACCESS_TOKEN_NAME = 'SDT_AT';
-
-export const setCookie = (
- name: string,
- value: string,
- option: CookieSetOptions | undefined,
-) => {
- return cookies.set(name, value, { ...option });
-};
-
-export const getCookie = (name: string) => {
- return cookies.get(name);
-};
-
-export const removeCookie = (name: string) => {
- return cookies.remove(name, {
- path: '/',
- });
-};
diff --git a/src/utils/index.ts b/src/utils/index.ts
index ed0f79b..e35bf27 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,3 +1,2 @@
-export * from './cookies';
export * from './setToken';
export * from './reg';
diff --git a/src/utils/setToken.ts b/src/utils/setToken.ts
index 4ab36cc..0359068 100644
--- a/src/utils/setToken.ts
+++ b/src/utils/setToken.ts
@@ -1,5 +1,9 @@
import { SignInResponseType } from '../api/oauth';
-import { ACCESS_TOKEN_NAME, REFREASH_TOKEN_NAME, setCookie } from './cookies';
+import { setCookie } from 'cookies-next';
+
+// todo fix
+export const REFREASH_TOKEN_NAME = 'SDT_RT';
+export const ACCESS_TOKEN_NAME = 'SDT_AT';
export function setToken(
loginResponse: SignInResponseType,