updated endpoints to singular, and moved handlepasskey

Author: PetN5026

src/AuthProvider.tsx

@@ -44,7 +44,7 @@ export interface AuthContextType {
   updateCredential: (credential: Credential) => Promise<Credential>;
   deleteCredential: (credentialId: string) => Promise<void>;
   login: (identifier: string, passkeyAvailable: boolean) => Promise<Response>;
-  handlePasskeyLogin: () => Promise<string>;
+  handlePasskeyLogin: () => Promise<boolean>;
 }
 
 export interface Credential {
@@ -131,11 +131,6 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({
         method: 'POST',
       });
 
-      if (!response.ok) {
-        console.error('Something went wrong getting webauthn options');
-        return 'Failed';
-      }
-
       const options = await response.json();
       const credential = await startAuthentication({ optionsJSON: options });
 
@@ -154,22 +149,22 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({
         if (verificationResult.mfaLogin) {
           // navigate('/mfaLogin');
           // need to return "Success"
-
-          return 'Success';
+          // can just return a  bool, if success true otherwise false anywhere else
+          return true;
         }
         await validateToken();
         // navigate('/');
         // need to return validateToken response/message
-        return 'Token';
+        return false;
       } else {
         console.error('Passkey login failed:', verificationResult.message);
         // return failed
-        return 'Failed';
+        return false;
       }
     } catch (error) {
       console.error('Passkey login error:', error);
       // throw error?
-      return 'Error';
+      return false;
     }
   };
 

src/components/MagicLinkSent.tsx

@@ -32,7 +32,7 @@ const MagicLinkSent: React.FC = () => {
   const resend = async () => {
     if (cooldown > 0) return;
 
-    await fetchWithAuth(`/magic-links`, {
+    await fetchWithAuth(`/magic-link`, {
       method: 'GET',
       headers: {
         'Content-Type': 'application/json',
@@ -47,7 +47,7 @@ const MagicLinkSent: React.FC = () => {
 
     channel.onmessage = async event => {
       if (event.data?.type === 'MAGIC_LINK_AUTH_SUCCESS') {
-        const response = await fetchWithAuth(`/magic-links/check`, {
+        const response = await fetchWithAuth(`/magic-link/check`, {
           method: 'GET',
           headers: {
             'Content-Type': 'application/json',
@@ -68,7 +68,7 @@ const MagicLinkSent: React.FC = () => {
   useEffect(() => {
     const interval = setInterval(async () => {
       try {
-        const response = await fetchWithAuth(`/magic-links/check`, {
+        const response = await fetchWithAuth(`/magic-link/check`, {
           method: 'GET',
           headers: {
             'Content-Type': 'application/json',

src/views/Login.tsx

@@ -141,7 +141,7 @@ const Login: React.FC = () => {
 
   const sendMagicLink = async () => {
     try {
-      const response = await fetchWithAuth(`/magic-links`, {
+      const response = await fetchWithAuth(`/magic-link`, {
         method: 'GET',
       });
 
@@ -181,8 +181,13 @@ const Login: React.FC = () => {
 
     if (mode === 'login') {
       const res = login(identifier, passkeyAvailable);
+
       if (passkeyAvailable) {
         console.log('herro');
+        const passkeyResult = await handlePasskeyLogin();
+        if (passkeyResult) {
+          navigate('/');
+        }
       } else {
         setShowFallbackOptions(true);
         console.log(setShowFallbackOptions);

src/views/VerifyMagicLink.tsx

@@ -21,17 +21,21 @@ const VerifyMagicLink: React.FC = () => {
 
   useEffect(() => {
     const verify = async () => {
-      const response = await fetchWithAuth(`/magic-links/verify/${token}`, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-      });
-
-      if (!response.ok) {
-        console.error('Failed to verify token');
-        setError('Failed to verify token');
-        return;
+      try {
+        const response = await fetchWithAuth(`/magic-link/verify/${token}`, {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+
+        if (!response.ok) {
+          console.error('Failed to verify token');
+          setError('Failed to verify token');
+          return;
+        }
+      } catch (error) {
+        console.log(error);
       }
 
       const channel = new BroadcastChannel('seamless-auth');