@injectivelabs/wallet-turnkey 1.15.18 → 1.15.20

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

@@ -17,5 +17,6 @@ export declare class TurnkeyOtpWallet {
         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.js

@@ -162,23 +162,19 @@ class TurnkeyWallet {
         await iframeClient.injectCredentialBundle(credentialBundle);
         await iframeClient.refreshSession({
             sessionType: sdk_browser_1.SessionType.READ_WRITE,
-            expirationSeconds: options.expirationSeconds,
             targetPublicKey: iframeClient.iframePublicKey,
+            expirationSeconds,
         });
-        // If we just logged in, we have the new org ID here and don't need to wait on getSession method
-        if (options.organizationId) {
-            this.organizationId = options.organizationId;
-            this.metadata.organizationId = options.organizationId;
-        }
-        else {
-            const session = await this.getSession();
-            this.organizationId = session.organizationId;
-            this.metadata.organizationId = session.organizationId;
+        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,
+                expirationSeconds: session?.expiry,
                 sessionType: sdk_browser_1.SessionType.READ_WRITE,
                 targetPublicKey: iframeClient.iframePublicKey,
             });
@@ -264,7 +260,7 @@ class TurnkeyWallet {
         const session = await this.getSession();
         if (session.session?.token) {
             await this.injectAndRefresh(session.session.token, {
-                expirationSeconds: this.metadata.expirationSeconds,
+                expirationSeconds: this.metadata.expirationSeconds || consts_js_1.DEFAULT_TURNKEY_REFRESH_SECONDS,
             });
             return session.session.token;
         }

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

@@ -17,5 +17,6 @@ export declare class TurnkeyOtpWallet {
         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.js

@@ -159,23 +159,19 @@ export class TurnkeyWallet {
         await iframeClient.injectCredentialBundle(credentialBundle);
         await iframeClient.refreshSession({
             sessionType: SessionType.READ_WRITE,
-            expirationSeconds: options.expirationSeconds,
             targetPublicKey: iframeClient.iframePublicKey,
+            expirationSeconds,
         });
-        // If we just logged in, we have the new org ID here and don't need to wait on getSession method
-        if (options.organizationId) {
-            this.organizationId = options.organizationId;
-            this.metadata.organizationId = options.organizationId;
-        }
-        else {
-            const session = await this.getSession();
-            this.organizationId = session.organizationId;
-            this.metadata.organizationId = session.organizationId;
+        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,
+                expirationSeconds: session?.expiry,
                 sessionType: SessionType.READ_WRITE,
                 targetPublicKey: iframeClient.iframePublicKey,
             });
@@ -261,7 +257,7 @@ export class TurnkeyWallet {
         const session = await this.getSession();
         if (session.session?.token) {
             await this.injectAndRefresh(session.session.token, {
-                expirationSeconds: this.metadata.expirationSeconds,
+                expirationSeconds: this.metadata.expirationSeconds || DEFAULT_TURNKEY_REFRESH_SECONDS,
             });
             return session.session.token;
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-turnkey",
   "description": "Turnkey wallet strategy for use with @injectivelabs/wallet-core.",
-  "version": "1.15.18",
+  "version": "1.15.20",
   "sideEffects": false,
   "publishConfig": {
     "access": "public"
@@ -59,11 +59,11 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.15.15",
-    "@injectivelabs/sdk-ts": "^1.15.18",
-    "@injectivelabs/ts-types": "^1.15.16",
-    "@injectivelabs/utils": "^1.15.16",
-    "@injectivelabs/wallet-base": "^1.15.18",
+    "@injectivelabs/exceptions": "^1.15.17",
+    "@injectivelabs/sdk-ts": "^1.15.20",
+    "@injectivelabs/ts-types": "^1.15.18",
+    "@injectivelabs/utils": "^1.15.18",
+    "@injectivelabs/wallet-base": "^1.15.20",
     "@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": "f27adbec3b9a84e4af2c2fbf5dbcac802b254130"
+  "gitHead": "a80d42fd4220e1e9a6d0e8b211dcd229f84dd54e"
 }