Merge pull request #10317 from hicommonwealth/release/v1.7.6-x

v1.7.6-3: Fixed sso login for custom domains
hicommonwealth · Dec 16, 2024 · a0f3399 · a0f3399
2 parents 8b5cc89 + 974ae19
commit a0f3399
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/commonwealth/client/scripts/controllers/app/login.ts b/packages/commonwealth/client/scripts/controllers/app/login.ts
@@ -437,10 +437,12 @@ export async function handleSocialLoginCallback({
   bearer,
   chain,
   walletSsoSource,
+  isCustomDomain,
 }: {
   bearer?: string | null;
   chain?: string;
   walletSsoSource?: string;
+  isCustomDomain?: boolean;
 }): Promise<{ address: string }> {
   // desiredChain may be empty if social login was initialized from
   // a page without a chain, in which case we default to an eth login
@@ -476,7 +478,9 @@ export async function handleSocialLoginCallback({
       magicAddress = utils.getAddress(metadata.publicAddress);
     }
   } else {
-    const result = await magic.oauth2.getRedirectResult();
+    const result = isCustomDomain
+      ? await magic.oauth.getRedirectResult()
+      : await magic.oauth2.getRedirectResult();
 
     if (!bearer) {
       console.log('No bearer token found in magic redirect result');

diff --git a/packages/commonwealth/client/scripts/views/pages/finish_social_login.tsx b/packages/commonwealth/client/scripts/views/pages/finish_social_login.tsx
@@ -42,6 +42,7 @@ const validate = async (
       // @ts-expect-error <StrictNullChecks/>
       walletSsoSource,
       isLoggedIn,
+      isCustomDomain,
     });
 
     if (isMagicV1) {