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

added backfilling logic

Browse source
This commit is contained in:
Abhinav 2023-06-07 16:39:32 +05:30
parent 0a36975a3b
commit acab69a28e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/photos/src/pages/credentials/index.tsx
View file

@ -11,8 +11,8 @@ import {
generateAndSaveIntermediateKeyAttributes, generateAndSaveIntermediateKeyAttributes,
saveKeyInSessionStore, saveKeyInSessionStore,
} from 'utils/crypto'; } from 'utils/crypto';
import { logoutUser } from 'services/userService'; import { logoutUser, setupSRP } from 'services/userService';
import { isFirstLogin } from 'utils/storage'; import { getUserSRPSetupPending, isFirstLogin } from 'utils/storage';
import { AppContext } from 'pages/_app'; import { AppContext } from 'pages/_app';
import { logError } from 'utils/sentry'; import { logError } from 'utils/sentry';
import { KeyAttributes, User } from 'types/user'; import { KeyAttributes, User } from 'types/user';
@ -28,6 +28,7 @@ import VerifyMasterPasswordForm, {
VerifyMasterPasswordFormProps, VerifyMasterPasswordFormProps,
} from 'components/VerifyMasterPasswordForm'; } from 'components/VerifyMasterPasswordForm';
import { APPS, getAppName } from 'constants/apps'; import { APPS, getAppName } from 'constants/apps';
import { addLocalLog } from 'utils/logging';
export default function Credentials() { export default function Credentials() {
const router = useRouter(); const router = useRouter();
@ -82,6 +83,13 @@ export default function Credentials() {
key key
); );
} }
const userSRPSetupPending = getUserSRPSetupPending();
addLocalLog(() => `userSRPSetupPending ${userSRPSetupPending}`);
if (userSRPSetupPending) {
// we don't have access to kek here, so we will have to re-derive it from the passphrase
await setupSRP(user.email, passphrase);
}
await saveKeyInSessionStore(SESSION_KEYS.ENCRYPTION_KEY, key); await saveKeyInSessionStore(SESSION_KEYS.ENCRYPTION_KEY, key);
await decryptAndStoreToken(key); await decryptAndStoreToken(key);
const redirectURL = appContext.redirectURL; const redirectURL = appContext.redirectURL;