From d9992d16449eccba9e5230ee51924eefd5ffcec0 Mon Sep 17 00:00:00 2001 From: imspace Date: Mon, 6 Mar 2023 03:50:29 +0800 Subject: [PATCH] fix: sessionToken not get --- gui/src-tauri/src/main.rs | 2 +- gui/src/pages/Home.tsx | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/gui/src-tauri/src/main.rs b/gui/src-tauri/src/main.rs index 765721f..0376617 100644 --- a/gui/src-tauri/src/main.rs +++ b/gui/src-tauri/src/main.rs @@ -21,7 +21,7 @@ function onSelectUserClick(e) { "callback":0, "error":0, "__tauriModule":"Event", - "message":{"cmd":"emit","event":"login","payload":element.href} + "message":{"cmd":"emit","event":"login","payload":{"url":element.href}} })) } function detectAndInject() { diff --git a/gui/src/pages/Home.tsx b/gui/src/pages/Home.tsx index 17cf708..8b575f6 100644 --- a/gui/src/pages/Home.tsx +++ b/gui/src/pages/Home.tsx @@ -17,10 +17,22 @@ export const Home: React.FC = ({ }) => { throw new Error(result.error.message); } - const sessionToken = await invoke('open_login_window', { + const login: string | null = await invoke('open_login_window', { url: result.result.url }) - console.log(sessionToken) + if (login === null || login === '') { + console.log('user cancel login'); + return; + } + const loginResult: { url: string } = JSON.parse(login); + const sessionToken = await client.loginSteps({ + authCodeVerifier: result.result.authCodeVerifier, + login: loginResult.url, + }) + if (sessionToken.error) { + throw new Error(sessionToken.error.message); + } + console.log('sessionToken', sessionToken.result); } return <> Hello world!