Moved invidious auth redirect

materialious/electron/package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "Materialious",
-	"version": "1.15.7",
+	"version": "1.16.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "Materialious",
-			"version": "1.15.7",
+			"version": "1.16.0",
 			"license": "MIT",
 			"dependencies": {
 				"@capacitor-community/electron": "^5.0.0",

materialious/src/lib/externalSettings/index.ts

@@ -26,7 +26,6 @@ export async function syncSettingsToBackend() {
 			let initalLoad = true;
 			store.store.subscribe((value) => {
 				if (!get(rawMasterKeyStore)) return;
-
 				if (initalLoad) {
 					initalLoad = false;
 					return;

materialious/src/lib/misc.ts

@@ -314,7 +314,7 @@ export async function goToInvidiousLogin() {
 		path.search = searchParams.toString();
 		await Browser.open({ url: path.toString() });
 	} else {
-		searchParams.set('callback_url', `${location.origin}${resolve('/auth', {})}`);
+		searchParams.set('callback_url', `${location.origin}${resolve('/invidious/auth', {})}`);
 		path.search = searchParams.toString();
 		document.location.href = path.toString();
 	}

materialious/src/routes/(app)/auth/+page.svelte

@@ -1,25 +0,0 @@
-<script lang="ts">
-	import { goto } from '$app/navigation';
-	import { resolve } from '$app/paths';
-	import { page } from '$app/stores';
-	import PageLoading from '$lib/components/PageLoading.svelte';
-	import { invidiousAuthStore } from '$lib/store';
-	import { onMount } from 'svelte';
-
-	// Auth response handling for Desktop
-	onMount(() => {
-		const username = $page.url.searchParams.get('username');
-		const token = $page.url.searchParams.get('token');
-
-		if (username && token) {
-			invidiousAuthStore.set({
-				username: username,
-				token: token
-			});
-		}
-
-		goto(resolve('/', {}));
-	});
-</script>
-
-<PageLoading />

materialious/src/routes/+layout.svelte

@@ -83,11 +83,12 @@
 	onMount(async () => {
 		ui();
 
-		if (Capacitor.getPlatform() === 'android' && $themeColorStore) {
+		if (Capacitor.getPlatform() === 'android' && !$themeColorStore) {
 			try {
 				const colorPalette = await colorTheme.getColorPalette();
-				themeColorStore.set(convertToHexColorCode(colorPalette.primary));
-				await ui('theme', $themeColorStore);
+				const colorAsHex = convertToHexColorCode(colorPalette.primary);
+				themeColorStore.set(colorAsHex);
+				await ui('theme', colorAsHex);
 			} catch {
 				// Continue regardless of error
 			}

materialious/src/routes/api/proxy/[urlToProxy]/+server.ts

@@ -106,6 +106,11 @@ async function proxyRequest(
 	requestHeaders.set('origin', urlToProxyObj.origin);
 	requestHeaders.set('user-agent', USER_AGENT);
 
+	const authHeader = request.headers.get('Authorization');
+	if (authHeader) {
+		requestHeaders.set('Authorization', authHeader);
+	}
+
 	const requestOptions: RequestInit = {
 		method: request.method,
 		headers: requestHeaders,

materialious/src/routes/invidious/auth/+page.ts

@@ -0,0 +1,17 @@
+import { resolve } from '$app/paths';
+import { invidiousAuthStore } from '$lib/store';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ url }) {
+	const username = url.searchParams.get('username');
+	const token = url.searchParams.get('token');
+
+	if (username && token) {
+		invidiousAuthStore.set({
+			username: username,
+			token: token
+		});
+	}
+
+	throw redirect(302, resolve('/', {}));
+}