@turnkey/sdk-browser 1.16.0 → 2.0.0

package/dist/__generated__/sdk-client-base.js

@@ -485,12 +485,10 @@ class TurnkeySDKClientBase {
         };
         this.approveActivity = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.activityDecision("/public/v1/submit/approve_activity", {
                 parameters: rest,
-                organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
-                    this.config.organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_APPROVE_ACTIVITY",
             });
@@ -510,11 +508,11 @@ class TurnkeySDKClientBase {
         };
         this.createApiKeys = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_api_keys", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_API_KEYS_V2",
@@ -535,11 +533,11 @@ class TurnkeySDKClientBase {
         };
         this.createApiOnlyUsers = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_api_only_users", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_API_ONLY_USERS",
@@ -560,11 +558,11 @@ class TurnkeySDKClientBase {
         };
         this.createAuthenticators = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_authenticators", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_AUTHENTICATORS_V2",
@@ -585,11 +583,11 @@ class TurnkeySDKClientBase {
         };
         this.createInvitations = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_invitations", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_INVITATIONS",
@@ -610,11 +608,11 @@ class TurnkeySDKClientBase {
         };
         this.createOauthProviders = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_oauth_providers", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_OAUTH_PROVIDERS",
@@ -635,11 +633,11 @@ class TurnkeySDKClientBase {
         };
         this.createPolicies = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_policies", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_POLICIES",
@@ -660,11 +658,11 @@ class TurnkeySDKClientBase {
         };
         this.createPolicy = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_policy", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_POLICY_V3",
@@ -685,11 +683,11 @@ class TurnkeySDKClientBase {
         };
         this.createPrivateKeyTag = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_private_key_tag", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_PRIVATE_KEY_TAG",
@@ -710,11 +708,11 @@ class TurnkeySDKClientBase {
         };
         this.createPrivateKeys = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_private_keys", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_PRIVATE_KEYS_V2",
@@ -735,11 +733,11 @@ class TurnkeySDKClientBase {
         };
         this.createReadOnlySession = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_read_only_session", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_READ_ONLY_SESSION",
@@ -760,11 +758,11 @@ class TurnkeySDKClientBase {
         };
         this.createReadWriteSession = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_read_write_session", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_READ_WRITE_SESSION_V2",
@@ -785,11 +783,11 @@ class TurnkeySDKClientBase {
         };
         this.createSubOrganization = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_sub_organization", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_SUB_ORGANIZATION_V7",
@@ -810,11 +808,11 @@ class TurnkeySDKClientBase {
         };
         this.createUserTag = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_user_tag", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_USER_TAG",
@@ -835,11 +833,11 @@ class TurnkeySDKClientBase {
         };
         this.createUsers = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_users", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_USERS_V2",
@@ -860,11 +858,11 @@ class TurnkeySDKClientBase {
         };
         this.createWallet = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_wallet", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_WALLET",
@@ -885,11 +883,11 @@ class TurnkeySDKClientBase {
         };
         this.createWalletAccounts = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/create_wallet_accounts", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_CREATE_WALLET_ACCOUNTS",
@@ -910,11 +908,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteApiKeys = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_api_keys", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_API_KEYS",
@@ -935,11 +933,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteAuthenticators = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_authenticators", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_AUTHENTICATORS",
@@ -960,11 +958,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteInvitation = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_invitation", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_INVITATION",
@@ -985,11 +983,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteOauthProviders = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_oauth_providers", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_OAUTH_PROVIDERS",
@@ -1010,11 +1008,11 @@ class TurnkeySDKClientBase {
         };
         this.deletePolicy = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_policy", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_POLICY",
@@ -1035,11 +1033,11 @@ class TurnkeySDKClientBase {
         };
         this.deletePrivateKeyTags = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_private_key_tags", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_PRIVATE_KEY_TAGS",
@@ -1060,11 +1058,11 @@ class TurnkeySDKClientBase {
         };
         this.deletePrivateKeys = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_private_keys", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_PRIVATE_KEYS",
@@ -1085,11 +1083,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteSubOrganization = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_sub_organization", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_SUB_ORGANIZATION",
@@ -1110,11 +1108,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteUserTags = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_user_tags", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_USER_TAGS",
@@ -1135,11 +1133,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteUsers = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_users", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_USERS",
@@ -1160,11 +1158,11 @@ class TurnkeySDKClientBase {
         };
         this.deleteWallets = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/delete_wallets", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_DELETE_WALLETS",
@@ -1185,11 +1183,11 @@ class TurnkeySDKClientBase {
         };
         this.emailAuth = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/email_auth", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EMAIL_AUTH_V2",
@@ -1210,11 +1208,11 @@ class TurnkeySDKClientBase {
         };
         this.exportPrivateKey = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/export_private_key", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EXPORT_PRIVATE_KEY",
