🐛 fix: profile won't cached

Signed-off-by: SimonShiki <[email protected]>
SimonShiki · Aug 11, 2024 · 143f64e · 143f64e
1 parent 410dcb4
commit 143f64e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -13,8 +13,23 @@ function App () {
 
     useEffect(() => {
         const disableContextMenu = (event: MouseEvent) => event.preventDefault();
+        const disableRefresh = (event: KeyboardEvent) => {
+            if (
+                event.key === 'F5' ||
+                (event.ctrlKey && event.key === 'r') ||
+                (event.metaKey && event.key === 'r')
+            ) {
+                event.preventDefault();
+            }
+        };
+        if (import.meta.env.PROD) {
+            document.addEventListener('keydown', disableRefresh);
+        }
         document.addEventListener('contextmenu', disableContextMenu);
-        return () => document.removeEventListener('contextmenu', disableContextMenu);
+        return () => {
+            document.removeEventListener('contextmenu', disableContextMenu);
+            document.removeEventListener('keydown', disableRefresh);
+        };
     }, []);
     return (
         <div className='flex flex-row'>

diff --git a/src/pages/settings.tsx b/src/pages/settings.tsx
@@ -64,7 +64,7 @@ export default function Settings () {
         }
         async function qrLogin () {
             const keyRes = await fetch(`${ncmConfig.api}login/qr/key`);
-            const { data: keyData } = await keyRes.json();
+            const {data: keyData} = await keyRes.json();
             const imgRes = await fetch(`${ncmConfig.api}login/qr/create?key=${keyData.unikey}&qrimg=1&t=${Date.now()}`);
             const {data: imageData} = await imgRes.json();
             setQrUrl(imageData.qrimg);
@@ -76,6 +76,8 @@ export default function Settings () {
                 switch (checkData.code) {
                 // expired
                 case 800: {
+                    const keyRes = await fetch(`${ncmConfig.api}login/qr/key`);
+                    const { data: keyData } = await keyRes.json();
                     const imgRes = await fetch(`${ncmConfig.api}login/qr/create?key=${keyData.unikey}&t=${Date.now()}`);
                     const { data: imageData } = await imgRes.json();
                     setQrUrl(imageData.qrimg);

diff --git a/src/storages/ncm.ts b/src/storages/ncm.ts
@@ -298,10 +298,10 @@ export class NCM implements AbstractStorage {
     private initListener () {
         const loggedInJotai = focusAtom(this.ncmStorageConfigJotai, (optic) => optic.prop('loggedIn'));
         sharedStore.sub(loggedInJotai, async () => {
-            const ncmConfig = sharedStore.get(this.ncmStorageConfigJotai) as NCMConfig;
             const loggedIn = sharedStore.get(loggedInJotai);
             if (loggedIn) {
                 const { userId } = await this.getProfile();
+                const ncmConfig = sharedStore.get(this.ncmStorageConfigJotai) as NCMConfig;
                 sharedStore.set(this.ncmStorageConfigJotai, {...ncmConfig, ...{uid: userId}});
             }
         });
@@ -335,6 +335,7 @@ export class NCM implements AbstractStorage {
     }
 
     private get config () {
+        console.log(sharedStore.get(this.ncmStorageConfigJotai));
         return (sharedStore.get(this.ncmStorageConfigJotai) ?? defaultConfig) as NCMConfig;
     }