Merge pull request #14 from ChangePlusPlusVandy/setup/dev-setup

Setup/dev setup

Author: ashrit-ram-anala

README.md

@@ -82,14 +82,15 @@ npx prisma generate
 
 ## Notes
 
-Backend uses PostgreSQL/Supabase, Prisma ORM, Firebase Auth, Stripe, SendGrid, and AWS S3. Before each push, run `npm run format` on both frontend and backend directories for code consistency for all devs
+Backend uses PostgreSQL/Supabase, Prisma ORM, Clerk Auth, Stripe, AWS SES, and AWS S3. Before each push, run `npm run format` on both frontend and backend directories for code consistency for all devs. Strapi will be implemented later for total customization on admin side of user content
 
 **Documentation Links For Reference:**
 - [PostgreSQL Docs](https://www.postgresql.org/docs/)
 - [Prisma Docs](https://www.prisma.io/docs/)
 - [Supabase Docs](https://supabase.com/docs)
 - [AWS S3 Docs](https://docs.aws.amazon.com/s3/)
-- [Firebase Auth Docs](https://firebase.google.com/docs/auth)
+- [Clerk Auth Docs](https://clerk.com/docs/index)
+- [AWS SES Docs](https://docs.aws.amazon.com/ses/)
 - [Stripe API Docs](https://stripe.com/docs/api)
-- [SendGrid API Docs](https://docs.sendgrid.com/)
 - [Docker Desktop Docs](https://docs.docker.com/desktop/)
+- [Strapi CMS Docs](https://docs.strapi.io/cms/quick-start)

backend/__tests__/controllers/organizationController.test.ts

@@ -6,7 +6,6 @@ import {
   PrismaClient,
 } from '@prisma/client';
 import { mockDeep, mockReset } from 'jest-mock-extended';
-import admin from 'firebase-admin';
 
 const prismaMock = mockDeep<PrismaClient>();
 
@@ -37,17 +36,21 @@ jest.mock('@prisma/client', () => ({
   },
 }));
 
-jest.mock('firebase-admin', () => ({
-  auth: jest.fn().mockReturnValue({
+const mockClerkClient = {
+  users: {
     createUser: jest.fn().mockResolvedValue({
-      uid: 'firebase-uid-123',
-      email: 'test@nonprofit.org',
+      id: 'clerk-user-123',
+      emailAddresses: [{ emailAddress: 'test@nonprofit.org' }],
     }),
     updateUser: jest.fn().mockResolvedValue({
-      uid: 'firebase-uid-123',
+      id: 'clerk-user-123',
     }),
-    verifyIdToken: jest.fn(),
-  }),
+  },
+  verifyToken: jest.fn(),
+};
+
+jest.mock('../../config/clerk', () => ({
+  clerkClient: mockClerkClient,
 }));
 
 jest.mock('../../config/prisma', () => ({
@@ -79,7 +82,7 @@ const createMockResponse = (): any => {
 
 const mockOrganization = {
   id: 'org123',
-  firebaseUid: 'firebase-uid-123',
+  clerkId: 'clerk-user-123',
   email: 'contact@nonprofitorg.org',
   name: 'Community Senior Services',
   description: 'Providing services to seniors in the Nashville area',
@@ -109,19 +112,18 @@ const mockAdminOrg = {
   role: 'ADMIN' as OrganizationRole,
   name: 'Tennessee Coalition for Better Aging',
   email: 'admin@tcba.org',
-  firebaseUid: 'firebase-admin-123',
+  clerkId: 'clerk-admin-123',
 };
 
 describe('OrganizationController', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockReset(prismaMock);
-    const mockAuth = admin.auth() as jest.Mocked<any>;
-    mockAuth.updateUser.mockResolvedValue({ uid: 'firebase-uid-123' });
-    mockAuth.createUser.mockResolvedValue({
-      uid: 'firebase-uid-123',
-      email: 'test@nonprofit.org',
-    });
+    mockClerkClient.users.updateUser.mockResolvedValue({ id: 'clerk-user-123' } as any);
+    mockClerkClient.users.createUser.mockResolvedValue({
+      id: 'clerk-user-123',
+      emailAddresses: [{ emailAddress: 'test@nonprofit.org' }],
+    } as any);
   });
 
   describe('getAllOrganizations', () => {
@@ -177,11 +179,12 @@ describe('OrganizationController', () => {
           OR: [{ email: 'neworg@nonprofit.org' }, { name: 'New Community Services' }],
         },
       });
-      expect(admin.auth().createUser).toHaveBeenCalledWith({
-        email: 'neworg@nonprofit.org',
+      expect(mockClerkClient.users.createUser).toHaveBeenCalledWith({
+        emailAddress: ['neworg@nonprofit.org'],
         password: 'securePassword123',
-        emailVerified: false,
-        displayName: 'New Community Services',
+        firstName: 'New',
+        lastName: 'Community Services',
+        publicMetadata: { organizationName: 'New Community Services', role: 'MEMBER' },
       });
       expect(prismaMock.organization.create).toHaveBeenCalledWith({
         data: {
@@ -205,7 +208,7 @@ describe('OrganizationController', () => {
           membershipRenewalDate: null,
           organizationSize: 'SMALL',
           tags: ['Community Services', 'Education'],
-          firebaseUid: 'firebase-uid-123',
+          clerkId: 'clerk-user-123',
           role: 'MEMBER',
           status: 'PENDING',
         },
@@ -375,7 +378,7 @@ describe('OrganizationController', () => {
       const res = createMockResponse();
       prismaMock.organization.findFirst.mockResolvedValue(null);
       prismaMock.organization.findUnique.mockResolvedValueOnce({
-        firebaseUid: 'firebase-uid-123',
+        clerkId: 'clerk-user-123',
       } as any);
       const updatedOrg = {
         ...mockOrganization,
@@ -389,8 +392,8 @@ describe('OrganizationController', () => {
           NOT: { id: 'org123' },
         },
       });
-      expect(admin.auth().updateUser).toHaveBeenCalledWith('firebase-uid-123', {
-        email: 'newemail@nonprofit.org',
+      expect(mockClerkClient.users.updateUser).toHaveBeenCalledWith('clerk-user-123', {
+        externalId: 'newemail@nonprofit.org',
       });
       expect(prismaMock.organization.update).toHaveBeenCalledWith({
         where: { id: 'org123' },

backend/config/clerk.ts

@@ -0,0 +1,9 @@
+import { createClerkClient } from '@clerk/express';
+
+if (!process.env.CLERK_SECRET_KEY) {
+  throw new Error('CLERK_SECRET_KEY environment variable is required');
+}
+
+export const clerkClient = createClerkClient({
+  secretKey: process.env.CLERK_SECRET_KEY,
+});

backend/controllers/organizationController.ts

@@ -6,7 +6,7 @@ import {
   OrganizationSize,
 } from '@prisma/client';
 import { AuthenticatedRequest } from '../types/index.js';
-import admin from 'firebase-admin';
+import { clerkClient } from '../config/clerk.js';
 import { prisma } from '../config/prisma.js';
 
 /**
@@ -119,12 +119,18 @@ export const registerOrganization = async (req: Request, res: Response) => {
     if (existingOrg) {
       return res.status(400).json({ error: 'Organization with this email or name already exists' });
     }
-    const firebaseUser = await admin.auth().createUser({
-      email,
+
+    const clerkUser = await clerkClient.users.createUser({
+      emailAddress: [email],
       password,
-      emailVerified: false,
-      displayName: name,
+      firstName: name.split(' ')[0] || name,
+      lastName: name.split(' ').slice(1).join(' ') || '',
+      publicMetadata: {
+        organizationName: name,
+        role: 'MEMBER',
+      },
     });
+
     let organizationTags = [];
     if (tags) {
       organizationTags = tags;
@@ -151,7 +157,7 @@ export const registerOrganization = async (req: Request, res: Response) => {
         membershipRenewalDate: membershipRenewalDate ? new Date(membershipRenewalDate) : null,
         organizationSize,
         tags: organizationTags,
-        firebaseUid: firebaseUser.uid,
+        clerkId: clerkUser.id,
         role: 'MEMBER',
         status: 'PENDING',
       },
@@ -298,14 +304,14 @@ export const updateOrganization = async (req: AuthenticatedRequest, res: Respons
         return res.status(404).json({ error: 'Organization not found' });
       }
       try {
-        await admin.auth().updateUser(currentOrg.firebaseUid, {
-          email: email,
+        await clerkClient.users.updateUser(currentOrg.clerkId, {
+          externalId: email,
         });
-      } catch (firebaseError: any) {
-        console.error('Firebase email update failed:', firebaseError);
+      } catch (clerkError: any) {
+        console.error('Clerk email update failed:', clerkError);
         return res.status(400).json({
           error: 'Failed to update email in authentication system',
-          details: firebaseError.message,
+          details: clerkError.message,
         });
       }
       updateData.email = email;

backend/middleware/auth.ts

@@ -1,11 +1,16 @@
 import { Request, Response, NextFunction } from 'express';
-import { auth } from '../config/firebase';
+import { clerkClient } from '../config/clerk.js';
 
-interface AuthRequest extends Request {
+export interface AuthRequest extends Request {
+  auth?: {
+    userId: string;
+    sessionId?: string;
+  };
   user?: {
-    [key: string]: any;
-    uid: string;
+    id: string;
+    clerkId: string;
     email: string;
+    role?: string;
   };
 }
 
@@ -23,15 +28,16 @@ export const authenticateToken = async (
       return;
     }
 
-    const decodedToken = await auth.verifyIdToken(token);
-
-    req.user = {
-      uid: decodedToken.uid,
-      email: decodedToken.email ?? '',
-    };
-
     next();
   } catch (error) {
     res.status(403).json({ error: 'Invalid token' });
   }
 };
+
+export const requireAdmin = async (
+  req: AuthRequest,
+  res: Response,
+  next: NextFunction
+): Promise<void> => {
+  next();
+};