Merge pull request #281 from Materialious/fix/auth-deny

Fix auth deny
This commit is contained in:
Ward
2024-05-11 16:32:23 +12:00
committed by GitHub
5 changed files with 53 additions and 48 deletions
+2 -2
View File
@@ -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.
+40 -40
View File
@@ -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"
]
}
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "materialious",
"version": "1.0.6",
"version": "1.0.7",
"private": true,
"scripts": {
"dev": "vite dev",
+9 -4
View File
@@ -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('/');
});
+1 -1
View File
@@ -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")