From 2b7d50fb15c6fe4f6099fdc16143dceb1c884ad6 Mon Sep 17 00:00:00 2001
From: WardPearce <wardpearce@pm.me>
Date: Sat, 11 May 2024 16:31:16 +1200
Subject: [PATCH] Fix auth deny

---
 materialious/android/app/build.gradle     |  4 +-
 materialious/electron/package.json        | 80 +++++++++++------------
 materialious/package.json                 |  2 +-
 materialious/src/routes/auth/+page.svelte | 13 ++--
 update_versions.py                        |  2 +-
 5 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/materialious/android/app/build.gradle b/materialious/android/app/build.gradle
index a8c68d07..53b2d061 100644
--- a/materialious/android/app/build.gradle
+++ b/materialious/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "us.materialio.app"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 6
-        versionName "1.0.6"
+        versionCode 7
+        versionName "1.0.7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
diff --git a/materialious/electron/package.json b/materialious/electron/package.json
index 56eb3527..110d6d0e 100644
--- a/materialious/electron/package.json
+++ b/materialious/electron/package.json
@@ -1,42 +1,42 @@
 {
-  "name": "Materialious",
-  "version": "1.0.6",
-  "description": "Modern material design for Invidious.",
-  "author": {
-    "name": "Ward Pearce",
-    "email": "wardpearce@pm.me"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/WardPearce/Materialious"
-  },
-  "license": "MIT",
-  "main": "build/src/index.js",
-  "scripts": {
-    "build": "tsc && electron-rebuild",
-    "electron:start-live": "node ./live-runner.js",
-    "electron:start": "npm run build && electron --inspect=5858 ./",
-    "electron:pack": "npm run build && electron-builder build --dir -c ./electron-builder.config.json",
-    "electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always"
-  },
-  "dependencies": {
-    "@capacitor-community/electron": "^5.0.0",
-    "@types/node": "^16.18.71",
-    "chokidar": "~3.5.3",
-    "electron-is-dev": "~2.0.0",
-    "electron-serve": "~1.1.0",
-    "electron-unhandled": "~4.0.1",
-    "electron-updater": "^5.3.0",
-    "electron-window-state": "^5.0.3"
-  },
-  "devDependencies": {
-    "electron": "^26.2.2",
-    "electron-builder": "~23.6.0",
-    "electron-rebuild": "^3.2.9",
-    "typescript": "^5.0.4"
-  },
-  "keywords": [
-    "capacitor",
-    "electron"
-  ]
+	"name": "Materialious",
+	"version": "1.0.7",
+	"description": "Modern material design for Invidious.",
+	"author": {
+		"name": "Ward Pearce",
+		"email": "wardpearce@pm.me"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WardPearce/Materialious"
+	},
+	"license": "MIT",
+	"main": "build/src/index.js",
+	"scripts": {
+		"build": "tsc && electron-rebuild",
+		"electron:start-live": "node ./live-runner.js",
+		"electron:start": "npm run build && electron --inspect=5858 ./",
+		"electron:pack": "npm run build && electron-builder build --dir -c ./electron-builder.config.json",
+		"electron:make": "npm run build && electron-builder build -c ./electron-builder.config.json -p always"
+	},
+	"dependencies": {
+		"@capacitor-community/electron": "^5.0.0",
+		"@types/node": "^16.18.71",
+		"chokidar": "~3.5.3",
+		"electron-is-dev": "~2.0.0",
+		"electron-serve": "~1.1.0",
+		"electron-unhandled": "~4.0.1",
+		"electron-updater": "^5.3.0",
+		"electron-window-state": "^5.0.3"
+	},
+	"devDependencies": {
+		"electron": "^26.2.2",
+		"electron-builder": "~23.6.0",
+		"electron-rebuild": "^3.2.9",
+		"typescript": "^5.0.4"
+	},
+	"keywords": [
+		"capacitor",
+		"electron"
+	]
 }
\ No newline at end of file
diff --git a/materialious/package.json b/materialious/package.json
index 51b9053e..299254c9 100644
--- a/materialious/package.json
+++ b/materialious/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "materialious",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"private": true,
 	"scripts": {
 		"dev": "vite dev",
diff --git a/materialious/src/routes/auth/+page.svelte b/materialious/src/routes/auth/+page.svelte
index 28141f08..dc33d769 100644
--- a/materialious/src/routes/auth/+page.svelte
+++ b/materialious/src/routes/auth/+page.svelte
@@ -7,10 +7,15 @@
 
 	// Auth response handling for Desktop
 	onMount(() => {
-		authStore.set({
-			username: $page.url.searchParams.get('username') as string,
-			token: $page.url.searchParams.get('token') as string
-		});
+		const username = $page.url.searchParams.get('username');
+		const token = $page.url.searchParams.get('token');
+
+		if (username && token) {
+			authStore.set({
+				username: username,
+				token: token
+			});
+		}
 
 		goto('/');
 	});
diff --git a/update_versions.py b/update_versions.py
index c057f930..d5228f58 100644
--- a/update_versions.py
+++ b/update_versions.py
@@ -5,7 +5,7 @@ import json
 import os
 import re
 
-LATEST_VERSION = "1.0.6"
+LATEST_VERSION = "1.0.7"
 WORKING_DIR = os.path.join(os.path.dirname(os.path.realpath(__file__)), "materialious")
 
 ROOT_PACKAGE = os.path.join(WORKING_DIR, "package.json")