π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[space][web] Catch passkey verification navigation errors
AswinAsok2f8ebb57c28b
diff --git a/web/apps/space/src/pages/passkeys/verify.tsx b/web/apps/space/src/pages/passkeys/verify.tsxindex 8e34c05610..f6a066aafd 100644--- a/web/apps/space/src/pages/passkeys/verify.tsx+++ b/web/apps/space/src/pages/passkeys/verify.tsx@@ -3,7 +3,7 @@ import { SpaceRouteFallback } from "components/RouteFallback";import { savedPartialLocalUser } from "ente-accounts/services/accounts-db";import { openPasskeyVerificationURL } from "ente-accounts/services/passkey";import log from "ente-base/log";-import React, { useEffect, useState } from "react";+import React, { useCallback, useEffect, useState } from "react";import {PasskeyVerificationScreen,type PasskeyVerificationStatus,@@ -38,6 +38,23 @@ const Page: React.FC = () => {const [status, setStatus] = useState<PasskeyVerificationStatus>("waiting");const [errorMessage, setErrorMessage] = useState<string>();+ const openVerification = useCallback(+ (nextVerification: PendingSpacePasskeyVerification) => {+ try {+ openPasskeyVerificationURL(nextVerification);+ markAutoOpenedSpacePasskeyVerification(+ nextVerification.passkeySessionID,+ );+ } catch (error) {+ log.error("Failed to open Space passkey verification", error);+ setErrorMessage(+ "Couldn't open passkey verification. Try again or use another sign-in method.",+ );+ }+ },+ [],+ );+useEffect(() => {const nextVerification =pendingPasskeyVerification ??@@ -61,12 +78,14 @@ const Page: React.FC = () => {nextVerification.passkeySessionID,)) {- markAutoOpenedSpacePasskeyVerification(- nextVerification.passkeySessionID,- );- openPasskeyVerificationURL(nextVerification);+ openVerification(nextVerification);}- }, [pendingPasskeyVerification, router, setPendingPasskeyVerification]);+ }, [+ openVerification,+ pendingPasskeyVerification,+ router,+ setPendingPasskeyVerification,+ ]);const clearPasskeyVerification = () => {clearPendingSpacePasskeyVerification();@@ -77,7 +96,7 @@ const Page: React.FC = () => {if (!verification) return;setStatus("waiting");setErrorMessage(undefined);- openPasskeyVerificationURL(verification);+ openVerification(verification);};const checkStatus = async () => {