feat: add native app auth code login flow

src/components/sidebar/index.js

@@ -216,7 +216,7 @@ function create($container, $toggler) {
 			return;
 		}
 
-		defaultAvatar.classList.add("loading");
+		defaultAvatar.classList.add("avatar-loading");
 
 		const img = <img alt="User avatar" className="avatar" />;
 		const avatarFile = await getUserAvatar(user);

src/components/sidebar/style.scss

@@ -132,6 +132,17 @@ body.no-animation {
         &.active {
           opacity: 1;
         }
+
+        &.avatar-loading {
+          opacity: 0.45;
+          background-color: rgba(255, 255, 255, 0.08);
+          animation: sidebar-avatar-loading 1.2s ease-in-out infinite;
+
+          &:hover {
+            opacity: 0.45;
+            background-color: rgba(255, 255, 255, 0.08);
+          }
+        }
       }
     }
 
@@ -340,6 +351,17 @@ body.no-animation {
   }
 }
 
+@keyframes sidebar-avatar-loading {
+  0%,
+  100% {
+    transform: scale(1);
+  }
+
+  50% {
+    transform: scale(0.94);
+  }
+}
+
 .user-menu {
   position: absolute;
   bottom: 55px;

src/handlers/intent.js

@@ -28,6 +28,10 @@ export default async function HandleIntent(intent = {}) {
 			const path = url.replace("acode://", "");
 			const [module, action, value] = path.split("/");
 
+			if (module === "auth" && action === "callback") {
+				return;
+			}
+
 			let defaultPrevented = false;
 			const event = new IntentEvent(module, action, value);
 			for (const handler of handlers) {

src/lib/auth.js

@@ -1,7 +1,4 @@
-import toast from "components/toast";
-import { addIntentHandler } from "handlers/intent";
 import config from "./config";
-import customTab from "./customTab";
 
 /**
  * @typedef {object} User
@@ -29,6 +26,7 @@ let loggedInUser = null;
 let cacheTimeout = null;
 
 const CACHE_USER_KEY = "cached-logged-in-user";
+const LOGIN_RESUME_TIMEOUT_MS = 60_000;
 
 const loginEvents = {
 	listeners: new Set(),
@@ -50,7 +48,6 @@ class AuthService {
 	#loginTimeout = null;
 
 	constructor() {
-		addIntentHandler(this.onIntentReceiver.bind(this));
 		loginEvents.addListener(() => {
 			clearTimeout(this.#loginTimeout);
 			for (const callback of this.#loginCallbacks) {
@@ -66,29 +63,10 @@ class AuthService {
 				}
 
 				this.#loginCallbacks.clear();
-			}, 1000);
+			}, LOGIN_RESUME_TIMEOUT_MS);
 		});
 	}
 
-	async onIntentReceiver(event) {
-		try {
-			if (event?.module === "user" && event?.action === "login") {
-				if (event?.value) {
-					this.#exec("saveToken", [event.value]);
-					toast("Logged in successfully");
-
-					setTimeout(() => {
-						loginEvents.emit();
-					}, 500);
-				}
-			}
-			return null;
-		} catch (error) {
-			console.error("Failed to parse intent token.", error);
-			return null;
-		}
-	}
-
 	/**
 	 * Helper to wrap cordova.exec in a Promise
 	 */
@@ -159,12 +137,22 @@ class AuthService {
 
 	async login() {
 		return new Promise((resolve, reject) => {
-			customTab(`${config.BASE_URL}/login?redirect=app`).catch((err) => {
-				console.error("Custom tab error", err);
-				reject("Failed to open browser");
-			});
-
-			this.#loginCallbacks.add({ resolve, reject });
+			const callback = { resolve, reject };
+			this.#loginCallbacks.add(callback);
+			this.#exec("login", [
+				{
+					baseUrl: config.BASE_URL,
+					appVersionCode: window.BuildInfo?.versionCode || 0,
+				},
+			])
+				.then(() => {
+					loginEvents.emit();
+				})
+				.catch((err) => {
+					console.error("Native login error", err);
+					this.#loginCallbacks.delete(callback);
+					reject("Failed to login");
+				});
 		});
 	}
 }

src/lib/checkPluginsUpdate.js

@@ -1,5 +1,6 @@
 import fsOperation from "fileSystem";
 import Url from "utils/Url";
+import { isVersionGreater } from "utils/version";
 import config from "./config";
 
 export default async function checkPluginsUpdate() {
@@ -20,7 +21,26 @@ export default async function checkPluginsUpdate() {
 
 				if (res.ok) {
 					const json = await res.json();
-					if (json.update) {
+					if (!json.update) return;
+
+					if (json.version) {
+						if (isVersionGreater(json.version, plugin.version)) {
+							updates.push(plugin.id);
+						}
+						return;
+					}
+
+					const remotePlugin = await fsOperation(
+						config.API_BASE,
+						`plugin/${plugin.id}`,
+					)
+						.readFile("json")
+						.catch(() => null);
+
+					if (
+						!remotePlugin?.version ||
+						isVersionGreater(remotePlugin.version, plugin.version)
+					) {
 						updates.push(plugin.id);
 					}
 				}

src/lib/installPlugin.js

@@ -6,6 +6,7 @@ import purchaseListener from "handlers/purchase";
 import JSZip from "jszip";
 import helpers from "utils/helpers";
 import Url from "utils/Url";
+import { isVersionGreater } from "utils/version";
 import config from "./config";
 import InstallState from "./installState";
 import { loadPluginWithTimeout } from "./loadPlugins";
@@ -406,7 +407,8 @@ async function resolveDepsManifest(deps) {
 			throw new Error(`Unknown plugin dependency: ${dependency}`);
 
 		const version = await getInstalledPluginVersion(remoteDependency.id);
-		if (remoteDependency?.version === version) continue;
+		if (version && !isVersionGreater(remoteDependency?.version, version))
+			continue;
 
 		if (remoteDependency.dependencies) {
 			const manifests = await resolveDepsManifest(

src/pages/plugin/plugin.js

@@ -21,6 +21,7 @@ import markdownItTaskLists from "markdown-it-task-lists";
 import { highlightCodeBlock, initHighlighting } from "utils/codeHighlight";
 import helpers from "utils/helpers";
 import Url from "utils/Url";
+import { isVersionGreater } from "utils/version";
 import view, { cleanups } from "./plugin.view.js";
 
 let $lastPluginPage;
@@ -160,7 +161,10 @@ export default async function PluginInclude(
 
 					if (cancelled || !remotePlugin) return;
 
-					if (installed && remotePlugin?.version !== plugin.version) {
+					if (
+						installed &&
+						isVersionGreater(remotePlugin?.version, plugin.version)
+					) {
 						currentVersion = plugin.version;
 						update = true;
 					}

src/plugins/auth/plugin.xml

@@ -12,10 +12,11 @@
         </config-file>
 
         <framework src="androidx.security:security-crypto:1.1.0" />
+        <framework src="androidx.browser:browser:1.5.0" />
 
         <source-file src="src/android/Authenticator.java" target-dir="src/com/foxdebug/acode/rk/auth" />
         <source-file src="src/android/EncryptedPreferenceManager.java" target-dir="src/com/foxdebug/acode/rk/auth" />
 
 
     </platform>
-</plugin>
+</plugin>