beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into albums-ente-io

Browse source
This commit is contained in:
Abhinav 2022-01-25 12:05:57 +05:30
parent 197f2ecd80 69a193a5c0
commit a631b5ff01
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configUtil.js
View file

@ -26,8 +26,6 @@ module.exports = {
'base-uri ': "'self'",
'frame-ancestors': " 'none'",
'form-action': "'none'",
'report-uri': 'https://csp-reporter.ente.io',
'report-to': 'https://csp-reporter.ente.io',
},
WORKBOX_CONFIG: {

8
src/components/RecoveryKeyModal.tsx
View file

@ -20,12 +20,14 @@ function RecoveryKeyModal({ somethingWentWrong, ...props }: Props) {
return;
}
const main = async () => {
const recoveryKey = await getRecoveryKey();
if (!recoveryKey) {
try {
const recoveryKey = await getRecoveryKey();
setRecoveryKey(bip39.entropyToMnemonic(recoveryKey));
} catch (e) {
somethingWentWrong();
} finally {
props.onHide();
}
setRecoveryKey(bip39.entropyToMnemonic(recoveryKey));
};
main();
}, [props.show]);

5
src/utils/crypto/index.ts
View file

@ -106,7 +106,7 @@ export const SaveKeyInSessionStore = async (
};
export const getRecoveryKey = async () => {
let recoveryKey = null;
let recoveryKey: string = null;
try {
const cryptoWorker = await new CryptoWorker();
@ -129,6 +129,7 @@ export const getRecoveryKey = async () => {
return recoveryKey;
} catch (e) {
logError(e, 'getRecoveryKey failed');
throw e;
}
};
@ -138,7 +139,7 @@ async function createNewRecoveryKey() {
const cryptoWorker = await new CryptoWorker();
const recoveryKey = await cryptoWorker.generateEncryptionKey();
const recoveryKey: string = await cryptoWorker.generateEncryptionKey();
const encryptedMasterKey: B64EncryptionResult =
await cryptoWorker.encryptToB64(masterKey, recoveryKey);
const encryptedRecoveryKey: B64EncryptionResult =