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

creds

Browse source
This commit is contained in:
Manav Rathi 2024-05-26 18:55:20 +05:30
parent 17b49595a0
commit ca00b3b558
No known key found for this signature in database
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
web/packages/accounts/pages/credentials.tsx
View file

@ -1,7 +1,7 @@
import { isDevBuild } from "@/next/env";
import log from "@/next/log";
import { ensure } from "@/utils/ensure";
import { APP_HOMES } from "@ente/shared/apps/constants";
import { APP_HOMES, appNameToAppNameOld } from "@ente/shared/apps/constants";
import type { PageProps } from "@ente/shared/apps/types";
import { VerticallyCentered } from "@ente/shared/components/Container";
import EnteSpinner from "@ente/shared/components/EnteSpinner";
@ -53,8 +53,10 @@ import {
} from "../services/srp";
import type { SRPAttributes } from "../types/srp";
export default function Credentials({ appContext, appName }: PageProps) {
const { logout } = appContext;
const Page: React.FC<PageProps> = ({ appContext }) => {
const { appName, logout } = appContext;
const appNameOld = appNameToAppNameOld(appName);
const [srpAttributes, setSrpAttributes] = useState<SRPAttributes>();
const [keyAttributes, setKeyAttributes] = useState<KeyAttributes>();
@ -88,7 +90,7 @@ export default function Credentials({ appContext, appName }: PageProps) {
const token = getToken();
if (key && token) {
// TODO: Refactor the type of APP_HOMES to not require the ??
router.push(APP_HOMES.get(appName) ?? "/");
router.push(APP_HOMES.get(appNameOld) ?? "/");
return;
}
const kekEncryptedAttributes: B64EncryptionResult = getKey(
@ -248,7 +250,7 @@ export default function Credentials({ appContext, appName }: PageProps) {
}
const redirectURL = InMemoryStore.get(MS_KEYS.REDIRECT_URL);
InMemoryStore.delete(MS_KEYS.REDIRECT_URL);
router.push(redirectURL ?? APP_HOMES.get(appName));
router.push(redirectURL ?? APP_HOMES.get(appNameOld));
} catch (e) {
log.error("useMasterPassword failed", e);
}
@ -295,6 +297,8 @@ export default function Credentials({ appContext, appName }: PageProps) {
);
}
export default Page;
const Header: React.FC<React.PropsWithChildren> = ({ children }) => {
return (
<Header_>