typescript

frontend/src/app/LoginRoute.tsx

@@ -221,13 +221,18 @@ const LoginRoute: React.FC = () => {
 
         const publicKey = preparePublicKeyRequestOptions({ publicKey: publicKeyOptions });
         setStatusMessage('Confirm the passkey prompt to continue.', 'info');
-        const assertion = await navigator.credentials.get({ publicKey });
+        const assertion = await navigator.credentials.get({ publicKey }) as PublicKeyCredential | null;
 
         if (!assertion) {
           setStatusMessage('Passkey login cancelled.', 'info');
           return;
         }
 
+        if (!(assertion instanceof PublicKeyCredential)) {
+          setStatusMessage('Unexpected credential response.', 'error');
+          return;
+        }
+
         const serialized = serializeAuthenticationCredential(assertion);
         const finishPayload = {
           challengeId,
@@ -303,7 +308,11 @@ const LoginRoute: React.FC = () => {
       setStatusMessage('Signing you in…', 'info');
 
       try {
-        const payload = {
+        const payload: {
+          magic_token: string;
+          username?: string;
+          preferred_tenant_id?: string | number;
+        } = {
           magic_token: magicToken,
         };
         if (magicUsername) {
@@ -419,13 +428,18 @@ const LoginRoute: React.FC = () => {
 
         const publicKey = preparePublicKeyCreationOptions({ publicKey: publicKeyOptions });
         setStatusMessage('Confirm the passkey prompt to finish creating your account.', 'info');
-        const credential = await navigator.credentials.create({ publicKey });
+        const credential = await navigator.credentials.create({ publicKey }) as PublicKeyCredential | null;
 
         if (!credential) {
           setStatusMessage('Signup cancelled.', 'info');
           return;
         }
 
+        if (!(credential instanceof PublicKeyCredential)) {
+          setStatusMessage('Unexpected credential response.', 'error');
+          return;
+        }
+
         const serialized = serializeRegistrationCredential(credential);
         const finishPayload = {
           signup_token: signupToken,