Sessionkey dafuga

src/kit.ts

@@ -170,12 +170,15 @@ export class SessionKit {
         // Initialize session key support if configured
         if (options.sessionKey) {
             this.sessionKeyManager = new SessionKeyManager(options.sessionKey, this.ui)
-            this.walletPlugins = [
-                ...this.walletPlugins,
-                new SessionKeyWalletPlugin({
-                    walletPlugins: this.walletPlugins,
-                }),
-            ]
+            // Only add SessionKeyWalletPlugin to wallet picker if not disabled
+            if (!options.sessionKey.disableWalletPlugin) {
+                this.walletPlugins = [
+                    ...this.walletPlugins,
+                    new SessionKeyWalletPlugin({
+                        walletPlugins: this.walletPlugins,
+                    }),
+                ]
+            }
         }
     }
 
@@ -502,6 +505,15 @@ export class SessionKit {
             // Call the `afterLogin` hooks that were registered by the LoginPlugins
             for (const hook of context.hooks.afterLogin) await hook(context)
 
+            // Offer session key setup if configured and session does not have one yet
+            if (this.sessionKeyManager && !session.hasSessionKey()) {
+                try {
+                    await session.setupSessionKey()
+                } catch (e) {
+                    // User cancelled or setup failed - continue with regular session
+                    // This is not a fatal error, the session is still valid
+                }
+            }
             // Save the session to storage if it has a storage instance.
             this.persistSession(session, options?.setAsDefault)
 

src/sessionkey/types.ts

@@ -33,6 +33,8 @@ export interface SessionKeyConfig {
     ) => Promise<API.v1.AccountPermission | undefined>
     /** Skip showing consent UI to user during setup. Default is false. */
     skipConsent?: boolean
+    /** Disable SessionKeyWalletPlugin from appearing in the wallet picker. Default is false. */
+    disableWalletPlugin?: boolean
 }
 
 /**

src/utils.ts

@@ -8,7 +8,7 @@ import {
     Transaction,
 } from '@wharfkit/antelope'
 import type {Fetch, LocaleDefinitions} from '@wharfkit/common'
-import {SigningRequest} from '@wharfkit/signing-request'
+import {PlaceholderAuth, SigningRequest} from '@wharfkit/signing-request'
 import {TransactArgs, TransactPlugin} from './transact'
 import {WalletPlugin} from './wallet'
 
@@ -139,6 +139,8 @@ export function extractActions(args: TransactArgs): AnyAction[] {
 
 /**
  * Check if an action has an authorization matching a given permission level.
+ * Also matches PlaceholderAuth (actor: '............1', permission: '............2')
+ * since placeholders will be resolved to the actual permission level.
  *
  * @param action AnyAction
  * @param permissionLevel PermissionLevel
@@ -148,17 +150,19 @@ export function actionMatchesPermission(
     action: AnyAction,
     permissionLevel: PermissionLevel
 ): boolean {
-    return action.authorization.some((auth: PermissionLevelType) => permissionLevel.equals(auth))
+    return action.authorization.some(
+        (auth: PermissionLevelType) => permissionLevel.equals(auth) || PlaceholderAuth.equals(auth)
+    )
 }
 
 function rewriteAuthIfMatches(
     auth: PermissionLevelType,
     permissionLevel: PermissionLevel,
     newPermission: Name
 ): PermissionLevelType {
-    if (permissionLevel.equals(auth)) {
+    if (permissionLevel.equals(auth) || PlaceholderAuth.equals(auth)) {
         return PermissionLevel.from({
-            actor: auth.actor,
+            actor: permissionLevel.actor,
             permission: newPermission,
         })
     }