From 79254bbd8d11d8d521781a9003d422e284222869 Mon Sep 17 00:00:00 2001
From: Mattias Persson <mattias.persson.87@gmail.com>
Date: Mon, 17 Jun 2024 23:52:59 +0200
Subject: [PATCH] Update youtube addon

---
 package.json                       |  2 +-
 src/lib/Modal/YoutubeModal.svelte  | 11 ++++++++---
 src/routes/_api/youtube/+server.ts | 22 +++++++++++++---------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 7ccc8614..bd2caa01 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,6 @@
 		"svelte-ripple": "^0.1.1",
 		"svelte-tiny-virtual-list": "^2.1.2",
 		"weekstart": "^2.0.0",
-		"youtubei.js": "^9.4.0"
+		"youtubei.js": "^10.0.0"
 	}
 }
diff --git a/src/lib/Modal/YoutubeModal.svelte b/src/lib/Modal/YoutubeModal.svelte
index 6769ba2e..0b1d0de9 100644
--- a/src/lib/Modal/YoutubeModal.svelte
+++ b/src/lib/Modal/YoutubeModal.svelte
@@ -36,13 +36,18 @@
 
 			const result = await response.json();
 			data = result;
+
+			if (!response.ok) {
+				throw new Error(result?.message);
+			}
+
 			clearInterval(interval);
 		} catch (err: any) {
 			if (err?.name === 'AbortError') {
 				// ignore
 			} else {
-				event = { message: 'error', error: 'Failed to initiate authentication' };
-				console.error('Failed to initiate authentication:', err);
+				event = { message: 'error', error: err?.message };
+				console.error(err);
 			}
 			clearInterval(interval);
 		}
@@ -183,7 +188,7 @@
 					<div class="user-info">
 						<img src={account_photo} alt="" />
 
-						<span>{account_name}</span>
+						<span>{account_name || ''}</span>
 
 						<button
 							class="action remove"
diff --git a/src/routes/_api/youtube/+server.ts b/src/routes/_api/youtube/+server.ts
index e7021ccc..f9758cfd 100644
--- a/src/routes/_api/youtube/+server.ts
+++ b/src/routes/_api/youtube/+server.ts
@@ -23,15 +23,14 @@ export const POST: RequestHandler = async ({ request }) => {
 
 		// logout
 	} else if (message === 'logout') {
-		if (!youtube) {
-			return json({
-				message: 'error',
-				error: 'YouTube not initialized'
-			});
-		}
-
 		try {
-			await youtube.session.signOut();
+			// catch error if not signed in
+			// so credentials can be removed anyway
+			try {
+				await youtube?.session.signOut();
+			} catch (err) {
+				console.error(err);
+			}
 			unlinkSync(credentialsFilePath);
 			const configFilePath = './data/configuration.yaml';
 			let config = await loadFile(configFilePath);
@@ -156,7 +155,12 @@ export const GET: RequestHandler = async () => {
 			};
 		});
 
-		const auth = await loadFile(credentialsFilePath);
+		let auth = await loadFile(credentialsFilePath);
+
+		// load function returned empty object
+		// signIn expects undefined if empty
+		if (!Object.keys(auth)?.length) auth = undefined;
+
 		await youtube.session.signIn(auth);
 
 		const data = await youtube.account.getInfo();