Merge pull request #653 from ente-io/skip-redundant-page-load
directly go to gallery if key present
This commit is contained in:
commit
5536877de3
|
@ -12,6 +12,10 @@ import localForage from 'utils/storage/localForage';
|
||||||
import { logError } from 'utils/sentry';
|
import { logError } from 'utils/sentry';
|
||||||
import { getAlbumSiteHost, PAGES } from 'constants/pages';
|
import { getAlbumSiteHost, PAGES } from 'constants/pages';
|
||||||
import { EnteLogo } from 'components/EnteLogo';
|
import { EnteLogo } from 'components/EnteLogo';
|
||||||
|
import isElectron from 'is-electron';
|
||||||
|
import desktopService from 'services/desktopService';
|
||||||
|
import { saveKeyInSessionStore } from 'utils/crypto';
|
||||||
|
import { getKey, SESSION_KEYS } from 'utils/storage/sessionStorage';
|
||||||
|
|
||||||
const Container = styled('div')`
|
const Container = styled('div')`
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -122,7 +126,20 @@ export default function LandingPage() {
|
||||||
|
|
||||||
const handleNormalRedirect = async () => {
|
const handleNormalRedirect = async () => {
|
||||||
const user = getData(LS_KEYS.USER);
|
const user = getData(LS_KEYS.USER);
|
||||||
if (user?.email) {
|
let key = getKey(SESSION_KEYS.ENCRYPTION_KEY);
|
||||||
|
if (!key && isElectron()) {
|
||||||
|
key = await desktopService.getEncryptionKey();
|
||||||
|
if (key) {
|
||||||
|
await saveKeyInSessionStore(
|
||||||
|
SESSION_KEYS.ENCRYPTION_KEY,
|
||||||
|
key,
|
||||||
|
true
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (key) {
|
||||||
|
await router.push(PAGES.GALLERY);
|
||||||
|
} else if (user?.email) {
|
||||||
await router.push(PAGES.VERIFY);
|
await router.push(PAGES.VERIFY);
|
||||||
}
|
}
|
||||||
await initLocalForage();
|
await initLocalForage();
|
||||||
|
|
Loading…
Reference in a new issue