Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix login redirect

Browse Source
This commit is contained in:
Kieran 2023-09-25 21:28:22 +01:00
parent 2f20b90dd9
commit 566f086191
No known key found for this signature in database
GPG Key ID: DE71CEB3925BE941
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/app/src/Hooks/useLoginHandler.tsx
View File

@ -28,6 +28,7 @@ export default function useLoginHandler() {
if (hexKey.length === 64) { if (hexKey.length === 64) {
if (!pin) throw new PinRequiredError(); if (!pin) throw new PinRequiredError();
LoginStore.loginWithPrivateKey(await PinEncrypted.create(hexKey, pin)); LoginStore.loginWithPrivateKey(await PinEncrypted.create(hexKey, pin));
return;
} else { } else {
throw new Error("INVALID PRIVATE KEY"); throw new Error("INVALID PRIVATE KEY");
} }
@ -39,12 +40,14 @@ export default function useLoginHandler() {
const ent = generateBip39Entropy(key); const ent = generateBip39Entropy(key);
const keyHex = entropyToPrivateKey(ent); const keyHex = entropyToPrivateKey(ent);
LoginStore.loginWithPrivateKey(await PinEncrypted.create(keyHex, pin)); LoginStore.loginWithPrivateKey(await PinEncrypted.create(keyHex, pin));
return;
} else if (key.length === 64) { } else if (key.length === 64) {
if (!hasSubtleCrypto) { if (!hasSubtleCrypto) {
throw new Error(insecureMsg); throw new Error(insecureMsg);
} }
if (!pin) throw new PinRequiredError(); if (!pin) throw new PinRequiredError();
LoginStore.loginWithPrivateKey(await PinEncrypted.create(key, pin)); LoginStore.loginWithPrivateKey(await PinEncrypted.create(key, pin));
return;
} }
// public key logins // public key logins

2
packages/app/src/Pages/LoginPage.tsx
View File

@ -95,12 +95,14 @@ export default function LoginPage() {
}, []); }, []);
async function doLogin(pin?: string) { async function doLogin(pin?: string) {
setError("");
try { try {
await loginHandler.doLogin(key, pin); await loginHandler.doLogin(key, pin);
navigate("/"); navigate("/");
} catch (e) { } catch (e) {
if (e instanceof PinRequiredError) { if (e instanceof PinRequiredError) {
setPin(true); setPin(true);
return;
} }
if (e instanceof Error) { if (e instanceof Error) {
setError(e.message); setError(e.message);