@injectivelabs/wallet-turnkey 1.15.17 → 1.15.19

package/dist/cjs/index.d.ts

@@ -1,4 +1,3 @@
-export { TurnkeyOtpWalletStrategy } from './strategy/strategy/otp.js';
-export { TurnkeyOauthWalletStrategy } from './strategy/strategy/oauth.js';
-export * from './strategy/strategy/base.js';
+export { TurnkeyWalletStrategy } from './strategy/strategy.js';
+export * from './strategy/strategy.js';
 export * from './strategy/turnkey/turnkey.js';

package/dist/cjs/index.js

@@ -14,10 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TurnkeyOauthWalletStrategy = exports.TurnkeyOtpWalletStrategy = void 0;
-var otp_js_1 = require("./strategy/strategy/otp.js");
-Object.defineProperty(exports, "TurnkeyOtpWalletStrategy", { enumerable: true, get: function () { return otp_js_1.TurnkeyOtpWalletStrategy; } });
-var oauth_js_1 = require("./strategy/strategy/oauth.js");
-Object.defineProperty(exports, "TurnkeyOauthWalletStrategy", { enumerable: true, get: function () { return oauth_js_1.TurnkeyOauthWalletStrategy; } });
-__exportStar(require("./strategy/strategy/base.js"), exports);
+exports.TurnkeyWalletStrategy = void 0;
+var strategy_js_1 = require("./strategy/strategy.js");
+Object.defineProperty(exports, "TurnkeyWalletStrategy", { enumerable: true, get: function () { return strategy_js_1.TurnkeyWalletStrategy; } });
+__exportStar(require("./strategy/strategy.js"), exports);
 __exportStar(require("./strategy/turnkey/turnkey.js"), exports);

package/dist/cjs/strategy/consts.d.ts

@@ -2,3 +2,4 @@ export declare const TURNKEY_OAUTH_PATH = "turnkey/oauth";
 export declare const TURNKEY_OTP_PATH = "turnkey/otp";
 export declare const TURNKEY_OTP_INIT_PATH = "turnkey/otp/init";
 export declare const TURNKEY_OTP_VERIFY_PATH = "turnkey/otp/verify";
+export declare const DEFAULT_TURNKEY_REFRESH_SECONDS = "86400";

package/dist/cjs/strategy/consts.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TURNKEY_OTP_VERIFY_PATH = exports.TURNKEY_OTP_INIT_PATH = exports.TURNKEY_OTP_PATH = exports.TURNKEY_OAUTH_PATH = void 0;
+exports.DEFAULT_TURNKEY_REFRESH_SECONDS = exports.TURNKEY_OTP_VERIFY_PATH = exports.TURNKEY_OTP_INIT_PATH = exports.TURNKEY_OTP_PATH = exports.TURNKEY_OAUTH_PATH = void 0;
 exports.TURNKEY_OAUTH_PATH = 'turnkey/oauth';
 exports.TURNKEY_OTP_PATH = 'turnkey/otp';
 exports.TURNKEY_OTP_INIT_PATH = `${exports.TURNKEY_OTP_PATH}/init`;
 exports.TURNKEY_OTP_VERIFY_PATH = `${exports.TURNKEY_OTP_PATH}/verify`;
+exports.DEFAULT_TURNKEY_REFRESH_SECONDS = '86400';

package/dist/cjs/strategy/{strategy/base.d.ts → strategy.d.ts}

@@ -1,26 +1,24 @@
 import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
-import { StdSignDoc, TurnkeyProvider, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-import { TurnkeyWallet } from '../turnkey/turnkey.js';
 import { TurnkeyIframeClient } from '@turnkey/sdk-browser';
-export declare class BaseTurnkeyWalletStrategy extends BaseConcreteStrategy implements ConcreteWalletStrategy {
+import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { TurnkeyWallet } from './turnkey/turnkey.js';
+export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     turnkeyWallet: TurnkeyWallet | undefined;
-    turnkeyProvider: TurnkeyProvider;
     client: HttpRestClient;
     constructor(args: ConcreteEthereumWalletStrategyArgs & {
-        provider: TurnkeyProvider;
         apiServerEndpoint?: string;
     });
     getWalletDeviceType(): Promise<WalletDeviceType>;
     setMetadata(metadata?: {
         turnkey?: Partial<WalletMetadata['turnkey']>;
     }): void;
-    private setOrganizationId;
     enable(): Promise<boolean>;
     disconnect(): Promise<void>;
     getAddresses(): Promise<string[]>;
-    getSessionOrConfirm(): Promise<string>;
+    getSessionOrConfirm(_address?: string): Promise<string>;
+    getWalletClient<TurnkeyWallet>(): Promise<TurnkeyWallet>;
     sendEthereumTransaction(_transaction: unknown, _options: {
         address: AccountAddress;
         ethereumChainId: EthereumChainId;

package/dist/cjs/strategy/{strategy/base.js → strategy.js}

@@ -1,25 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseTurnkeyWalletStrategy = void 0;
+exports.TurnkeyWalletStrategy = void 0;
 /* eslint-disable class-methods-use-this */
-const exceptions_1 = require("@injectivelabs/exceptions");
 const sdk_ts_1 = require("@injectivelabs/sdk-ts");
+const exceptions_1 = require("@injectivelabs/exceptions");
+const viem_1 = require("viem");
 const utils_1 = require("@injectivelabs/utils");
 const wallet_base_1 = require("@injectivelabs/wallet-base");
-const turnkey_js_1 = require("../turnkey/turnkey.js");
-const types_js_1 = require("../types.js");
-const otp_js_1 = require("../turnkey/otp.js");
-const oauth_js_1 = require("../turnkey/oauth.js");
-const sdk_browser_1 = require("@turnkey/sdk-browser");
-const viem_1 = require("viem");
-const utils_js_1 = require("../../utils.js");
-class BaseTurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
+const types_js_1 = require("./types.js");
+const turnkey_js_1 = require("./turnkey/turnkey.js");
+class TurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     turnkeyWallet;
-    turnkeyProvider;
     client;
     constructor(args) {
         super(args);
-        this.turnkeyProvider = args.provider;
         const endpoint = args.apiServerEndpoint || this.metadata?.turnkey?.apiServerEndpoint;
         if (!endpoint) {
             throw new exceptions_1.WalletException(new Error('apiServerEndpoint is required'));
@@ -38,13 +32,9 @@ class BaseTurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
                     ...metadata.turnkey,
                 },
             };
+            this.turnkeyWallet?.setMetadata(this.metadata?.turnkey);
         }
     }
-    //? This is here specifically because we have to ensure we set the organizationId on TurnkeyWallet as well
-    setOrganizationId(organizationId) {
-        this.setMetadata({ turnkey: { organizationId } });
-        this.turnkeyWallet?.setMetadata({ organizationId });
-    }
     async enable() {
         const turnkeyWallet = await this.getTurnkeyWallet();
         try {
@@ -73,48 +63,7 @@ class BaseTurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
     }
     async getAddresses() {
         const turnkeyWallet = await this.getTurnkeyWallet();
-        const organizationId = await this.getOrganizationId();
-        // CHeck if the user is already connected
-        const session = await turnkeyWallet.getSession();
-        if (!session.session) {
-            const iframeClient = await turnkeyWallet.getIframeClient();
-            // Check the provider type and perform auth step accordingly
-            if (this.turnkeyProvider === wallet_base_1.TurnkeyProvider.Email) {
-                if (!this.metadata?.turnkey?.otpId) {
-                    throw new exceptions_1.WalletException(new Error('OTP ID is required'));
-                }
-                if (!this.metadata?.turnkey?.otpCode) {
-                    throw new exceptions_1.WalletException(new Error('OTP code is required'));
-                }
-                const result = await otp_js_1.TurnkeyOtpWallet.confirmEmailOTP({
-                    iframeClient,
-                    organizationId,
-                    client: this.client,
-                    otpCode: this.metadata?.turnkey?.otpCode,
-                    emailOTPId: this.metadata?.turnkey?.otpId,
-                });
-                if (result?.credentialBundle) {
-                    this.metadata.turnkey.credentialBundle = result.credentialBundle;
-                    await turnkeyWallet.injectAndRefresh(result.credentialBundle);
-                }
-            }
-            else {
-                if (!this.metadata?.turnkey?.oidcToken) {
-                    throw new exceptions_1.WalletException(new Error('Oidc token is required'));
-                }
-                const result = await oauth_js_1.TurnkeyOauthWallet.oauthLogin({
-                    client: this.client,
-                    iframeClient,
-                    oidcToken: this.metadata?.turnkey?.oidcToken,
-                    providerName: this.turnkeyProvider.toString(),
-                });
-                if (result?.credentialBundle) {
-                    this.metadata.turnkey.organizationId = result.organizationId;
-                    this.metadata.turnkey.credentialBundle = result.credentialBundle;
-                    await turnkeyWallet.injectAndRefresh(result.credentialBundle);
-                }
-            }
-        }
+        await turnkeyWallet.getSession();
         try {
             return await turnkeyWallet.getAccounts();
         }
@@ -130,82 +79,12 @@ class BaseTurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
             });
         }
     }
