mirror of
https://github.com/luminous-devs/lume.git
synced 2024-09-29 16:30:55 +00:00
feat: improve nostr connect flow
This commit is contained in:
parent
6676b4e2a4
commit
d5b1593aca
@ -1,5 +1,5 @@
|
|||||||
import { Metadata } from "@lume/types";
|
import { Metadata } from "@lume/types";
|
||||||
import { commands } from "./commands";
|
import { Result, commands } from "./commands";
|
||||||
|
|
||||||
export class NostrAccount {
|
export class NostrAccount {
|
||||||
static async getAccounts() {
|
static async getAccounts() {
|
||||||
@ -13,7 +13,14 @@ export class NostrAccount {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static async loadAccount(npub: string) {
|
static async loadAccount(npub: string) {
|
||||||
const query = await commands.loadAccount(npub);
|
const bunker: string = localStorage.getItem(`${npub}_bunker`);
|
||||||
|
let query: Result<boolean, string>;
|
||||||
|
|
||||||
|
if (bunker?.length && bunker?.startsWith("bunker://")) {
|
||||||
|
query = await commands.loadAccount(npub, bunker);
|
||||||
|
} else {
|
||||||
|
query = await commands.loadAccount(npub, null);
|
||||||
|
}
|
||||||
|
|
||||||
if (query.status === "ok") {
|
if (query.status === "ok") {
|
||||||
return query.data;
|
return query.data;
|
||||||
@ -65,7 +72,14 @@ export class NostrAccount {
|
|||||||
const connect = await commands.connectRemoteAccount(uri);
|
const connect = await commands.connectRemoteAccount(uri);
|
||||||
|
|
||||||
if (connect.status === "ok") {
|
if (connect.status === "ok") {
|
||||||
return connect.data;
|
const npub = connect.data;
|
||||||
|
const parsed = new URL(uri);
|
||||||
|
parsed.searchParams.delete("secret");
|
||||||
|
|
||||||
|
// save connection string
|
||||||
|
localStorage.setItem(`${npub}_bunker`, parsed.toString());
|
||||||
|
|
||||||
|
return npub;
|
||||||
} else {
|
} else {
|
||||||
throw new Error(connect.error);
|
throw new Error(connect.error);
|
||||||
}
|
}
|
||||||
|
@ -65,9 +65,9 @@ try {
|
|||||||
else return { status: "error", error: e as any };
|
else return { status: "error", error: e as any };
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async loadAccount(npub: string) : Promise<Result<boolean, string>> {
|
async loadAccount(npub: string, bunker: string | null) : Promise<Result<boolean, string>> {
|
||||||
try {
|
try {
|
||||||
return { status: "ok", data: await TAURI_INVOKE("load_account", { npub }) };
|
return { status: "ok", data: await TAURI_INVOKE("load_account", { npub, bunker }) };
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if(e instanceof Error) throw e;
|
if(e instanceof Error) throw e;
|
||||||
else return { status: "error", error: e as any };
|
else return { status: "error", error: e as any };
|
||||||
|
@ -102,6 +102,7 @@ pub async fn save_account(
|
|||||||
#[specta::specta]
|
#[specta::specta]
|
||||||
pub async fn load_account(
|
pub async fn load_account(
|
||||||
npub: &str,
|
npub: &str,
|
||||||
|
bunker: Option<&str>,
|
||||||
state: State<'_, Nostr>,
|
state: State<'_, Nostr>,
|
||||||
app: tauri::AppHandle,
|
app: tauri::AppHandle,
|
||||||
) -> Result<bool, String> {
|
) -> Result<bool, String> {
|
||||||
@ -109,11 +110,28 @@ pub async fn load_account(
|
|||||||
let keyring = Entry::new(npub, "nostr_secret").unwrap();
|
let keyring = Entry::new(npub, "nostr_secret").unwrap();
|
||||||
|
|
||||||
if let Ok(password) = keyring.get_password() {
|
if let Ok(password) = keyring.get_password() {
|
||||||
|
match bunker {
|
||||||
|
Some(uri) => {
|
||||||
|
let app_keys = Keys::parse(password).expect("Secret Key is modified, please check again.");
|
||||||
|
|
||||||
|
match NostrConnectURI::parse(uri) {
|
||||||
|
Ok(bunker_uri) => {
|
||||||
|
match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(30), None).await {
|
||||||
|
Ok(signer) => client.set_signer(Some(signer.into())).await,
|
||||||
|
Err(err) => return Err(err.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(err) => return Err(err.to_string()),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => {
|
||||||
let keys = Keys::parse(password).expect("Secret Key is modified, please check again.");
|
let keys = Keys::parse(password).expect("Secret Key is modified, please check again.");
|
||||||
let signer = NostrSigner::Keys(keys);
|
let signer = NostrSigner::Keys(keys);
|
||||||
|
|
||||||
// Update signer
|
// Update signer
|
||||||
client.set_signer(Some(signer)).await;
|
client.set_signer(Some(signer)).await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Verify signer
|
// Verify signer
|
||||||
let signer = client.signer().await.unwrap();
|
let signer = client.signer().await.unwrap();
|
||||||
@ -207,6 +225,7 @@ pub async fn connect_remote_account(uri: &str, state: State<'_, Nostr>) -> Resul
|
|||||||
match NostrConnectURI::parse(uri) {
|
match NostrConnectURI::parse(uri) {
|
||||||
Ok(bunker_uri) => {
|
Ok(bunker_uri) => {
|
||||||
let app_keys = Keys::generate();
|
let app_keys = Keys::generate();
|
||||||
|
let app_secret = app_keys.secret_key().unwrap().to_string();
|
||||||
|
|
||||||
// Get remote user
|
// Get remote user
|
||||||
let remote_user = bunker_uri.signer_public_key().unwrap();
|
let remote_user = bunker_uri.signer_public_key().unwrap();
|
||||||
@ -214,7 +233,12 @@ pub async fn connect_remote_account(uri: &str, state: State<'_, Nostr>) -> Resul
|
|||||||
|
|
||||||
match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(120), None).await {
|
match Nip46Signer::new(bunker_uri, app_keys, Duration::from_secs(120), None).await {
|
||||||
Ok(signer) => {
|
Ok(signer) => {
|
||||||
|
let keyring = Entry::new(&remote_npub, "nostr_secret").unwrap();
|
||||||
|
let _ = keyring.set_password(&app_secret);
|
||||||
|
|
||||||
|
// Update signer
|
||||||
let _ = client.set_signer(Some(signer.into())).await;
|
let _ = client.set_signer(Some(signer.into())).await;
|
||||||
|
|
||||||
Ok(remote_npub.into())
|
Ok(remote_npub.into())
|
||||||
}
|
}
|
||||||
Err(err) => Err(err.to_string()),
|
Err(err) => Err(err.to_string()),
|
||||||
|
Loading…
Reference in New Issue
Block a user