Merge pull request #98 from natalierobbins/feat/expanded-rbac

feat: Incorporate new RBAC rules

Author: natalierobbins

client/src/pages/Signup/Signup.tsx

@@ -12,12 +12,32 @@ export default function Signup() {
 		lastName: '',
 		email: '',
 		phone: '',
-		role: ''
+		role: '',
+		locationObjectId: ''
 	});
 	const [otp, setOtp] = useState('');
 	const [otpSent, setOtpSent] = useState(false);
 	const [errorMessage, setErrorMessage] = useState('');
 	const [countdown, setCountdown] = useState(0);
+	const [locations, setLocations] = useState<
+		Array<{ _id: string; hubName: string }>
+	>([]);
+
+	useEffect(() => {
+		const fetchLocations = async () => {
+			try {
+				const response = await fetch('/api/v2/locations');
+				if (response.ok) {
+					const data = await response.json();
+					console.log('Fetched locations:', data);
+					setLocations(data.data);
+				}
+			} catch (error) {
+				console.error('Failed to fetch locations:', error);
+			}
+		};
+		fetchLocations();
+	}, []);
 
 	useEffect(() => {
 		let timer: string | number | NodeJS.Timeout | undefined;
@@ -124,16 +144,29 @@ export default function Signup() {
 							onChange={handlePhoneChange}
 							required
 						/>
+						<select
+							name="locationObjectId"
+							value={userData.locationObjectId}
+							onChange={handleChange}
+							required
+						>
+							<option value="">--Select Location--</option>
+							{locations.map(location => (
+								<option key={location._id} value={location._id}>
+									{location.hubName}
+								</option>
+							))}
+						</select>
 						<select
 							name="role"
 							value={userData.role}
 							onChange={handleChange}
 							required
 						>
 							<option value="">--Select Role--</option>
-							<option value="Volunteer">Volunteer</option>
-							<option value="Manager">Manager</option>
-							<option value="Admin">Admin</option>
+							<option value="VOLUNTEER">VOLUNTEER</option>
+							<option value="MANAGER">MANAGER</option>
+							<option value="ADMIN">ADMIN</option>
 						</select>
 						<button onClick={sendOtp}>Send OTP</button>
 						<p className="switch-auth">

server/src/database/seed/zod/__tests__/seed.zod.test.ts

@@ -27,10 +27,6 @@ describe('Seed Type Validation Schemas', () => {
 
 			const result = createSeedSchema.safeParse(minimalData);
 			expect(result.success).toBe(true);
-			if (result.success) {
-				expect(result.data.locationObjectId).toBe(validObjectId);
-				expect(result.data.isFallback).toBe(false); // Should default to false
-			}
 		});
 
 		test('should validate with isFallback true', () => {

server/src/database/seed/zod/seed.base.ts

@@ -15,6 +15,6 @@ export const baseSeedSchema = z
 		locationObjectId: z
 			.string()
 			.refine(Types.ObjectId.isValid, 'Invalid location objectId'),
-		isFallback: z.boolean().optional().default(false) // Assume false unless otherwise specified
+		isFallback: z.boolean().optional()
 	})
 	.meta({ model: Seed });

server/src/database/seed/zod/seed.validator.ts

@@ -4,10 +4,10 @@ import { baseSeedSchema } from './seed.base';
 export const createSeedSchema = baseSeedSchema
 	.pick({
 		locationObjectId: true,
-		isFallback: true
+		isFallback: true // This marks `isFallback` as acceptable in the request body
 	})
 	.partial({
-		isFallback: true // This marks `isFallback` as optional; defaults to false unless otherwise specified as declared in the base schema
+		isFallback: true // This marks `isFallback` as optional
 	})
 	.strict()
 	.meta({ model: Seed });

server/src/database/survey/mongoose/__tests__/survey.model.test.ts

@@ -9,12 +9,12 @@ import {
 import { MongoMemoryServer } from 'mongodb-memory-server';
 import mongoose, { Types } from 'mongoose';
 
+import { ROLES } from '../../../../permissions/constants';
 import Location from '../../../location/mongoose/location.model';
 import User from '../../../user/mongoose/user.model';
 import {
 	HubType,
 	LocationType,
-	Role,
 	SYSTEM_SURVEY_CODE
 } from '../../../utils/constants';
 import { errors } from '../../../utils/errors';
@@ -58,7 +58,7 @@ describe('Survey Model', () => {
 			lastName: 'User',
 			email: 'test@example.com',
 			phone: '1234567890',
-			role: Role.VOLUNTEER,
+			role: ROLES.VOLUNTEER,
 			approvalStatus: 'APPROVED',
 			approvedByUserObjectId: new mongoose.Types.ObjectId(),
 			locationObjectId: testLocation._id,