feat: return google URL instead of nonce

Author: billyjacoby

packages/wallets/wallet-base/src/types/strategy.ts

@@ -85,6 +85,8 @@ export interface TurnkeyMetadata {
   otpInitPath?: string
   otpVerifyPath?: string
   oauthLoginPath?: string
+  googleClientId?: string
+  googleRedirectUri?: string
 }
 
 export interface WalletMetadata {

packages/wallets/wallet-turnkey/src/strategy/strategy/base.ts

@@ -33,8 +33,7 @@ import { TurnkeyOauthWallet } from '../turnkey/oauth.js'
 import { SessionType } from '@turnkey/sdk-browser'
 import { TurnkeyIframeClient } from '@turnkey/sdk-browser'
 import { getAddress } from 'viem'
-
-const DEFAULT_TURNKEY_API_ENDPOINT = 'https://api.ui.injective.network/api/v1'
+import { generateGoogleUrl } from '../../utils.js'
 
 export class BaseTurnkeyWalletStrategy
   extends BaseConcreteStrategy
@@ -55,9 +54,15 @@ export class BaseTurnkeyWalletStrategy
     super(args)
 
     this.turnkeyProvider = args.provider
-    this.client = new HttpRestClient(
-      args.apiServerEndpoint || DEFAULT_TURNKEY_API_ENDPOINT,
-    )
+
+    const endpoint =
+      args.apiServerEndpoint || this.metadata?.turnkey?.apiServerEndpoint
+
+    if (!endpoint) {
+      throw new WalletException(new Error('apiServerEndpoint is required'))
+    }
+
+    this.client = new HttpRestClient(endpoint)
   }
 
   async getWalletDeviceType(): Promise<WalletDeviceType> {
@@ -253,7 +258,26 @@ export class BaseTurnkeyWalletStrategy
 
         throw new WalletException(new Error('Oauth result not found'))
       } else {
-        return await TurnkeyOauthWallet.generateOAuthNonce(iframeClient)
+        const nonce = await TurnkeyOauthWallet.generateOAuthNonce(iframeClient)
+
+        if (
+          !metadata?.turnkey?.googleClientId ||
+          !metadata?.turnkey?.googleRedirectUri
+        ) {
+          throw new WalletException(
+            new Error('googleClientId and googleRedirectUri are required'),
+          )
+        }
+
+        if (turnkeyProvider === TurnkeyProvider.Google) {
+          return generateGoogleUrl({
+            nonce,
+            clientId: metadata.turnkey.googleClientId,
+            redirectUri: metadata.turnkey.googleRedirectUri,
+          })
+        }
+        //? When we add Apple support, we might also want to return the URL as well
+        return nonce
       }
     }
 

packages/wallets/wallet-turnkey/src/utils.ts

@@ -0,0 +1,21 @@
+export function generateGoogleUrl({
+  nonce,
+  clientId,
+  redirectUri,
+  scope = 'openid profile email',
+  prompt = 'consent',
+}: {
+  nonce: string
+  clientId: string
+  redirectUri: string
+  scope?: string
+  prompt?: string
+}) {
+  if (!clientId) {
+    throw new Error('Google client ID not found')
+  }
+
+  const responseType = 'id_token'
+
+  return `https://accounts.google.com/o/oauth2/v2/auth?prompt=${prompt}&client_id=${clientId}&redirect_uri=${redirectUri}&response_type=${responseType}&scope=${scope}&nonce=${nonce}`
+}