-    async getSessionOrConfirm() {
-        const { turnkeyProvider, metadata, client } = this;
+    async getSessionOrConfirm(_address) {
         const turnkeyWallet = await this.getTurnkeyWallet();
-        const iframeClient = await turnkeyWallet.getIframeClient();
-        const session = await turnkeyWallet.getSession();
-        if (
-        // If either of these values exist on the metadata, then we want to proceed with the login flow
-        !this.metadata?.turnkey?.email &&
-            !this.metadata?.turnkey?.oidcToken &&
-            session.session?.token) {
-            await iframeClient.injectCredentialBundle(session.session?.token);
-            this.setOrganizationId(session.organizationId);
-            await iframeClient.refreshSession({
-                sessionType: sdk_browser_1.SessionType.READ_WRITE,
-                targetPublicKey: iframeClient.iframePublicKey,
-                expirationSeconds: '900',
-            });
-            return session.session.token;
-        }
-        if (turnkeyProvider === wallet_base_1.TurnkeyProvider.Email) {
-            if (!metadata?.turnkey?.email) {
-                throw new exceptions_1.WalletException(new Error('Email is required'));
-            }
-            const result = await otp_js_1.TurnkeyOtpWallet.initEmailOTP({
-                client,
-                iframeClient,
-                email: metadata.turnkey.email,
-                otpInitPath: metadata.turnkey.otpInitPath,
-            });
-            if (result?.organizationId && this.metadata?.turnkey) {
-                this.metadata.turnkey.organizationId = result.organizationId;
-            }
-            if (result?.otpId && this.metadata?.turnkey) {
-                this.metadata.turnkey.otpId = result.otpId;
-            }
-            return result?.otpId || '';
-        }
-        if ([wallet_base_1.TurnkeyProvider.Google, wallet_base_1.TurnkeyProvider.Apple].includes(turnkeyProvider)) {
-            if (metadata?.turnkey?.oidcToken) {
-                const oauthResult = await oauth_js_1.TurnkeyOauthWallet.oauthLogin({
-                    client,
-                    iframeClient,
-                    oidcToken: metadata.turnkey.oidcToken,
-                    providerName: turnkeyProvider.toString(),
-                    oauthLoginPath: metadata.turnkey.oauthLoginPath,
-                });
-                if (oauthResult?.credentialBundle) {
-                    await turnkeyWallet.injectAndRefresh(oauthResult.credentialBundle);
-                }
-                if (oauthResult?.credentialBundle) {
-                    const session = await turnkeyWallet.getSession();
-                    if (this.metadata?.turnkey && session.organizationId) {
-                        this.metadata.turnkey.organizationId = session.organizationId;
-                    }
-                    return oauthResult.credentialBundle;
-                }
-                throw new exceptions_1.WalletException(new Error('Oauth result not found'));
-            }
-            else {
-                const nonce = await oauth_js_1.TurnkeyOauthWallet.generateOAuthNonce(iframeClient);
-                if (!metadata?.turnkey?.googleClientId ||
-                    !metadata?.turnkey?.googleRedirectUri) {
-                    throw new exceptions_1.WalletException(new Error('googleClientId and googleRedirectUri are required'));
-                }
-                if (turnkeyProvider === wallet_base_1.TurnkeyProvider.Google) {
-                    return (0, utils_js_1.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;
-            }
-        }
-        return '';
+        return await turnkeyWallet.refreshSession();
+    }
+    async getWalletClient() {
+        return (await this.getTurnkeyWallet());
     }
     async sendEthereumTransaction(_transaction, _options) {
         throw new exceptions_1.WalletException(new Error('sendEthereumTransaction is not supported. Turnkey only supports sending cosmos transactions'), {
@@ -324,4 +203,4 @@ class BaseTurnkeyWalletStrategy extends wallet_base_1.BaseConcreteStrategy {
         return organizationId;
     }
 }
-exports.BaseTurnkeyWalletStrategy = BaseTurnkeyWalletStrategy;
+exports.TurnkeyWalletStrategy = TurnkeyWalletStrategy;

package/dist/cjs/strategy/turnkey/oauth.d.ts

@@ -6,9 +6,9 @@ export declare class TurnkeyOauthWallet {
         oidcToken: string;
         client: HttpRestClient;
         oauthLoginPath?: string;
-        expirationSeconds?: number;
         providerName: 'google' | 'apple';
         iframeClient: TurnkeyIframeClient;
+        expirationSeconds?: number;
     }): Promise<{
         organizationId: string;
         credentialBundle: string;

package/dist/cjs/strategy/turnkey/oauth.js

@@ -24,7 +24,7 @@ class TurnkeyOauthWallet {
         }
     }
     static async oauthLogin(args) {
-        const { client, iframeClient } = args;
+        const { client, iframeClient, expirationSeconds } = args;
         const path = args.oauthLoginPath || consts_js_1.TURNKEY_OAUTH_PATH;
         try {
             const targetPublicKey = iframeClient.iframePublicKey;
@@ -36,6 +36,7 @@ class TurnkeyOauthWallet {
                 targetPublicKey,
                 oidcToken: args.oidcToken,
                 providerName: args.providerName,
+                expirationSeconds: (expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS)?.toString(),
             });
             return response.data;
         }

package/dist/cjs/strategy/turnkey/otp.d.ts

@@ -12,10 +12,11 @@ export declare class TurnkeyOtpWallet {
     }): Promise<TurnkeyOTPCredentialsResponse | undefined>;
     static confirmEmailOTP(args: {
         otpCode: string;
-        emailOTPId?: string;
+        emailOTPId: string;
         client: HttpRestClient;
-        organizationId?: string;
+        organizationId: string;
         iframeClient: TurnkeyIframeClient;
         otpVerifyPath?: string;
+        expirationSeconds?: number;
     }): Promise<TurnkeyConfirmEmailOTPResponse | undefined>;
 }

package/dist/cjs/strategy/turnkey/otp.js

@@ -29,7 +29,7 @@ class TurnkeyOtpWallet {
         }
     }
     static async confirmEmailOTP(args) {
-        const { client, iframeClient } = args;
+        const { client, iframeClient, expirationSeconds } = args;
         try {
             const organizationId = args.organizationId;
             const emailOTPId = args.emailOTPId;
@@ -49,6 +49,7 @@ class TurnkeyOtpWallet {
                 otpId: emailOTPId,
                 otpCode: args.otpCode,
                 suborgID: organizationId,
+                expirationSeconds: (expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS)?.toString(),
             });
             return response?.data;
         }

package/dist/cjs/strategy/turnkey/turnkey.d.ts

@@ -1,11 +1,13 @@
-import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
-import { TurnkeyMetadata } from '@injectivelabs/wallet-base';
+import { TurnkeyMetadata, TurnkeyProvider } from '@injectivelabs/wallet-base';
 import { HttpRestClient } from '@injectivelabs/utils';
+import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
 export declare class TurnkeyWallet {
-    protected iframeClient: TurnkeyIframeClient | undefined;
-    protected turnkey: Turnkey | undefined;
     protected client: HttpRestClient;
     private metadata;
+    protected turnkey: Turnkey | undefined;
+    protected iframeClient: TurnkeyIframeClient | undefined;
+    organizationId: string;
+    private otpId;
     private accountMap;
     setMetadata(metadata: Partial<TurnkeyMetadata>): void;
     constructor(metadata: TurnkeyMetadata);
@@ -20,7 +22,7 @@ export declare class TurnkeyWallet {
         organizationId: string;
     }>;
     getAccounts(): Promise<string[]>;
-    getOrCreateAndGetAccount(address: string, organizationId?: string): Promise<{
+    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<{
         address: import("abitype").Address;
         nonceManager?: import("viem").NonceManager | undefined;
         sign?: ((parameters: {
@@ -38,6 +40,14 @@ export declare class TurnkeyWallet {
         source: string;
         type: "local";
     }>;
-    injectAndRefresh(credentialBundle: string): Promise<void>;
+    injectAndRefresh(credentialBundle: string, options: {
+        expirationSeconds?: string;
+        organizationId?: string;
+    }): Promise<void>;
+    initOTP(email: string): Promise<import("../types.js").TurnkeyOTPCredentialsResponse>;
+    confirmOTP(otpCode: string): Promise<import("../types.js").TurnkeyConfirmEmailOTPResponse>;
+    initOAuth(provider: TurnkeyProvider.Google | TurnkeyProvider.Apple): Promise<string>;
+    confirmOAuth(provider: TurnkeyProvider.Google | TurnkeyProvider.Apple, oidcToken: string): Promise<string>;
+    refreshSession(): Promise<string>;
     private initFrame;
 }

package/dist/cjs/strategy/turnkey/turnkey.js

@@ -1,24 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TurnkeyWallet = void 0;
-const sdk_browser_1 = require("@turnkey/sdk-browser");
 const exceptions_1 = require("@injectivelabs/exceptions");
 const wallet_base_1 = require("@injectivelabs/wallet-base");
-const sdk_ts_1 = require("@injectivelabs/sdk-ts");
-const utils_1 = require("@injectivelabs/utils");
 const viem_1 = require("@turnkey/viem");
+const utils_1 = require("@injectivelabs/utils");
+const sdk_ts_1 = require("@injectivelabs/sdk-ts");
+const sdk_browser_1 = require("@turnkey/sdk-browser");
+const consts_js_1 = require("../consts.js");
+const otp_js_1 = require("./otp.js");
 const types_js_1 = require("../types.js");
+const oauth_js_1 = require("./oauth.js");
+const utils_js_1 = require("../../utils.js");
 class TurnkeyWallet {
-    iframeClient;
-    turnkey;
     client;
     metadata;
+    turnkey;
+    iframeClient;
+    organizationId;
+    otpId;
     accountMap = {};
     setMetadata(metadata) {
         this.metadata = { ...this.metadata, ...metadata };
     }
     constructor(metadata) {
         this.metadata = metadata;
+        this.organizationId = metadata.organizationId;
         this.client = new utils_1.HttpRestClient(metadata.apiServerEndpoint);
     }
     static async getTurnkeyInstance(metadata) {
@@ -93,16 +100,16 @@ class TurnkeyWallet {
     }
     async getAccounts() {
         const iframeClient = await this.getIframeClient();
-        if (!this.metadata.organizationId) {
+        if (!this.organizationId) {
             return [];
         }
         try {
             const response = await iframeClient.getWallets({
-                organizationId: this.metadata.organizationId,
+                organizationId: this.organizationId,
             });
             const accounts = await Promise.allSettled(response.wallets.map((wallet) => iframeClient.getWalletAccounts({
                 walletId: wallet.walletId,
-                organizationId: this.metadata.organizationId,
+                organizationId: this.organizationId,
             })));
             const filteredAccounts = accounts
                 .filter((account) => account.status === 'fulfilled')
@@ -149,16 +156,116 @@ class TurnkeyWallet {
         this.accountMap[address] = turnkeyAccount;
         return turnkeyAccount;
     }
-    async injectAndRefresh(credentialBundle) {
+    async injectAndRefresh(credentialBundle, options) {
+        const expirationSeconds = options.expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS;
         const iframeClient = await this.getIframeClient();
         await iframeClient.injectCredentialBundle(credentialBundle);
         await iframeClient.refreshSession({
             sessionType: sdk_browser_1.SessionType.READ_WRITE,
             targetPublicKey: iframeClient.iframePublicKey,
-            expirationSeconds: '900',
+            expirationSeconds,
         });
+        const session = await this.turnkey?.getSession();
+        if (!session) {
+            throw new exceptions_1.WalletException(new Error('Failed to refresh session'));
+        }
+        this.organizationId = session.organizationId;
+        this.metadata.organizationId = session.organizationId;
+        // Refresh the session 2 minutes before it expires
+        setTimeout(() => {
+            iframeClient.refreshSession({
+                expirationSeconds: session?.expiry,
+                sessionType: sdk_browser_1.SessionType.READ_WRITE,
+                targetPublicKey: iframeClient.iframePublicKey,
+            });
+        }, (parseInt(expirationSeconds) - 120) * 1000);
         return;
     }
+    async initOTP(email) {
+        const iframeClient = await this.getIframeClient();
+        const result = await otp_js_1.TurnkeyOtpWallet.initEmailOTP({
+            client: this.client,
+            iframeClient,
+            email,
+            otpInitPath: this.metadata.otpInitPath || consts_js_1.TURNKEY_OTP_INIT_PATH,
+        });
+        if (!result || !result.otpId) {
+            throw new exceptions_1.WalletException(new Error('Failed to initialize OTP'));
+        }
+        if (result?.organizationId) {
+            this.organizationId = result.organizationId;
+        }
+        if (result?.otpId) {
+            this.otpId = result.otpId;
+        }
+        return result;
+    }
+    async confirmOTP(otpCode) {
+        const iframeClient = await this.getIframeClient();
+        if (!this.otpId) {
+            throw new exceptions_1.WalletException(new Error('OTP ID is required'));
+        }
+        const result = await otp_js_1.TurnkeyOtpWallet.confirmEmailOTP({
+            otpCode,
+            iframeClient,
+            client: this.client,
+            emailOTPId: this.otpId,
+            organizationId: this.organizationId,
+            otpVerifyPath: this.metadata.otpVerifyPath || consts_js_1.TURNKEY_OTP_VERIFY_PATH,
+        });
+        if (!result || !result.credentialBundle) {
+            throw new exceptions_1.WalletException(new Error('Failed to confirm OTP'));
+        }
+        await this.injectAndRefresh(result.credentialBundle, {
+            organizationId: result.organizationId,
+            expirationSeconds: this.metadata.expirationSeconds,
+        });
+        return result;
+    }
+    async initOAuth(provider) {
+        const iframeClient = await this.getIframeClient();
+        const nonce = await oauth_js_1.TurnkeyOauthWallet.generateOAuthNonce(iframeClient);
+        if (provider === wallet_base_1.TurnkeyProvider.Apple) {
+            // TODO: implement the ability to generate Apple OAuth URL
+            return nonce;
+        }
+        if (!this.metadata?.googleClientId || !this.metadata?.googleRedirectUri) {
+            throw new exceptions_1.WalletException(new Error('googleClientId and googleRedirectUri are required'));
+        }
+        return (0, utils_js_1.generateGoogleUrl)({
+            nonce,
+            clientId: this.metadata.googleClientId,
+            redirectUri: this.metadata.googleRedirectUri,
+        });
+    }
+    async confirmOAuth(provider, oidcToken) {
+        const iframeClient = await this.getIframeClient();
+        const oauthResult = await oauth_js_1.TurnkeyOauthWallet.oauthLogin({
+            oidcToken,
+            iframeClient,
+            client: this.client,
+            providerName: provider.toString(),
+            oauthLoginPath: this.metadata.oauthLoginPath || consts_js_1.TURNKEY_OAUTH_PATH,
+        });
+        if (!oauthResult || !oauthResult.credentialBundle) {
+            throw new exceptions_1.WalletException(new Error('Unexpected OAuth result'));
+        }
+        await this.injectAndRefresh(oauthResult.credentialBundle, {
+            organizationId: oauthResult.organizationId,
+            expirationSeconds: this.metadata.expirationSeconds,
+        });
+        return oauthResult.credentialBundle;
+    }
+    async refreshSession() {
+        const session = await this.getSession();
+        if (session.session?.token) {
+            await this.injectAndRefresh(session.session.token, {
+                expirationSeconds: this.metadata.expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS,
+            });
+            return session.session.token;
+        }
+        throw new exceptions_1.TurnkeyWalletSessionException(new Error('Session expired. Please login again.'));
+    }
     async initFrame() {
         const { metadata } = this;
         const { turnkey, iframeClient } = await createTurnkeyIFrame(metadata);

package/dist/cjs/strategy/types.d.ts

@@ -18,6 +18,7 @@ export type TurnkeyOTPCredentialsResponse = {
 };
 export type TurnkeyConfirmEmailOTPResponse = {
     credentialBundle: string;
+    organizationId: string;
 };
 export type TurnkeyOauthLoginResponse = {
     organizationId: string;

package/dist/esm/index.d.ts

@@ -1,4 +1,3 @@
-export { TurnkeyOtpWalletStrategy } from './strategy/strategy/otp.js';
-export { TurnkeyOauthWalletStrategy } from './strategy/strategy/oauth.js';
-export * from './strategy/strategy/base.js';
+export { TurnkeyWalletStrategy } from './strategy/strategy.js';
+export * from './strategy/strategy.js';
 export * from './strategy/turnkey/turnkey.js';

package/dist/esm/index.js

@@ -1,4 +1,3 @@
-export { TurnkeyOtpWalletStrategy } from './strategy/strategy/otp.js';
-export { TurnkeyOauthWalletStrategy } from './strategy/strategy/oauth.js';
-export * from './strategy/strategy/base.js';
+export { TurnkeyWalletStrategy } from './strategy/strategy.js';
+export * from './strategy/strategy.js';
 export * from './strategy/turnkey/turnkey.js';

package/dist/esm/strategy/consts.d.ts

@@ -2,3 +2,4 @@ export declare const TURNKEY_OAUTH_PATH = "turnkey/oauth";
 export declare const TURNKEY_OTP_PATH = "turnkey/otp";
 export declare const TURNKEY_OTP_INIT_PATH = "turnkey/otp/init";
 export declare const TURNKEY_OTP_VERIFY_PATH = "turnkey/otp/verify";
+export declare const DEFAULT_TURNKEY_REFRESH_SECONDS = "86400";

package/dist/esm/strategy/consts.js

@@ -2,3 +2,4 @@ export const TURNKEY_OAUTH_PATH = 'turnkey/oauth';
 export const TURNKEY_OTP_PATH = 'turnkey/otp';
 export const TURNKEY_OTP_INIT_PATH = `${TURNKEY_OTP_PATH}/init`;
 export const TURNKEY_OTP_VERIFY_PATH = `${TURNKEY_OTP_PATH}/verify`;
+export const DEFAULT_TURNKEY_REFRESH_SECONDS = '86400';

package/dist/esm/strategy/{strategy/base.d.ts → strategy.d.ts}

@@ -1,26 +1,24 @@
 import { TxRaw, AminoSignResponse, DirectSignResponse } from '@injectivelabs/sdk-ts';
 import { HttpRestClient } from '@injectivelabs/utils';
 import { AccountAddress, EthereumChainId } from '@injectivelabs/ts-types';
-import { StdSignDoc, TurnkeyProvider, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-import { TurnkeyWallet } from '../turnkey/turnkey.js';
 import { TurnkeyIframeClient } from '@turnkey/sdk-browser';
-export declare class BaseTurnkeyWalletStrategy extends BaseConcreteStrategy implements ConcreteWalletStrategy {
+import { StdSignDoc, WalletDeviceType, type WalletMetadata, BaseConcreteStrategy, ConcreteWalletStrategy, SendTransactionOptions, ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
+import { TurnkeyWallet } from './turnkey/turnkey.js';
+export declare class TurnkeyWalletStrategy extends BaseConcreteStrategy implements ConcreteWalletStrategy {
     turnkeyWallet: TurnkeyWallet | undefined;
-    turnkeyProvider: TurnkeyProvider;
     client: HttpRestClient;
     constructor(args: ConcreteEthereumWalletStrategyArgs & {
-        provider: TurnkeyProvider;
         apiServerEndpoint?: string;
     });
     getWalletDeviceType(): Promise<WalletDeviceType>;
     setMetadata(metadata?: {
         turnkey?: Partial<WalletMetadata['turnkey']>;
     }): void;
-    private setOrganizationId;
     enable(): Promise<boolean>;
     disconnect(): Promise<void>;
     getAddresses(): Promise<string[]>;
-    getSessionOrConfirm(): Promise<string>;
+    getSessionOrConfirm(_address?: string): Promise<string>;
+    getWalletClient<TurnkeyWallet>(): Promise<TurnkeyWallet>;
     sendEthereumTransaction(_transaction: unknown, _options: {
         address: AccountAddress;
         ethereumChainId: EthereumChainId;

package/dist/esm/strategy/{strategy/base.js → strategy.js}

@@ -1,22 +1,16 @@
 /* eslint-disable class-methods-use-this */
-import { ErrorType, WalletException, UnspecifiedErrorCode, TransactionException, CosmosWalletException, } from '@injectivelabs/exceptions';
 import { TxGrpcApi, } from '@injectivelabs/sdk-ts';
-import { HttpRestClient } from '@injectivelabs/utils';
-import { WalletAction, TurnkeyProvider, WalletDeviceType, BaseConcreteStrategy, } from '@injectivelabs/wallet-base';
-import { TurnkeyWallet } from '../turnkey/turnkey.js';
-import { TurnkeyErrorCodes } from '../types.js';
-import { TurnkeyOtpWallet } from '../turnkey/otp.js';
-import { TurnkeyOauthWallet } from '../turnkey/oauth.js';
-import { SessionType } from '@turnkey/sdk-browser';
+import { ErrorType, WalletException, UnspecifiedErrorCode, TransactionException, CosmosWalletException, } from '@injectivelabs/exceptions';
 import { getAddress } from 'viem';
-import { generateGoogleUrl } from '../../utils.js';
-export class BaseTurnkeyWalletStrategy extends BaseConcreteStrategy {
+import { HttpRestClient } from '@injectivelabs/utils';
+import { WalletAction, WalletDeviceType, BaseConcreteStrategy, } from '@injectivelabs/wallet-base';
+import { TurnkeyErrorCodes } from './types.js';
+import { TurnkeyWallet } from './turnkey/turnkey.js';
+export class TurnkeyWalletStrategy extends BaseConcreteStrategy {
     turnkeyWallet;
-    turnkeyProvider;
     client;
     constructor(args) {
         super(args);
-        this.turnkeyProvider = args.provider;
         const endpoint = args.apiServerEndpoint || this.metadata?.turnkey?.apiServerEndpoint;
         if (!endpoint) {
             throw new WalletException(new Error('apiServerEndpoint is required'));
@@ -35,13 +29,9 @@ export class BaseTurnkeyWalletStrategy extends BaseConcreteStrategy {
                     ...metadata.turnkey,
                 },
             };
+            this.turnkeyWallet?.setMetadata(this.metadata?.turnkey);
         }
     }
-    //? This is here specifically because we have to ensure we set the organizationId on TurnkeyWallet as well
-    setOrganizationId(organizationId) {
-        this.setMetadata({ turnkey: { organizationId } });
-        this.turnkeyWallet?.setMetadata({ organizationId });
-    }
     async enable() {
         const turnkeyWallet = await this.getTurnkeyWallet();
         try {
@@ -70,48 +60,7 @@ export class BaseTurnkeyWalletStrategy extends BaseConcreteStrategy {
     }
     async getAddresses() {
         const turnkeyWallet = await this.getTurnkeyWallet();
-        const organizationId = await this.getOrganizationId();
-        // CHeck if the user is already connected
-        const session = await turnkeyWallet.getSession();
-        if (!session.session) {
-            const iframeClient = await turnkeyWallet.getIframeClient();
-            // Check the provider type and perform auth step accordingly
-            if (this.turnkeyProvider === TurnkeyProvider.Email) {
-                if (!this.metadata?.turnkey?.otpId) {
-                    throw new WalletException(new Error('OTP ID is required'));
-                }
-                if (!this.metadata?.turnkey?.otpCode) {
-                    throw new WalletException(new Error('OTP code is required'));
-                }
-                const result = await TurnkeyOtpWallet.confirmEmailOTP({
-                    iframeClient,
-                    organizationId,
-                    client: this.client,
-                    otpCode: this.metadata?.turnkey?.otpCode,
-                    emailOTPId: this.metadata?.turnkey?.otpId,
-                });
-                if (result?.credentialBundle) {
-                    this.metadata.turnkey.credentialBundle = result.credentialBundle;
-                    await turnkeyWallet.injectAndRefresh(result.credentialBundle);
-                }
-            }
-            else {
-                if (!this.metadata?.turnkey?.oidcToken) {
-                    throw new WalletException(new Error('Oidc token is required'));
-                }
-                const result = await TurnkeyOauthWallet.oauthLogin({
-                    client: this.client,
-                    iframeClient,
-                    oidcToken: this.metadata?.turnkey?.oidcToken,
-                    providerName: this.turnkeyProvider.toString(),
-                });
-                if (result?.credentialBundle) {
-                    this.metadata.turnkey.organizationId = result.organizationId;
-                    this.metadata.turnkey.credentialBundle = result.credentialBundle;
-                    await turnkeyWallet.injectAndRefresh(result.credentialBundle);
-                }
-            }
-        }
+        await turnkeyWallet.getSession();
         try {
             return await turnkeyWallet.getAccounts();
         }
@@ -127,82 +76,12 @@ export class BaseTurnkeyWalletStrategy extends BaseConcreteStrategy {
             });
         }
     }
-    async getSessionOrConfirm() {
-        const { turnkeyProvider, metadata, client } = this;
+    async getSessionOrConfirm(_address) {
         const turnkeyWallet = await this.getTurnkeyWallet();
-        const iframeClient = await turnkeyWallet.getIframeClient();
-        const session = await turnkeyWallet.getSession();
-        if (
-        // If either of these values exist on the metadata, then we want to proceed with the login flow
-        !this.metadata?.turnkey?.email &&
-            !this.metadata?.turnkey?.oidcToken &&
-            session.session?.token) {
-            await iframeClient.injectCredentialBundle(session.session?.token);
-            this.setOrganizationId(session.organizationId);
-            await iframeClient.refreshSession({
-                sessionType: SessionType.READ_WRITE,
-                targetPublicKey: iframeClient.iframePublicKey,
-                expirationSeconds: '900',
-            });
-            return session.session.token;
-        }
-        if (turnkeyProvider === TurnkeyProvider.Email) {
-            if (!metadata?.turnkey?.email) {
-                throw new WalletException(new Error('Email is required'));
-            }
-            const result = await TurnkeyOtpWallet.initEmailOTP({
-                client,
-                iframeClient,
-                email: metadata.turnkey.email,
-                otpInitPath: metadata.turnkey.otpInitPath,
-            });
-            if (result?.organizationId && this.metadata?.turnkey) {
-                this.metadata.turnkey.organizationId = result.organizationId;
-            }
-            if (result?.otpId && this.metadata?.turnkey) {
-                this.metadata.turnkey.otpId = result.otpId;
-            }
-            return result?.otpId || '';
-        }
-        if ([TurnkeyProvider.Google, TurnkeyProvider.Apple].includes(turnkeyProvider)) {
-            if (metadata?.turnkey?.oidcToken) {
-                const oauthResult = await TurnkeyOauthWallet.oauthLogin({
-                    client,
-                    iframeClient,
-                    oidcToken: metadata.turnkey.oidcToken,
-                    providerName: turnkeyProvider.toString(),
-                    oauthLoginPath: metadata.turnkey.oauthLoginPath,
-                });
-                if (oauthResult?.credentialBundle) {
-                    await turnkeyWallet.injectAndRefresh(oauthResult.credentialBundle);
-                }
-                if (oauthResult?.credentialBundle) {
-                    const session = await turnkeyWallet.getSession();
-                    if (this.metadata?.turnkey && session.organizationId) {
-                        this.metadata.turnkey.organizationId = session.organizationId;
-                    }
-                    return oauthResult.credentialBundle;
-                }
-                throw new WalletException(new Error('Oauth result not found'));
-            }
-            else {
-                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;
-            }
-        }
-        return '';
+        return await turnkeyWallet.refreshSession();
+    }
+    async getWalletClient() {
+        return (await this.getTurnkeyWallet());
     }
     async sendEthereumTransaction(_transaction, _options) {
         throw new WalletException(new Error('sendEthereumTransaction is not supported. Turnkey only supports sending cosmos transactions'), {

package/dist/esm/strategy/turnkey/oauth.d.ts

@@ -6,9 +6,9 @@ export declare class TurnkeyOauthWallet {
         oidcToken: string;
         client: HttpRestClient;
         oauthLoginPath?: string;
-        expirationSeconds?: number;
         providerName: 'google' | 'apple';
         iframeClient: TurnkeyIframeClient;
+        expirationSeconds?: number;
     }): Promise<{
         organizationId: string;
         credentialBundle: string;

package/dist/esm/strategy/turnkey/oauth.js

@@ -1,6 +1,6 @@
 import { ErrorType, WalletException, UnspecifiedErrorCode, } from '@injectivelabs/exceptions';
 import { sha256 } from '@injectivelabs/sdk-ts';
-import { TURNKEY_OAUTH_PATH } from '../consts.js';
+import { DEFAULT_TURNKEY_REFRESH_SECONDS, TURNKEY_OAUTH_PATH, } from '../consts.js';
 export class TurnkeyOauthWallet {
     static async generateOAuthNonce(iframeClient) {
         try {
@@ -21,7 +21,7 @@ export class TurnkeyOauthWallet {
         }
     }
     static async oauthLogin(args) {
-        const { client, iframeClient } = args;
+        const { client, iframeClient, expirationSeconds } = args;
         const path = args.oauthLoginPath || TURNKEY_OAUTH_PATH;
         try {
             const targetPublicKey = iframeClient.iframePublicKey;
@@ -33,6 +33,7 @@ export class TurnkeyOauthWallet {
                 targetPublicKey,
                 oidcToken: args.oidcToken,
                 providerName: args.providerName,
+                expirationSeconds: (expirationSeconds || DEFAULT_TURNKEY_REFRESH_SECONDS)?.toString(),
             });
             return response.data;
         }

package/dist/esm/strategy/turnkey/otp.d.ts

@@ -12,10 +12,11 @@ export declare class TurnkeyOtpWallet {
     }): Promise<TurnkeyOTPCredentialsResponse | undefined>;
     static confirmEmailOTP(args: {
         otpCode: string;
-        emailOTPId?: string;
+        emailOTPId: string;
         client: HttpRestClient;
-        organizationId?: string;
+        organizationId: string;
         iframeClient: TurnkeyIframeClient;
         otpVerifyPath?: string;
+        expirationSeconds?: number;
     }): Promise<TurnkeyConfirmEmailOTPResponse | undefined>;
 }

package/dist/esm/strategy/turnkey/otp.js

@@ -1,5 +1,5 @@
 import { ErrorType, WalletException, UnspecifiedErrorCode, } from '@injectivelabs/exceptions';
-import { TURNKEY_OTP_INIT_PATH, TURNKEY_OTP_VERIFY_PATH } from '../consts.js';
+import { DEFAULT_TURNKEY_REFRESH_SECONDS, TURNKEY_OTP_INIT_PATH, TURNKEY_OTP_VERIFY_PATH, } from '../consts.js';
 export class TurnkeyOtpWallet {
     static async initEmailOTP(args) {
         const { client, iframeClient } = args;
@@ -26,7 +26,7 @@ export class TurnkeyOtpWallet {
         }
     }
     static async confirmEmailOTP(args) {
-        const { client, iframeClient } = args;
+        const { client, iframeClient, expirationSeconds } = args;
         try {
             const organizationId = args.organizationId;
             const emailOTPId = args.emailOTPId;
@@ -46,6 +46,7 @@ export class TurnkeyOtpWallet {
                 otpId: emailOTPId,
                 otpCode: args.otpCode,
                 suborgID: organizationId,
+                expirationSeconds: (expirationSeconds || DEFAULT_TURNKEY_REFRESH_SECONDS)?.toString(),
             });
             return response?.data;
         }

package/dist/esm/strategy/turnkey/turnkey.d.ts

@@ -1,11 +1,13 @@
-import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
-import { TurnkeyMetadata } from '@injectivelabs/wallet-base';
+import { TurnkeyMetadata, TurnkeyProvider } from '@injectivelabs/wallet-base';
 import { HttpRestClient } from '@injectivelabs/utils';
+import { Turnkey, TurnkeyIframeClient } from '@turnkey/sdk-browser';
 export declare class TurnkeyWallet {
-    protected iframeClient: TurnkeyIframeClient | undefined;
-    protected turnkey: Turnkey | undefined;
     protected client: HttpRestClient;
     private metadata;
+    protected turnkey: Turnkey | undefined;
+    protected iframeClient: TurnkeyIframeClient | undefined;
+    organizationId: string;
+    private otpId;
     private accountMap;
     setMetadata(metadata: Partial<TurnkeyMetadata>): void;
     constructor(metadata: TurnkeyMetadata);
@@ -20,7 +22,7 @@ export declare class TurnkeyWallet {
         organizationId: string;
     }>;
     getAccounts(): Promise<string[]>;
-    getOrCreateAndGetAccount(address: string, organizationId?: string): Promise<{
+    getOrCreateAndGetAccount(address: string, organizationId: string): Promise<{
         address: import("abitype").Address;
         nonceManager?: import("viem").NonceManager | undefined;
         sign?: ((parameters: {
@@ -38,6 +40,14 @@ export declare class TurnkeyWallet {
         source: string;
         type: "local";
     }>;
-    injectAndRefresh(credentialBundle: string): Promise<void>;
+    injectAndRefresh(credentialBundle: string, options: {
+        expirationSeconds?: string;
+        organizationId?: string;
+    }): Promise<void>;
+    initOTP(email: string): Promise<import("../types.js").TurnkeyOTPCredentialsResponse>;
+    confirmOTP(otpCode: string): Promise<import("../types.js").TurnkeyConfirmEmailOTPResponse>;
+    initOAuth(provider: TurnkeyProvider.Google | TurnkeyProvider.Apple): Promise<string>;
+    confirmOAuth(provider: TurnkeyProvider.Google | TurnkeyProvider.Apple, oidcToken: string): Promise<string>;
+    refreshSession(): Promise<string>;
     private initFrame;
 }

package/dist/esm/strategy/turnkey/turnkey.js

@@ -1,21 +1,28 @@
-import { Turnkey, SessionType } from '@turnkey/sdk-browser';
-import { ErrorType, WalletException, GeneralException, UnspecifiedErrorCode, } from '@injectivelabs/exceptions';
-import { WalletAction } from '@injectivelabs/wallet-base';
-import { getInjectiveAddress } from '@injectivelabs/sdk-ts';
-import { HttpRestClient } from '@injectivelabs/utils';
+import { ErrorType, WalletException, GeneralException, UnspecifiedErrorCode, TurnkeyWalletSessionException, } from '@injectivelabs/exceptions';
+import { WalletAction, TurnkeyProvider, } from '@injectivelabs/wallet-base';
 import { createAccount } from '@turnkey/viem';
+import { HttpRestClient } from '@injectivelabs/utils';
+import { getInjectiveAddress } from '@injectivelabs/sdk-ts';
+import { Turnkey, SessionType } from '@turnkey/sdk-browser';
+import { TURNKEY_OAUTH_PATH, TURNKEY_OTP_INIT_PATH, TURNKEY_OTP_VERIFY_PATH, DEFAULT_TURNKEY_REFRESH_SECONDS, } from '../consts.js';
+import { TurnkeyOtpWallet } from './otp.js';
 import { TurnkeyErrorCodes } from '../types.js';
+import { TurnkeyOauthWallet } from './oauth.js';
+import { generateGoogleUrl } from '../../utils.js';
 export class TurnkeyWallet {
-    iframeClient;
-    turnkey;
     client;
     metadata;
+    turnkey;
+    iframeClient;
+    organizationId;
+    otpId;
     accountMap = {};
     setMetadata(metadata) {
         this.metadata = { ...this.metadata, ...metadata };
     }
     constructor(metadata) {
         this.metadata = metadata;
+        this.organizationId = metadata.organizationId;
         this.client = new HttpRestClient(metadata.apiServerEndpoint);
     }
     static async getTurnkeyInstance(metadata) {
@@ -90,16 +97,16 @@ export class TurnkeyWallet {
     }
     async getAccounts() {
         const iframeClient = await this.getIframeClient();
-        if (!this.metadata.organizationId) {
+        if (!this.organizationId) {
             return [];
         }
         try {
             const response = await iframeClient.getWallets({
-                organizationId: this.metadata.organizationId,
+                organizationId: this.organizationId,
             });
             const accounts = await Promise.allSettled(response.wallets.map((wallet) => iframeClient.getWalletAccounts({
                 walletId: wallet.walletId,
-                organizationId: this.metadata.organizationId,
+                organizationId: this.organizationId,
             })));
             const filteredAccounts = accounts
                 .filter((account) => account.status === 'fulfilled')
@@ -146,16 +153,116 @@ export class TurnkeyWallet {
         this.accountMap[address] = turnkeyAccount;
         return turnkeyAccount;
     }
-    async injectAndRefresh(credentialBundle) {
+    async injectAndRefresh(credentialBundle, options) {
+        const expirationSeconds = options.expirationSeconds || DEFAULT_TURNKEY_REFRESH_SECONDS;
         const iframeClient = await this.getIframeClient();
         await iframeClient.injectCredentialBundle(credentialBundle);
         await iframeClient.refreshSession({
             sessionType: SessionType.READ_WRITE,
             targetPublicKey: iframeClient.iframePublicKey,
-            expirationSeconds: '900',
+            expirationSeconds,
         });
+        const session = await this.turnkey?.getSession();
+        if (!session) {
+            throw new WalletException(new Error('Failed to refresh session'));
+        }
+        this.organizationId = session.organizationId;
+        this.metadata.organizationId = session.organizationId;
+        // Refresh the session 2 minutes before it expires
+        setTimeout(() => {
+            iframeClient.refreshSession({
+                expirationSeconds: session?.expiry,
+                sessionType: SessionType.READ_WRITE,
+                targetPublicKey: iframeClient.iframePublicKey,
+            });
+        }, (parseInt(expirationSeconds) - 120) * 1000);
         return;
     }
+    async initOTP(email) {
+        const iframeClient = await this.getIframeClient();
+        const result = await TurnkeyOtpWallet.initEmailOTP({
+            client: this.client,
+            iframeClient,
+            email,
+            otpInitPath: this.metadata.otpInitPath || TURNKEY_OTP_INIT_PATH,
+        });
+        if (!result || !result.otpId) {
+            throw new WalletException(new Error('Failed to initialize OTP'));
+        }
+        if (result?.organizationId) {
+            this.organizationId = result.organizationId;
+        }
+        if (result?.otpId) {
+            this.otpId = result.otpId;
+        }
+        return result;
+    }
+    async confirmOTP(otpCode) {
+        const iframeClient = await this.getIframeClient();
+        if (!this.otpId) {
+            throw new WalletException(new Error('OTP ID is required'));
+        }
+        const result = await TurnkeyOtpWallet.confirmEmailOTP({
+            otpCode,
+            iframeClient,
+            client: this.client,
+            emailOTPId: this.otpId,
+            organizationId: this.organizationId,
+            otpVerifyPath: this.metadata.otpVerifyPath || TURNKEY_OTP_VERIFY_PATH,
+        });
+        if (!result || !result.credentialBundle) {
+            throw new WalletException(new Error('Failed to confirm OTP'));
+        }
+        await this.injectAndRefresh(result.credentialBundle, {
+            organizationId: result.organizationId,
+            expirationSeconds: this.metadata.expirationSeconds,
+        });
+        return result;
+    }
+    async initOAuth(provider) {
+        const iframeClient = await this.getIframeClient();
+        const nonce = await TurnkeyOauthWallet.generateOAuthNonce(iframeClient);
+        if (provider === TurnkeyProvider.Apple) {
+            // TODO: implement the ability to generate Apple OAuth URL
+            return nonce;
+        }
+        if (!this.metadata?.googleClientId || !this.metadata?.googleRedirectUri) {
+            throw new WalletException(new Error('googleClientId and googleRedirectUri are required'));
+        }
+        return generateGoogleUrl({
+            nonce,
+            clientId: this.metadata.googleClientId,
+            redirectUri: this.metadata.googleRedirectUri,
+        });
+    }
+    async confirmOAuth(provider, oidcToken) {
+        const iframeClient = await this.getIframeClient();
+        const oauthResult = await TurnkeyOauthWallet.oauthLogin({
+            oidcToken,
+            iframeClient,
+            client: this.client,
+            providerName: provider.toString(),
+            oauthLoginPath: this.metadata.oauthLoginPath || TURNKEY_OAUTH_PATH,
+        });
+        if (!oauthResult || !oauthResult.credentialBundle) {
+            throw new WalletException(new Error('Unexpected OAuth result'));
+        }
+        await this.injectAndRefresh(oauthResult.credentialBundle, {
+            organizationId: oauthResult.organizationId,
+            expirationSeconds: this.metadata.expirationSeconds,
+        });
+        return oauthResult.credentialBundle;
+    }
+    async refreshSession() {
+        const session = await this.getSession();
+        if (session.session?.token) {
+            await this.injectAndRefresh(session.session.token, {
+                expirationSeconds: this.metadata.expirationSeconds || DEFAULT_TURNKEY_REFRESH_SECONDS,
+            });
+            return session.session.token;
+        }
+        throw new TurnkeyWalletSessionException(new Error('Session expired. Please login again.'));
+    }
     async initFrame() {
         const { metadata } = this;
         const { turnkey, iframeClient } = await createTurnkeyIFrame(metadata);

package/dist/esm/strategy/types.d.ts

@@ -18,6 +18,7 @@ export type TurnkeyOTPCredentialsResponse = {
 };
 export type TurnkeyConfirmEmailOTPResponse = {
     credentialBundle: string;
+    organizationId: string;
 };
 export type TurnkeyOauthLoginResponse = {
     organizationId: string;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-turnkey",
   "description": "Turnkey wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.15.17",
+  "version": "1.15.19",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -59,11 +59,11 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.15.14",
-    "@injectivelabs/sdk-ts": "^1.15.17",
-    "@injectivelabs/ts-types": "^1.15.15",
-    "@injectivelabs/utils": "^1.15.15",
-    "@injectivelabs/wallet-base": "^1.15.17",
+    "@injectivelabs/exceptions": "^1.15.16",
+    "@injectivelabs/sdk-ts": "^1.15.19",
+    "@injectivelabs/ts-types": "^1.15.17",
+    "@injectivelabs/utils": "^1.15.17",
+    "@injectivelabs/wallet-base": "^1.15.19",
     "@turnkey/sdk-browser": "^4.1.0",
     "@turnkey/viem": "^0.9.0",
     "viem": "^2.28.1"
@@ -77,5 +77,5 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5.0.0"
   },
-  "gitHead": "2f3036b124dd1d178fd354b0b37352700f9b060c"
+  "gitHead": "fdf4de5ba62e2cd9fa95daba61a327d9a0b2a037"
 }

package/dist/cjs/strategy/strategy/oauth.d.ts

@@ -1,5 +0,0 @@
-import { BaseTurnkeyWalletStrategy } from './base.js';
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-export declare class TurnkeyOauthWalletStrategy extends BaseTurnkeyWalletStrategy {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
-}

package/dist/cjs/strategy/strategy/oauth.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TurnkeyOauthWalletStrategy = void 0;
-const base_js_1 = require("./base.js");
-const wallet_base_1 = require("@injectivelabs/wallet-base");
-class TurnkeyOauthWalletStrategy extends base_js_1.BaseTurnkeyWalletStrategy {
-    constructor(args) {
-        super({
-            ...args,
-            provider: wallet_base_1.TurnkeyProvider.Google,
-        });
-    }
-}
-exports.TurnkeyOauthWalletStrategy = TurnkeyOauthWalletStrategy;

package/dist/cjs/strategy/strategy/otp.d.ts

@@ -1,5 +0,0 @@
-import { BaseTurnkeyWalletStrategy } from './base.js';
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-export declare class TurnkeyOtpWalletStrategy extends BaseTurnkeyWalletStrategy {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
-}

package/dist/cjs/strategy/strategy/otp.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TurnkeyOtpWalletStrategy = void 0;
-const base_js_1 = require("./base.js");
-const wallet_base_1 = require("@injectivelabs/wallet-base");
-class TurnkeyOtpWalletStrategy extends base_js_1.BaseTurnkeyWalletStrategy {
-    constructor(args) {
-        super({
-            ...args,
-            provider: wallet_base_1.TurnkeyProvider.Email,
-        });
-    }
-}
-exports.TurnkeyOtpWalletStrategy = TurnkeyOtpWalletStrategy;

package/dist/esm/strategy/strategy/oauth.d.ts

@@ -1,5 +0,0 @@
-import { BaseTurnkeyWalletStrategy } from './base.js';
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-export declare class TurnkeyOauthWalletStrategy extends BaseTurnkeyWalletStrategy {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
-}

package/dist/esm/strategy/strategy/oauth.js

@@ -1,10 +0,0 @@
-import { BaseTurnkeyWalletStrategy } from './base.js';
-import { TurnkeyProvider, } from '@injectivelabs/wallet-base';
-export class TurnkeyOauthWalletStrategy extends BaseTurnkeyWalletStrategy {
-    constructor(args) {
-        super({
-            ...args,
-            provider: TurnkeyProvider.Google,
-        });
-    }
-}

package/dist/esm/strategy/strategy/otp.d.ts

@@ -1,5 +0,0 @@
-import { BaseTurnkeyWalletStrategy } from './base.js';
-import { ConcreteEthereumWalletStrategyArgs } from '@injectivelabs/wallet-base';
-export declare class TurnkeyOtpWalletStrategy extends BaseTurnkeyWalletStrategy {
-    constructor(args: ConcreteEthereumWalletStrategyArgs);
-}

package/dist/esm/strategy/strategy/otp.js

@@ -1,10 +0,0 @@
-import { BaseTurnkeyWalletStrategy } from './base.js';
-import { TurnkeyProvider } from '@injectivelabs/wallet-base';
-export class TurnkeyOtpWalletStrategy extends BaseTurnkeyWalletStrategy {
-    constructor(args) {
-        super({
-            ...args,
-            provider: TurnkeyProvider.Email,
-        });
-    }
-}