Ry 86 switch over auth

apps/backend/src/auth/auth.service.ts

@@ -197,6 +197,11 @@ export class AuthService {
     const res = await axios
       .post(tokenExchangeEndpoint, urlEncodedBody)
       .catch((err) => {
+        console.error(
+          'Cognito Token Fetch Error:',
+          err.response?.data || err.message,
+        );
+        console.error('Full Error Details:', err.toJSON ? err.toJSON() : err);
         throw new Error(`Error while fetching tokens from cognito: ${err}`);
       });
     const tokens = res.data as TokenExchangeResponseDTO;

apps/backend/src/file-upload/entities/file-upload.entity.ts

@@ -1,5 +1,5 @@
 import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
-import { Application } from '../../applications/application.entity'; 
+import { Application } from '../../applications/application.entity';
 
 @Entity()
 export class FileUpload {
@@ -18,6 +18,8 @@ export class FileUpload {
   @Column({ type: 'bytea' }) // For PostgreSQL binary data
   file_data: Buffer;
 
-  @ManyToOne(() => Application, (application) => application.attachments, { onDelete: 'CASCADE' })
+  @ManyToOne(() => Application, (application) => application.attachments, {
+    onDelete: 'CASCADE',
+  })
   application: Application;
 }

apps/frontend/src/components/LoginPage/index.tsx

@@ -3,23 +3,41 @@ import apiClient from '@api/apiClient';
 import useLoginContext from './useLoginContext';
 import { useNavigate } from 'react-router-dom';
 import { Button, Stack } from '@mui/material';
+import { CognitoJwtVerifier } from 'aws-jwt-verify';
+
+const verifier = CognitoJwtVerifier.create({
+  userPoolId: import.meta.env.VITE_COGNITO_USER_POOL_ID as string,
+  tokenUse: 'access',
+  clientId: import.meta.env.VITE_COGNITO_CLIENT_ID as string,
+});
 
-/**
- * Login Page component first checks if the user has been redirected from the
- * Cognito login page with an authorization code. If the code is present, it
- * fetches the user's access token and stores it in the context.
- */
 export default function LoginPage() {
   const { setToken } = useLoginContext();
   const navigate = useNavigate();
+
   useEffect(() => {
     const urlParams = new URLSearchParams(window.location.search);
     const authCode = urlParams.get('code');
 
     async function getToken() {
-      if (authCode) {
+      const sessionToken = sessionStorage.getItem('token');
+
+      if (sessionToken) {
+        try {
+          const token = JSON.parse(sessionToken);
+          await verifier.verify(token);
+          setToken(token);
+          navigate('/');
+        } catch (error) {
+          console.log('Error verifying token:', error);
+          sessionStorage.removeItem('token');
+        }
+      } else if (authCode) {
         try {
           const token = await apiClient.getToken(authCode);
+          console.log('Fetched Token:', token);
+
+          sessionStorage.setItem('token', JSON.stringify(token));
           setToken(token);
           navigate('/');
         } catch (error) {
@@ -29,6 +47,7 @@ export default function LoginPage() {
     }
     getToken();
   }, [navigate, setToken]);
+
   return (
     <Stack
       width="100vw"

package.json

@@ -32,6 +32,7 @@
     "@types/mongodb": "^4.0.7",
     "@types/multer": "^1.4.12",
     "amazon-cognito-identity-js": "^6.3.5",
+    "aws-jwt-verify": "^5.0.0",
     "axios": "^1.5.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",