chore: clean up oauth callback (#399)

apps/readest-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@readest/readest-app",
-  "version": "0.9.11",
+  "version": "0.9.12",
   "private": true,
   "scripts": {
     "dev": "dotenv -e .env.tauri -- next dev",
@@ -26,6 +26,7 @@
     "build-macos-universial": "dotenv -e .env.tauri.local -e .env.apple-nonstore.local -- tauri build -t universal-apple-darwin --bundles dmg",
     "build-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- tauri build -t universal-apple-darwin --bundles app --config src-tauri/tauri.appstore.conf.json",
     "build-macos-universial-appstore-dev": "dotenv -e .env.tauri.local -e .env.apple-appstore-dev.local -- tauri build -t universal-apple-darwin --bundles app --config src-tauri/tauri.appstore-dev.conf.json",
+    "build-ios": "dotenv -e .env.ios-appstore-dev.local -- tauri ios build",
     "build-ios-appstore": "dotenv -e .env.ios-appstore.local -- tauri ios build --export-method app-store-connect",
     "release-macos-universial-appstore": "dotenv -e .env.tauri.local -e .env.apple-appstore.local -- bash scripts/release-mac-appstore.sh",
     "release-ios-appstore": "dotenv -e .env.ios-appstore.local -- bash scripts/release-ios-appstore.sh",

apps/readest-app/src/app/auth/page.tsx

@@ -16,10 +16,9 @@ import { useTheme } from '@/hooks/useTheme';
 import { useEnv } from '@/context/EnvContext';
 import { useSettingsStore } from '@/store/settingsStore';
 import { isTauriAppPlatform } from '@/services/environment';
-import { onOpenUrl, getCurrent } from '@tauri-apps/plugin-deep-link';
+import { onOpenUrl } from '@tauri-apps/plugin-deep-link';
 import { start, cancel, onUrl, onInvalidUrl } from '@fabianlars/tauri-plugin-oauth';
 import { openUrl } from '@tauri-apps/plugin-opener';
-import { tauriHandleOnWindowFocus } from '@/utils/window';
 import { handleAuthCallback } from '@/helpers/auth';
 import { getOSPlatform } from '@/utils/misc';
 
@@ -37,6 +36,9 @@ interface ProviderLoginProp {
   label: string;
 }
 
+const WEB_AUTH_CALLBACK = 'https://web.readest.com/auth/callback';
+const DEEPLINK_CALLBACK = 'readest://auth/callback';
+
 const ProviderLogin: React.FC<ProviderLoginProp> = ({ provider, handleSignIn, Icon, label }) => {
   return (
     <button
@@ -66,8 +68,8 @@ export default function AuthPage() {
   const getTauriRedirectTo = () => {
     return process.env.NODE_ENV === 'production'
       ? ['android', 'ios'].includes(osPlatform)
-        ? 'https://web.readest.com/auth/callback'
-        : 'readest://auth/callback'
+        ? WEB_AUTH_CALLBACK
+        : DEEPLINK_CALLBACK
       : `http://localhost:${port}`;
   };
 
@@ -88,22 +90,7 @@ export default function AuthPage() {
       console.error('Authentication error:', error);
       return;
     }
-    openUrl(data.url);
-
-    // FIXME: For Android we need a better way to trigger the deeplink redirect
-    if (isTauriAppPlatform() && osPlatform === 'android') {
-      tauriHandleOnWindowFocus(async () => {
-        const urls = await getCurrent();
-        if (urls && urls.length > 0) {
-          urls.forEach((url) => {
-            handleOAuthUrl(url);
-          });
-        }
-      });
-      setTimeout(() => {
-        router.back();
-      }, 5000);
-    }
+    await openUrl(data.url);
   };
 
   const handleOAuthUrl = async (url: string) => {