fix: initiate OAuth using Custom Tabs on Android, closes #361 (#788)

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

@@ -23,7 +23,7 @@ import { start, cancel, onUrl, onInvalidUrl } from '@fabianlars/tauri-plugin-oau
 import { openUrl } from '@tauri-apps/plugin-opener';
 import { handleAuthCallback } from '@/helpers/auth';
 import { getAppleIdAuth, Scope } from './utils/appleIdAuth';
-import { authWithSafari } from './utils/safariAuth';
+import { authWithCustomTab, authWithSafari } from './utils/nativeAuth';
 import { READEST_WEB_BASE_URL } from '@/services/constants';
 import WindowButtons from '@/components/WindowButtons';
 
@@ -42,7 +42,7 @@ interface ProviderLoginProp {
 }
 
 const WEB_AUTH_CALLBACK = `${READEST_WEB_BASE_URL}/auth/callback`;
-const DEEPLINK_CALLBACK = 'readest://auth/callback';
+const DEEPLINK_CALLBACK = 'readest://auth-callback';
 
 const ProviderLogin: React.FC<ProviderLoginProp> = ({ provider, handleSignIn, Icon, label }) => {
   return (
@@ -75,10 +75,8 @@ export default function AuthPage() {
 
   const getTauriRedirectTo = (isOAuth: boolean) => {
     if (process.env.NODE_ENV === 'production' || appService?.isMobile) {
-      if (appService?.isIOSApp) {
+      if (appService?.isMobile) {
         return isOAuth ? DEEPLINK_CALLBACK : WEB_AUTH_CALLBACK;
-      } else if (appService?.isAndroidApp) {
-        return WEB_AUTH_CALLBACK;
       }
       return DEEPLINK_CALLBACK;
     }
@@ -135,6 +133,11 @@ export default function AuthPage() {
       if (res) {
         handleOAuthUrl(res.redirectUrl);
       }
+    } else if (appService?.isAndroidApp) {
+      const res = await authWithCustomTab({ authUrl: data.url });
+      if (res) {
+        handleOAuthUrl(res.redirectUrl);
+      }
     } else {
       await openUrl(data.url);
     }

apps/readest-app/src/app/auth/utils/nativeAuth.ts

@@ -0,0 +1,25 @@
+import { invoke } from '@tauri-apps/api/core';
+
+export interface AuthRequest {
+  authUrl: string;
+}
+
+export interface AuthResponse {
+  redirectUrl: string;
+}
+
+export async function authWithSafari(request: AuthRequest): Promise<AuthResponse> {
+  const result = await invoke<AuthResponse>('plugin:native-bridge|auth_with_safari', {
+    payload: request,
+  });
+
+  return result;
+}
+
+export async function authWithCustomTab(request: AuthRequest): Promise<AuthResponse> {
+  const result = await invoke<AuthResponse>('plugin:native-bridge|auth_with_custom_tab', {
+    payload: request,
+  });
+
+  return result;
+}

apps/readest-app/src/app/auth/utils/safariAuth.ts

@@ -1,17 +0,0 @@
-import { invoke } from '@tauri-apps/api/core';
-
-export interface SafariAuthRequest {
-  authUrl: string;
-}
-
-export interface SafariAuthResponse {
-  redirectUrl: string;
-}
-
-export async function authWithSafari(request: SafariAuthRequest): Promise<SafariAuthResponse> {
-  const result = await invoke<SafariAuthResponse>('plugin:native-bridge|auth_with_safari', {
-    payload: request,
-  });
-
-  return result;
-}