Fix AllDebrid issue

debridmediamanager · Nov 13, 2023 · 08697a4 · 08697a4
1 parent de63fda
commit 08697a4
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/src/hooks/auth.ts b/src/hooks/auth.ts
@@ -4,7 +4,6 @@ import { clearRdKeys } from '@/utils/clearLocalStorage';
 import { useRouter } from 'next/router';
 import { useEffect, useState } from 'react';
 import useLocalStorage from './localStorage';
-import { E } from 'vitest/dist/reporters-5f784f42';
 
 interface RealDebridUser {
 	id: number;
@@ -88,7 +87,8 @@ export const useCurrentUser = () => {
 	const router = useRouter();
 	const [accessToken] = useLocalStorage<string>('rd:accessToken');
 	const [apiKey] = useLocalStorage<string>('ad:apiKey');
-	const [errors, setErrors] = useState<Map<string, any>>(new Map());
+	const [rdError, setRdError] = useState<Error | null>(null);
+	const [adError, setAdError] = useState<Error | null>(null);
 
 	useEffect(() => {
 		(async () => {
@@ -99,20 +99,18 @@ export const useCurrentUser = () => {
 					if (rdUserResponse) setRdUser(<RealDebridUser>rdUserResponse);
 				}
 			} catch (error: any) {
-				console.error('rd error', error);
-				setErrors((errors) => errors.set('rd', error));
+				setRdError(new Error(error));
 			}
 			try {
 				if (apiKey) {
 					const adUserResponse = await getAllDebridUser(apiKey);
 					if (adUserResponse) setAdUser(<AllDebridUser>adUserResponse);
 				}
-			} catch (error) {
-				console.error('ad error', error);
-				setErrors((errors) => errors.set('ad', error));
+			} catch (error: any) {
+				setAdError(new Error(error));
 			}
 		})();
-	}, [accessToken, apiKey, router, errors]);
+	}, [accessToken, apiKey, router]);
 
-	return { realDebrid: rdUser, allDebrid: adUser, errors };
+	return { realDebrid: rdUser, allDebrid: adUser, rdError, adError };
 };
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -3,18 +3,25 @@ import { withAuth } from '@/utils/withAuth';
 import Head from 'next/head';
 import Link from 'next/link';
 import { useRouter } from 'next/router';
+import { useEffect } from 'react';
 import { Toaster, toast } from 'react-hot-toast';
 
 function IndexPage() {
 	const router = useRouter();
-	const { realDebrid: rdUser, allDebrid: adUser, errors } = useCurrentUser();
+	const { realDebrid: rdUser, allDebrid: adUser, rdError, adError } = useCurrentUser();
 
-	if (errors.get('rd')) {
-		toast.error('Real-Debrid get user info failed, check your email and confirm the login coming from DMM');
-	}
-	if (errors.get('ad')) {
-		toast.error('AllDebrid get user info failed, check your email and confirm the login coming from DMM');
-	}
+	useEffect(() => {
+		if (rdError) {
+			toast.error(
+				'Real-Debrid get user info failed, check your email and confirm the login coming from DMM'
+			);
+		}
+		if (adError) {
+			toast.error(
+				'AllDebrid get user info failed, check your email and confirm the login coming from DMM'
+			);
+		}
+	}, [rdError, adError]);
 
 	const handleLogout = (prefix?: string) => {
 		if (typeof window === 'undefined') {