mirror of
https://github.com/PR0M3TH3AN/bitvid.git
synced 2026-10-28 08:22:24 +00:00
Adjust NIP-07 login permission flow
This commit is contained in:
1 parent
fa3610f4f7
commit
57e9dfff2c
1 file changed
+11
-23
+11
-23
@@ -1954,18 +1954,12 @@ export class NostrClient {
|
||||
);
|
||||
}
|
||||
|
||||
const permissionResult = await this.ensureExtensionPermissions(
|
||||
DEFAULT_NIP07_PERMISSION_METHODS,
|
||||
const initialPubkey = await runNip07WithRetry(
|
||||
() => extension.getPublicKey(),
|
||||
{
|
||||
label: "extension.getPublicKey",
|
||||
},
|
||||
);
|
||||
if (!permissionResult.ok) {
|
||||
const denialMessage =
|
||||
'The NIP-07 extension reported "permission denied". Please approve the prompt and try again.';
|
||||
const denialError = new Error(denialMessage);
|
||||
if (permissionResult.error) {
|
||||
denialError.cause = permissionResult.error;
|
||||
}
|
||||
throw denialError;
|
||||
}
|
||||
|
||||
if (
|
||||
allowAccountSelection &&
|
||||
@@ -1996,9 +1990,12 @@ export class NostrClient {
|
||||
}
|
||||
}
|
||||
|
||||
const pubkey = await runNip07WithRetry(() => extension.getPublicKey(), {
|
||||
label: "extension.getPublicKey",
|
||||
});
|
||||
const pubkey =
|
||||
allowAccountSelection && typeof extension.selectAccounts === "function"
|
||||
? await runNip07WithRetry(() => extension.getPublicKey(), {
|
||||
label: "extension.getPublicKey",
|
||||
})
|
||||
: initialPubkey;
|
||||
|
||||
if (!pubkey || typeof pubkey !== "string") {
|
||||
throw new Error(
|
||||
@@ -2039,15 +2036,6 @@ export class NostrClient {
|
||||
adapter.pubkey = pubkey;
|
||||
setActiveSigner(adapter);
|
||||
|
||||
this.ensureExtensionPermissions(DEFAULT_NIP07_PERMISSION_METHODS).catch(
|
||||
(err) => {
|
||||
userLogger.warn(
|
||||
"[nostr] Extension permissions were not fully granted after login:",
|
||||
err,
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
return { pubkey, signer: adapter };
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user