Ems 163 revisit modules

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ permissions:
   pull-requests: write
 
 env:
-  NODE_VERSION: '18'
+  NODE_VERSION: '20'
 
 jobs:
   # Test all microservices and frontend
@@ -35,6 +35,10 @@ jobs:
         working-directory: ${{ matrix.service == 'ems-client' && 'ems-client' || format('ems-services/{0}', matrix.service) }}
         run: npm ci
 
+      - name: Generate Prisma
+        working-directory: ${{ matrix.service == 'ems-client' && 'ems-client' || format('ems-services/{0}', matrix.service) }}
+        run: npx prisma generate
+
       - name: Run tests
         working-directory: ${{ matrix.service == 'ems-client' && 'ems-client' || format('ems-services/{0}', matrix.service) }}
         run: npm test -- --coverageThreshold='{}'
@@ -89,7 +93,7 @@ jobs:
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "| Service | Status | Coverage |" >> $GITHUB_STEP_SUMMARY
           echo "|---------|--------|----------|" >> $GITHUB_STEP_SUMMARY
-          
+
           # Check if coverage files exist and display summary
           for service in auth-service event-service booking-service notification-service ems-client; do
             if [ -d "coverage-reports/coverage-$service" ]; then
@@ -98,7 +102,7 @@ jobs:
               echo "| $service | ❌ Failed | N/A |" >> $GITHUB_STEP_SUMMARY
             fi
           done
-          
+
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "📁 Coverage reports are available as artifacts for download." >> $GITHUB_STEP_SUMMARY
 
@@ -116,24 +120,24 @@ jobs:
           script: |
             const testStatus = '${{ needs.test-all.result }}';
             const coverageStatus = '${{ needs.coverage-summary.result }}';
-            
+
             let statusEmoji = '✅';
             if (testStatus === 'failure' || coverageStatus === 'failure') {
               statusEmoji = '❌';
             } else if (testStatus === 'cancelled' || coverageStatus === 'cancelled') {
               statusEmoji = '⏸️';
             }
-            
+
             const commentBody = `## 🧪 Test Results ${statusEmoji}
-            
+
             | Check | Status |
             |-------|--------|
             | Tests | ${testStatus === 'success' ? '✅ Passed' : testStatus === 'failure' ? '❌ Failed' : '⏸️ Skipped'} |
             | Coverage | ${coverageStatus === 'success' ? '✅ Passed' : coverageStatus === 'failure' ? '❌ Failed' : '⏸️ Skipped'} |
-            
+
             **Summary:** All automated checks have been completed for this PR.
             `;
-            
+
             await github.rest.issues.createComment({
               owner: context.repo.owner,
               repo: context.repo.repo,

ems-client/app/auth/callback/page.tsx

@@ -22,17 +22,49 @@ function VerifyEmailContent() {
   const searchParams = useSearchParams();
   const router = useRouter();
   const accessToken = searchParams.get('accessToken');
-  const { verifyEmail } = useAuth();
+  const token = searchParams.get('token'); // OAuth token
+  const isOAuth = searchParams.get('oauth') === 'true';
+  const { verifyEmail, checkAuth } = useAuth();
 
   useEffect(() => {
-    const verifyEmailHelper = async () => {
-      logger.info(LOGGER_COMPONENT_NAME, 'Email verification callback - accessToken:', accessToken);
-      if (!accessToken) {
-        setStatus('invalid');
-        setError('Invalid verification link');
-        return;
+    const handleCallback = async () => {
+      // Handle OAuth callback
+      if (isOAuth && token) {
+        logger.info(LOGGER_COMPONENT_NAME, 'OAuth callback - token received');
+        try {
+          setStatus('verifying');
+
+          // Store token and verify authentication
+          authApiClient.setToken(token);
+
+          // Check auth to get user profile
+          await checkAuth();
+
+          setStatus('success');
+          setUserEmail('OAuth authentication successful');
+
+          // Redirect to dashboard
+          setTimeout(() => {
+            router.push('/dashboard');
+          }, 2000);
+          return;
+        } catch (error) {
+          logger.error(LOGGER_COMPONENT_NAME, 'OAuth callback failed', error as Error);
+          setStatus('error');
+          setError(error instanceof Error ? error.message : 'OAuth authentication failed');
+          return;
+        }
       }
 
+      // Handle email verification callback
+      const verifyEmailHelper = async () => {
+        logger.info(LOGGER_COMPONENT_NAME, 'Email verification callback - accessToken:', accessToken);
+        if (!accessToken) {
+          setStatus('invalid');
+          setError('Invalid verification link');
+          return;
+        }
+
       // Check if already verified by checking localStorage
       const existingToken = authApiClient.getToken();
       if (existingToken) {
@@ -85,10 +117,15 @@ function VerifyEmailContent() {
         setStatus('error');
         setError(error instanceof Error ? error.message : 'Verification failed');
       }
+      };
+
+      if (!isOAuth) {
+        verifyEmailHelper();
+      }
     };
 
-      verifyEmailHelper();
-  }, [accessToken, router]);
+    handleCallback();
+  }, [accessToken, token, isOAuth, router, checkAuth, verifyEmail]);
 
   const getStatusIcon = () => {
     switch (status) {