mirror/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-04-21 06:37:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

1.add error handle for get vault salt from server

Browse Source
This commit is contained in:
Kent Wang
2025-01-07 16:39:35 +08:00
parent 6e03d6b4a3
commit a39bb689ac
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/insomnia/src/ui/routes/auth.authorize.tsx
View File

@@ -32,30 +32,34 @@ export const action: ActionFunction = async ({
window.localStorage.setItem('hasUserLoggedInBefore', 'true');
const userSession = await sessionModel.getOrCreate();
const { accountId, id: sessionId } = userSession;
// check vault salt exists in server
const { salt: vaultSalt } = await insomniaFetch<{
salt?: string;
error?: string;
}>({
method: 'GET',
path: '/v1/user/vault',
sessionId,
});
if (vaultSalt) {
// save vault salt to session
await sessionModel.update(userSession, { vaultSalt });
// get vault key saved in keychain
const vaultKeyInKeyChain = await window.main.keyChain.retrieveFromKeyChain(accountId);
if (vaultKeyInKeyChain) {
// validate vault key with server
const validateResult = await validateVaultKey(userSession, vaultKeyInKeyChain, vaultSalt);
if (validateResult) {
// Encrypt vault key and save encrypted vault key & raw vault salt to session
const encryptedVaultKey = await window.main.keyChain.encryptString(vaultKeyInKeyChain);
await sessionModel.update(userSession, { vaultKey: encryptedVaultKey, vaultSalt });
};
}
};
try {
// check vault salt exists in server
const { salt: vaultSalt } = await insomniaFetch<{
salt?: string;
error?: string;
}>({
method: 'GET',
path: '/v1/user/vault',
sessionId,
});
if (vaultSalt) {
// save vault salt to session
await sessionModel.update(userSession, { vaultSalt });
// get vault key saved in keychain
const vaultKeyInKeyChain = await window.main.keyChain.retrieveFromKeyChain(accountId);
if (vaultKeyInKeyChain) {
// validate vault key with server
const validateResult = await validateVaultKey(userSession, vaultKeyInKeyChain, vaultSalt);
if (validateResult) {
// Encrypt vault key and save encrypted vault key & raw vault salt to session
const encryptedVaultKey = await window.main.keyChain.encryptString(vaultKeyInKeyChain);
await sessionModel.update(userSession, { vaultKey: encryptedVaultKey, vaultSalt });
};
}
};
} catch (err) {
console.log(err);
}
return redirect('/organization');
};