Skip to content

Commit bc5682b

Browse files
committed
debug: added some logs
1 parent 3f9a9e6 commit bc5682b

File tree

2 files changed

+31
-12
lines changed

2 files changed

+31
-12
lines changed

src/kit.ts

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,6 @@ export class SessionKit {
170170
// Initialize session key support if configured
171171
if (options.sessionKey) {
172172
this.sessionKeyManager = new SessionKeyManager(options.sessionKey, this.ui)
173-
// Always add SessionKeyWalletPlugin so restore works
174-
// Use disableWalletPlugin to hide from picker UI only
175173
this.walletPlugins = [
176174
...this.walletPlugins,
177175
new SessionKeyWalletPlugin({
@@ -395,18 +393,43 @@ export class SessionKit {
395393
// Tell the UI a login request is beginning.
396394
await context.ui.onLogin()
397395

396+
// Get the list of selectable wallet plugins (excluding hidden ones like session key wallet)
397+
const selectableWalletPlugins = this.walletPlugins.filter((plugin) => {
398+
if (
399+
this.sessionKeyManager?.config.disableWalletPlugin &&
400+
plugin.id === 'session-key-wallet'
401+
) {
402+
return false
403+
}
404+
return true
405+
})
406+
407+
// DEBUG: Log wallet plugin filtering
408+
console.log('[SessionKit] Wallet plugin selection debug:', {
409+
totalWalletPlugins: this.walletPlugins.length,
410+
walletPluginIds: this.walletPlugins.map((p) => p.id),
411+
sessionKeyManager: !!this.sessionKeyManager,
412+
disableWalletPlugin: this.sessionKeyManager?.config.disableWalletPlugin,
413+
selectableWalletPlugins: selectableWalletPlugins.length,
414+
selectableIds: selectableWalletPlugins.map((p) => p.id),
415+
})
416+
398417
// Predetermine WalletPlugin (if possible) to prevent uneeded UI interactions.
399418
let walletPlugin: WalletPlugin | undefined = undefined
400-
if (this.walletPlugins.length === 1) {
401-
walletPlugin = this.walletPlugins[0] // Default to first when only one.
402-
context.walletPluginIndex = 0
419+
if (selectableWalletPlugins.length === 1) {
420+
walletPlugin = selectableWalletPlugins[0] // Default to first when only one.
421+
context.walletPluginIndex = this.walletPlugins.indexOf(walletPlugin)
403422
context.uiRequirements.requiresWalletSelect = false
423+
console.log('[SessionKit] Auto-selected wallet:', walletPlugin.id)
404424
} else if (options?.walletPlugin) {
405425
walletPlugin = this.getWalletPlugin(options.walletPlugin)
406426
if (walletPlugin) {
407427
context.walletPluginIndex = this.walletPlugins.indexOf(walletPlugin)
408428
context.uiRequirements.requiresWalletSelect = false
429+
console.log('[SessionKit] Wallet selected via options:', walletPlugin.id)
409430
}
431+
} else {
432+
console.log('[SessionKit] Multiple wallets available, UI will prompt for selection')
410433
}
411434
// Set any uiRequirement overrides from the wallet plugin
412435
if (walletPlugin) {

src/utils.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
Transaction,
99
} from '@wharfkit/antelope'
1010
import type {Fetch, LocaleDefinitions} from '@wharfkit/common'
11-
import {PlaceholderAuth, SigningRequest} from '@wharfkit/signing-request'
11+
import {SigningRequest} from '@wharfkit/signing-request'
1212
import {TransactArgs, TransactPlugin} from './transact'
1313
import {WalletPlugin} from './wallet'
1414

@@ -139,8 +139,6 @@ export function extractActions(args: TransactArgs): AnyAction[] {
139139

140140
/**
141141
* Check if an action has an authorization matching a given permission level.
142-
* Also matches PlaceholderAuth (actor: '............1', permission: '............2')
143-
* since placeholders will be resolved to the actual permission level.
144142
*
145143
* @param action AnyAction
146144
* @param permissionLevel PermissionLevel
@@ -150,17 +148,15 @@ export function actionMatchesPermission(
150148
action: AnyAction,
151149
permissionLevel: PermissionLevel
152150
): boolean {
153-
return action.authorization.some(
154-
(auth: PermissionLevelType) => permissionLevel.equals(auth) || PlaceholderAuth.equals(auth)
155-
)
151+
return action.authorization.some((auth: PermissionLevelType) => permissionLevel.equals(auth))
156152
}
157153

158154
function rewriteAuthIfMatches(
159155
auth: PermissionLevelType,
160156
permissionLevel: PermissionLevel,
161157
newPermission: Name
162158
): PermissionLevelType {
163-
if (permissionLevel.equals(auth) || PlaceholderAuth.equals(auth)) {
159+
if (permissionLevel.equals(auth)) {
164160
return PermissionLevel.from({
165161
actor: permissionLevel.actor,
166162
permission: newPermission,

0 commit comments

Comments
 (0)