[test]: webview token test

PBTP · Nov 5, 2024 · 289d81a · 289d81a
1 parent e7c0dac
commit 289d81a
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 3 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,13 +1,20 @@
-import { useEffect } from 'react';
+import { useEffect, useRef } from 'react';
 import { RootRouter } from './router/RootRouter';
 import { setUserAuth, useAuthStore } from './stores/useAuthStore';
 import { showiOSInfo } from './webview/utils';
 import { useSocket } from './hooks/socket/useSocket';
 
+// 전역 변수로 초기 토큰 저장
+let initialToken: string | null = null;
+let initialUuid: string | null = null;
+
 if (!window.handleIosWebviewToken) {
   window.handleIosWebviewToken = (token, uuid) => {
     showiOSInfo(`token:${token},uuid:${uuid}`);
     if (token) {
+      // 초기 토큰 저장
+      initialToken = token;
+      initialUuid = uuid;
       setUserAuth(token, uuid);
       return 'success';
     }
@@ -18,19 +25,32 @@ if (!window.handleIosWebviewToken) {
 function App() {
   const token = useAuthStore((state) => state.accessToken);
   const { socket } = useSocket();
+  const isInitialized = useRef(false);
+
+  // 초기화 useEffect
+  useEffect(() => {
+    if (!isInitialized.current && initialToken && initialUuid) {
+      console.log('Initializing with stored token');
+      setUserAuth(initialToken, initialUuid);
+      isInitialized.current = true;
+    }
+  }, []);
 
   useEffect(() => {
     const handleAuthUpdate = (event: CustomEvent) => {
       console.log('Auth updated:', event.detail);
       if (socket) {
+        console.log('Reconnecting socket');
         socket.disconnect();
         socket.connect();
       }
     };
 
     window.addEventListener('auth-update', handleAuthUpdate as EventListener);
 
+    // WebView 준비 상태 알림
     if (window.webkit?.messageHandlers.webviewInit) {
+      console.log('Sending webviewReady');
       window.webkit.messageHandlers.webviewInit.postMessage('webviewReady');
     }
 
@@ -42,6 +62,11 @@ function App() {
     };
   }, [socket, token]);
 
+  // 디버깅을 위한 토큰 상태 로깅
+  useEffect(() => {
+    console.log('Current token:', token);
+  }, [token]);
+
   return <RootRouter />;
 }
 

diff --git a/src/stores/useAuthStore.ts b/src/stores/useAuthStore.ts
@@ -1,5 +1,5 @@
 import { create } from 'zustand';
-import { persist, createJSONStorage } from 'zustand/middleware';
+import { persist } from 'zustand/middleware';
 
 interface AuthState {
   accessToken: string | null;
@@ -13,6 +13,7 @@ export const useAuthStore = create<AuthState>()(
       accessToken: null,
       uuid: null,
       setAuth: (token, uuid) => {
+        console.log('Setting auth:', { token, uuid });
         set({ accessToken: token, uuid });
         window.dispatchEvent(
           new CustomEvent('auth-update', {
@@ -23,11 +24,17 @@ export const useAuthStore = create<AuthState>()(
     }),
     {
       name: 'auth-storage',
-      storage: createJSONStorage(() => localStorage),
+      onRehydrateStorage: () => {
+        console.log('Rehydrating auth store');
+        return (state) => {
+          console.log('Rehydrated state:', state);
+        };
+      },
     }
   )
 );
 
 export const setUserAuth = (token: string, uuid: string) => {
+  console.log('setUserAuth called:', { token, uuid });
   useAuthStore.getState().setAuth(token, uuid);
 };