@@ -1235,11 +1233,11 @@ class TurnkeySDKClientBase {
         };
         this.exportWallet = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/export_wallet", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EXPORT_WALLET",
@@ -1260,11 +1258,11 @@ class TurnkeySDKClientBase {
         };
         this.exportWalletAccount = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/export_wallet_account", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_EXPORT_WALLET_ACCOUNT",
@@ -1285,11 +1283,11 @@ class TurnkeySDKClientBase {
         };
         this.importPrivateKey = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/import_private_key", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_IMPORT_PRIVATE_KEY",
@@ -1310,11 +1308,11 @@ class TurnkeySDKClientBase {
         };
         this.importWallet = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/import_wallet", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_IMPORT_WALLET",
@@ -1335,11 +1333,11 @@ class TurnkeySDKClientBase {
         };
         this.initImportPrivateKey = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/init_import_private_key", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_IMPORT_PRIVATE_KEY",
@@ -1360,11 +1358,11 @@ class TurnkeySDKClientBase {
         };
         this.initImportWallet = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/init_import_wallet", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_IMPORT_WALLET",
@@ -1385,11 +1383,11 @@ class TurnkeySDKClientBase {
         };
         this.initOtpAuth = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/init_otp_auth", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_OTP_AUTH",
@@ -1410,11 +1408,11 @@ class TurnkeySDKClientBase {
         };
         this.initUserEmailRecovery = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/init_user_email_recovery", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_INIT_USER_EMAIL_RECOVERY",
@@ -1435,11 +1433,11 @@ class TurnkeySDKClientBase {
         };
         this.oauth = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/oauth", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OAUTH",
@@ -1460,11 +1458,11 @@ class TurnkeySDKClientBase {
         };
         this.otpAuth = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/otp_auth", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_OTP_AUTH",
@@ -1485,11 +1483,11 @@ class TurnkeySDKClientBase {
         };
         this.recoverUser = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/recover_user", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_RECOVER_USER",
@@ -1510,12 +1508,10 @@ class TurnkeySDKClientBase {
         };
         this.rejectActivity = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.activityDecision("/public/v1/submit/reject_activity", {
                 parameters: rest,
-                organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
-                    this.config.organizationId,
+                organizationId: organizationId ?? session?.organizationId ?? this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_REJECT_ACTIVITY",
             });
@@ -1535,11 +1531,11 @@ class TurnkeySDKClientBase {
         };
         this.removeOrganizationFeature = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/remove_organization_feature", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_REMOVE_ORGANIZATION_FEATURE",
@@ -1560,11 +1556,11 @@ class TurnkeySDKClientBase {
         };
         this.setOrganizationFeature = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/set_organization_feature", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SET_ORGANIZATION_FEATURE",
@@ -1585,11 +1581,11 @@ class TurnkeySDKClientBase {
         };
         this.signRawPayload = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/sign_raw_payload", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOAD_V2",
@@ -1610,11 +1606,11 @@ class TurnkeySDKClientBase {
         };
         this.signRawPayloads = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/sign_raw_payloads", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SIGN_RAW_PAYLOADS",
@@ -1635,11 +1631,11 @@ class TurnkeySDKClientBase {
         };
         this.signTransaction = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/sign_transaction", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_SIGN_TRANSACTION_V2",
@@ -1660,11 +1656,11 @@ class TurnkeySDKClientBase {
         };
         this.updatePolicy = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/update_policy", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_POLICY",
@@ -1685,11 +1681,11 @@ class TurnkeySDKClientBase {
         };
         this.updatePrivateKeyTag = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/update_private_key_tag", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_PRIVATE_KEY_TAG",
@@ -1710,11 +1706,11 @@ class TurnkeySDKClientBase {
         };
         this.updateRootQuorum = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/update_root_quorum", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_ROOT_QUORUM",
@@ -1735,11 +1731,11 @@ class TurnkeySDKClientBase {
         };
         this.updateUser = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/update_user", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER",
@@ -1760,11 +1756,11 @@ class TurnkeySDKClientBase {
         };
         this.updateUserTag = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/update_user_tag", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_USER_TAG",
@@ -1785,11 +1781,11 @@ class TurnkeySDKClientBase {
         };
         this.updateWallet = async (input) => {
             const { organizationId, timestampMs, ...rest } = input;
-            const currentUser = await storage.getStorageValue(storage.StorageKeys.UserSession);
+            const session = await storage.getStorageValue(storage.StorageKeys.Session);
             return this.command("/public/v1/submit/update_wallet", {
                 parameters: rest,
                 organizationId: organizationId ??
-                    currentUser?.organization?.organizationId ??
+                    session?.organizationId ??
                     this.config.organizationId,
                 timestampMs: timestampMs ?? String(Date.now()),
                 type: "ACTIVITY_TYPE_UPDATE_WALLET",