diff --git a/android/src/main/java/AuthPlugin.kt b/android/src/main/java/AuthPlugin.kt index c7a0b8f..8477563 100644 --- a/android/src/main/java/AuthPlugin.kt +++ b/android/src/main/java/AuthPlugin.kt @@ -28,7 +28,7 @@ import java.security.SecureRandom @InvokeArg class KirimArgs { - var idKlien: String? = null + var id: String? = null } @TauriPlugin @@ -39,15 +39,15 @@ class AuthPlugin(private val activity: Activity) : Plugin(activity) { @Command fun masuk(invoke: Invoke) { val args = invoke.parseArgs(KirimArgs::class.java) - val idKlien = args.idKlien - if (idKlien.isNullOrEmpty()) { + val id = args.id + if (id.isNullOrEmpty()) { invoke.reject("ID Klien belum disediakan") return } val googleIdOption: GetGoogleIdOption = GetGoogleIdOption.Builder() .setFilterByAuthorizedAccounts(true) - .setServerClientId(idKlien) + .setServerClientId(id) .setNonce(generateSecureRandomNonce()) .build() @@ -63,7 +63,7 @@ class AuthPlugin(private val activity: Activity) : Plugin(activity) { ) handleSignInResult(result, invoke) } catch (e: NoCredentialException) { - signInWithAllAccounts(idKlien, invoke) + signInWithAllAccounts(id, invoke) } catch (e: GetCredentialException) { invoke.reject("Gagal masuk: ${e.message}") } diff --git a/guest-js/index.ts b/guest-js/index.ts index 4cbf4d0..fa8ac87 100644 --- a/guest-js/index.ts +++ b/guest-js/index.ts @@ -5,7 +5,7 @@ export type SAuthMuatanMasuk = { }; export async function masuk(muatan: SAuthMuatanMasuk): Promise { - return await invoke("plugin:auth|masuk", { payload: muatan }); + return await invoke("plugin:auth|masuk", { muatan: muatan }); } export async function keluar(): Promise { diff --git a/src/commands.rs b/src/commands.rs index 2143653..b1ac9ad 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -5,8 +5,8 @@ use crate::Result; use crate::models::SAuthMuatanMasuk; #[command] -pub(crate) async fn masuk(app: AppHandle, payload: SAuthMuatanMasuk) -> Result<()> { - return app.auth().masuk(payload); +pub(crate) async fn masuk(app: AppHandle, muatan: SAuthMuatanMasuk) -> Result<()> { + return app.auth().masuk(muatan); } #[command] diff --git a/src/mobile.rs b/src/mobile.rs index 1a5265d..47a0856 100644 --- a/src/mobile.rs +++ b/src/mobile.rs @@ -25,10 +25,10 @@ pub fn init( pub struct Auth(PluginHandle); impl Auth { - pub fn masuk(&self, payload: SAuthMuatanMasuk) -> crate::Result<()> { + pub fn masuk(&self, muatan: SAuthMuatanMasuk) -> crate::Result<()> { return self .0 - .run_mobile_plugin("masuk", payload) + .run_mobile_plugin("masuk", muatan) .map_err(Into::into); } diff --git a/src/models.rs b/src/models.rs index bf5e83d..ea97e22 100644 --- a/src/models.rs +++ b/src/models.rs @@ -3,5 +3,5 @@ use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub struct SAuthMuatanMasuk { - pub id_klien: String, + pub id: String, }