fix: web client login

toeverything · Nov 28, 2024 · 91040f2 · 91040f2
1 parent dc30e08
commit 91040f2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/packages/backend/server/src/plugins/oauth/controller.ts b/packages/backend/server/src/plugins/oauth/controller.ts
@@ -220,7 +220,6 @@ export class OAuthController {
       // we only cache the code and access token in server side
       const authState = await this.oauth.getOAuthState(oAuthToken);
       if (!authState || authState.state !== inAppState || !authState.code) {
-        console.log('authState', authState, 'inAppState', inAppState);
         throw new OauthStateExpired();
       }
 
@@ -238,7 +237,7 @@ export class OAuthController {
 
       // NOTE: in web client, we don't need to exchange token
       // and provide the auth code directly
-      const tokens = await provider.getToken(code || authState.code);
+      const tokens = await provider.getToken(authState.code);
       const externAccount = await provider.getUser(tokens.accessToken);
       const user = await this.loginFromOauth(
         authState.provider,

diff --git a/packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsx b/packages/frontend/core/src/desktop/pages/auth/oauth-callback.tsx
@@ -21,7 +21,7 @@ const LoaderData = z.object({
 
 const ParsedState = z.object({
   payload: LoaderData,
-  client: supportedClient,
+  client: supportedClient.optional(),
 });
 
 type LoaderData = z.infer<typeof LoaderData>;
@@ -38,16 +38,13 @@ async function parseState(url: string): Promise<ParsedState> {
     return ParsedState.parse({ payload: { state, code, provider }, client });
   } catch {}
   // new client behavior
-  const {
-    token: state,
-    provider,
-    client,
-  } = await fetch('/api/oauth/exchangeToken', {
+  const { token, provider, client } = await fetch('/api/oauth/exchangeToken', {
     method: 'POST',
     body: JSON.stringify({ code, state: stateStr }),
     headers: { 'content-type': 'application/json' },
   }).then(r => r.json());
-  return ParsedState.parse({ payload: { state, provider }, client });
+  const payload = client ? { token } : { code, state: stateStr };
+  return ParsedState.parse({ payload: { ...payload, provider }, client });
 }
 
 export const loader: LoaderFunction = async args => {

diff --git a/packages/frontend/core/src/modules/cloud/services/auth.ts b/packages/frontend/core/src/modules/cloud/services/auth.ts
@@ -221,7 +221,7 @@ export class AuthService extends Service {
     try {
       const res = await this.fetchService.fetch('/api/oauth/callback', {
         method: 'POST',
-        body: JSON.stringify({ code, state, secret: this.state }),
+        body: JSON.stringify({ code, state }),
         headers: {
           'content-type': 'application/json',
         },