Refactor authentication service to use DirectCognitoAuthService

- Replaced CognitoAuthService with DirectCognitoAuthService in useAuthOperations and AuthProvider.
- Updated all authentication-related methods to utilize the new DirectCognitoAuthService.
- Removed CognitoAuthService and its associated tests.
- Implemented DirectCognitoAuthService to handle authentication directly using AWS SDK.
- Adjusted S3StorageService and BedrockService to fetch auth session using DirectCognitoAuthService.
- Updated OAuthRedirectHandler to use DirectCognitoAuthService for session and user retrieval.

Author: adamrefaey

frontend/package-lock.json

@@ -39,10 +39,8 @@
     ]
   },
   "dependencies": {
-    "@aws-amplify/auth": "^6.12.4",
-    "@aws-amplify/core": "^6.11.4",
-    "@aws-amplify/ui-react": "^6.11.1",
     "@aws-sdk/client-bedrock-runtime": "^3.799.0",
+    "@aws-sdk/client-cognito-identity-provider": "^3.799.0",
     "@aws-sdk/client-s3": "^3.802.0",
     "@aws-sdk/s3-request-presigner": "^3.802.0",
     "@capacitor/android": "^7.2.0",

frontend/package.json

@@ -22,17 +22,6 @@ vi.mock('axios', () => ({
   },
 }));
 
-// Mock auth
-vi.mock('@aws-amplify/auth', () => ({
-  fetchAuthSession: vi.fn().mockResolvedValue({
-    tokens: {
-      idToken: {
-        toString: () => 'mock-id-token',
-      },
-    },
-  }),
-}));
-
 // Mock dynamic imports to handle the service functions
 vi.mock('../reportService', async (importOriginal) => {
   const actual = (await importOriginal()) as typeof ReportServiceModule;

frontend/src/common/api/__tests__/reportService.test.ts

@@ -1,6 +1,7 @@
 import axios, { AxiosProgressEvent } from 'axios';
 import { MedicalReport } from '../models/medicalReport';
-import { fetchAuthSession } from '@aws-amplify/auth';
+import { DirectCognitoAuthService } from '../services/auth/direct-cognito-auth-service';
+
 // Get the API URL from environment variables
 const API_URL = import.meta.env.VITE_BASE_URL_API || '';
 
@@ -21,8 +22,10 @@ export const getAuthConfig = async (
   signal?: AbortSignal;
   onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
 }> => {
-  const session = await fetchAuthSession();
-  const idToken = session.tokens?.idToken?.toString() || '';
+  // Get tokens from DirectCognitoAuthService
+  const tokens = DirectCognitoAuthService.getTokens();
+  const idToken = tokens?.id_token || '';
+
   return {
     headers: {
       Accept: 'application/json',

frontend/src/common/api/reportService.ts

@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query';
 
 import { CognitoUser } from 'common/models/user';
 import { QueryKey } from 'common/utils/constants';
-import CognitoAuthService from 'common/services/auth/cognito-auth-service';
+import { DirectCognitoAuthService } from 'common/services/auth/direct-cognito-auth-service';
 import { mapCognitoUserToAppUser } from 'common/utils/user-mapper';
 
 /**
@@ -17,7 +17,7 @@ export const useGetCurrentUser = () => {
   const getCurentUser = async (): Promise<CognitoUser> => {
     try {
       // Get current user from Cognito
-      const cognitoUser = await CognitoAuthService.getCurrentUser();
+      const cognitoUser = await DirectCognitoAuthService.getCurrentUser();
 
       if (!cognitoUser) {
         throw new Error('User not found');

frontend/src/common/api/useGetCurrentUser.ts

@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query';
 
 import { UserTokens } from 'common/models/auth';
 import { QueryKey } from 'common/utils/constants';
-import CognitoAuthService from 'common/services/auth/cognito-auth-service';
+import { DirectCognitoAuthService } from 'common/services/auth/direct-cognito-auth-service';
 
 /**
  * An API hook which fetches tokens from AWS Cognito.
@@ -11,8 +11,8 @@ import CognitoAuthService from 'common/services/auth/cognito-auth-service';
 export const useGetUserTokens = () => {
   const getUserTokens = async (): Promise<UserTokens> => {
     try {
-      // Get tokens from Cognito
-      const tokens = await CognitoAuthService.getUserTokens();
+      // Get tokens directly from DirectCognitoAuthService
+      const tokens = DirectCognitoAuthService.getTokens();
 
       if (!tokens) {
         throw new Error('Tokens not found.');

frontend/src/common/api/useGetUserTokens.ts

@@ -41,38 +41,3 @@ export const COGNITO_CONFIG = {
   // Social providers
   SOCIAL_PROVIDERS: ['Google', 'SignInWithApple'],
 };
-
-/**
- * Get redirect URLs for OAuth
- */
-const redirectUrls = {
-  signIn: [APP_CONFIG.hostedRedirectSignIn],
-  signOut: [APP_CONFIG.hostedRedirectSignOut],
-};
-
-/**
- * Amplify Configuration object for initializing Amplify (V6 format)
- */
-export const amplifyConfig = {
-  Auth: {
-    Cognito: {
-      userPoolId: COGNITO_CONFIG.USER_POOL_ID,
-      userPoolClientId: COGNITO_CONFIG.USER_POOL_WEB_CLIENT_ID,
-      identityPoolId: COGNITO_CONFIG.IDENTITY_POOL_ID,
-      loginWith: {
-        email: true,
-        phone: false,
-        username: false,
-        oauth: {
-          domain: COGNITO_CONFIG.OAUTH_DOMAIN,
-          scopes: COGNITO_CONFIG.OAUTH_SCOPES,
-          redirectSignIn: redirectUrls.signIn,
-          redirectSignOut: redirectUrls.signOut,
-          responseType: 'code' as const,
-        },
-      },
-    },
-  },
-  // Configure only the region you need to use
-  region: REGION,
-};