kenmirrors/ente
1
0
Fork 0
mirror of https://github.com/ente-io/ente.git synced 2025-07-30 22:00:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate handling for web / app

Browse Source
This commit is contained in:
Manav Rathi 2024-06-12 16:43:49 +05:30
parent 0bde1ab22d
commit 523317eb71
No known key found for this signature in database
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,13 +32,14 @@ const Page = () => {
| "unrecoverableFailure" /* Unrocevorable error - generic */
| "failed" /* Recoverable error */
| "waitingForUser" /* ...to authenticate with their passkey */
| "redirecting"; /* The user back to the calling app */
| "redirectingWeb" /* Redirect back to the requesting app (HTTP) */
| "redirectingApp"; /* Other redirects (mobile / desktop redirect) */
const [status, setStatus] = useState<Status>("loading");
// The URL we're redirecting to on success.
//
// This will only be set when status is "redirecting".
// This will only be set when status is "redirecting*".
const [redirectURLWithData, setRedirectURLWithData] = useState<
URL | undefined
>();
@ -116,7 +117,7 @@ const Page = () => {
return;
}
setStatus("redirecting");
setStatus(isHTTP(redirectURL) ? "redirectingWeb" : "redirectingApp");
setRedirectURLWithData(
await redirectURLWithPasskeyAuthentication(
@ -159,7 +160,8 @@ const Page = () => {
<RetriableFailed onRetry={handleRetry} onRecover={handleRecover} />
),
waitingForUser: <WaitingForUser />,
redirecting: <Redirecting onRetry={handleRedirectAgain} />,
redirectingWeb: <RedirectingWeb />,
redirectingApp: <RedirectingApp onRetry={handleRedirectAgain} />,
};
return components[status];
@ -167,6 +169,8 @@ const Page = () => {
export default Page;
const isHTTP = (url: URL) => url.protocol == "http" || url.protocol == "https";
const redirectToURL = (url: URL) => {
log.info(`Redirecting to ${url.href}`);
window.location.href = url.href;
@ -310,12 +314,24 @@ const WaitingImgContainer = styled("div")`
margin-block-start: 1rem;
`;
interface RedirectingProps {
const RedirectingWeb: React.FC = () => {
return (
<Content>
<InfoIcon color="accent" fontSize="large" />
<Typography variant="h3">{t("passkey_verified")}</Typography>
<Typography color="text.muted">
{t("redirecting_back_to_app")}
</Typography>
</Content>
);
};
interface RedirectingAppProps {
/** Called when the user presses the button to redirect again */
onRetry: () => void;
}
const Redirecting: React.FC<RedirectingProps> = ({ onRetry }) => {
const RedirectingApp: React.FC<RedirectingAppProps> = ({ onRetry }) => {
const handleClose = window.close;
return (