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

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/commands.rs

@@ -7,11 +7,19 @@ use crate::Result;
 #[command]
 pub(crate) async fn auth_with_safari<R: Runtime>(
     app: AppHandle<R>,
-    payload: SafariAuthRequest,
-) -> Result<SafariAuthResponse> {
+    payload: AuthRequest,
+) -> Result<AuthResponse> {
     app.native_bridge().auth_with_safari(payload)
 }
 
+#[command]
+pub(crate) async fn auth_with_custom_tab<R: Runtime>(
+    app: AppHandle<R>,
+    payload: AuthRequest,
+) -> Result<AuthResponse> {
+    app.native_bridge().auth_with_custom_tab(payload)
+}
+
 #[command]
 pub(crate) async fn copy_uri_to_path<R: Runtime>(
     app: AppHandle<R>,

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/desktop.rs

@@ -14,10 +14,11 @@ pub fn init<R: Runtime, C: DeserializeOwned>(
 pub struct NativeBridge<R: Runtime>(AppHandle<R>);
 
 impl<R: Runtime> NativeBridge<R> {
-    pub fn auth_with_safari(
-        &self,
-        _payload: SafariAuthRequest,
-    ) -> crate::Result<SafariAuthResponse> {
+    pub fn auth_with_safari(&self, _payload: AuthRequest) -> crate::Result<AuthResponse> {
+        Err(crate::Error::UnsupportedPlatformError)
+    }
+
+    pub fn auth_with_custom_tab(&self, _payload: AuthRequest) -> crate::Result<AuthResponse> {
         Err(crate::Error::UnsupportedPlatformError)
     }
 

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/lib.rs

@@ -38,6 +38,7 @@ pub fn init<R: Runtime>() -> TauriPlugin<R> {
     Builder::new("native-bridge")
         .invoke_handler(tauri::generate_handler![
             commands::auth_with_safari,
+            commands::auth_with_custom_tab,
             commands::copy_uri_to_path,
         ])
         .setup(|app, api| {

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/mobile.rs

@@ -25,16 +25,21 @@ pub fn init<R: Runtime, C: DeserializeOwned>(
 pub struct NativeBridge<R: Runtime>(PluginHandle<R>);
 
 impl<R: Runtime> NativeBridge<R> {
-    pub fn auth_with_safari(
-        &self,
-        payload: SafariAuthRequest,
-    ) -> crate::Result<SafariAuthResponse> {
+    pub fn auth_with_safari(&self, payload: AuthRequest) -> crate::Result<AuthResponse> {
         self.0
             .run_mobile_plugin("auth_with_safari", payload)
             .map_err(Into::into)
     }
 }
 
+impl<R: Runtime> NativeBridge<R> {
+    pub fn auth_with_custom_tab(&self, payload: AuthRequest) -> crate::Result<AuthResponse> {
+        self.0
+            .run_mobile_plugin("auth_with_custom_tab", payload)
+            .map_err(Into::into)
+    }
+}
+
 impl<R: Runtime> NativeBridge<R> {
     pub fn copy_uri_to_path(&self, payload: CopyURIRequest) -> crate::Result<CopyURIResponse> {
         self.0

apps/readest-app/src-tauri/plugins/tauri-plugin-native-bridge/src/models.rs

@@ -2,13 +2,13 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SafariAuthRequest {
+pub struct AuthRequest {
     pub auth_url: String,
 }
 
 #[derive(Debug, Clone, Default, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
-pub struct SafariAuthResponse {
+pub struct AuthResponse {
     pub redirect_url: String,
 }