TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pass recovery URL explicitly instead of trying various string mainps

Browse Source
This commit is contained in:
Manav Rathi
2024-06-11 15:13:58 +05:30
parent e51f9f1e08
commit 621d58ec0e
3 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/apps/accounts/src/pages/passkeys/verify.tsx
View File

@@ -1,7 +1,6 @@
import { setClientPackageForAuthenticatedRequests } from "@/next/http";
import log from "@/next/log";
import type { TwoFactorAuthorizationResponse } from "@/next/types/credentials";
import { ensure } from "@/utils/ensure";
import { nullToUndefined } from "@/utils/transform";
import { VerticallyCentered } from "@ente/shared/components/Container";
import EnteButton from "@ente/shared/components/EnteButton";
@@ -129,10 +128,13 @@ const Page = () => {
const handleRecover = () => {
const searchParams = new URLSearchParams(window.location.search);
const redirect = nullToUndefined(searchParams.get("redirect"));
const redirectURL = new URL(ensure(redirect));
const recover = nullToUndefined(searchParams.get("recover"));
if (!recover) {
log.error("No recover URL was provided");
return;
}
redirectToPasskeyRecoverPage(redirectURL);
redirectToPasskeyRecoverPage(new URL(recover));
};
const components: Record<Status, React.ReactNode> = {

15
web/apps/accounts/src/services/passkey.ts
View File

@@ -534,20 +534,17 @@ export const redirectAfterPasskeyAuthentication = async (
};
/**
* Redirect back to the calling app that initiated the passkey authentication,
* navigating the user to a page where they can reset their second factor using
* Redirect back to the app that initiated the passkey authentication,
* navigating the user to a place where they can reset their second factor using
* their recovery key (e.g. if they have lost access to their passkey).
*
* The same considerations mentioned in [Note: Finish passkey flow in the
* requesting app] apply to recovery too, which is why we need to redirect back
* to the app on whose behalf we're authenticating.
*
* @param redirectURL The URL we were meant to redirect to after successful
* passkey authentication. Provided as a calling app as a query parameter.
* @param recoverURL The recovery URL provided as a query parameter by the app
* that called us.
*/
export const redirectToPasskeyRecoverPage = (redirectURL: URL) => {
// Extract the origin from the given `redirectURL`, and redirect to the
// `/passkeys/recover` page on that origin.
window.location.href = `${redirectURL.origin}/passkeys/recover`;
export const redirectToPasskeyRecoverPage = (recoverURL: URL) => {
window.location.href = recoverURL.href;
};

8
web/packages/accounts/services/passkey.ts
View File

@@ -29,14 +29,16 @@ export const redirectUserToPasskeyVerificationFlow = (
passkeySessionID: string,
) => {
const clientPackage = clientPackageName[appName];
// The returned URL begins with `window.location.origin` and will work both
// when we're running in a web browser, and in our desktop / mobile app.
// See: [Note: Using deeplinks to navigate in desktop app]
// Using `window.location.origin` will work both when we're running in a web
// browser, and in our desktop app. See: [Note: Using deeplinks to navigate
// in desktop app]
const redirect = `${window.location.origin}/passkeys/finish`;
const recover = `${window.location.origin}/passkeys/recover`;
const params = new URLSearchParams({
clientPackage,
passkeySessionID,
redirect,
recover,
});
const url = `${accountsAppURL()}/passkeys/verify?${params.toString()}`;
// [Note: Passkey verification in the desktop app]