Fixed private event checkbox

Author: ashwinGokhale

backend/routes/events.ts

@@ -5,15 +5,19 @@ import { ObjectId } from 'mongodb';
 import { Event } from '../models/event';
 import { Member, IMemberModel } from '../models/member';
 import { auth, hasPermissions } from '../middleware/passport';
-import { successRes, errorRes, sendAccountCreatedEmail } from '../utils';
+import {
+	successRes,
+	errorRes,
+	sendAccountCreatedEmail,
+	hasPermission
+} from '../utils';
 export const router = express.Router();
 
 // TODO: Add auth to routes
 // TODO: Add permissions to routes
 
 router.get('/', async (req, res, next) => {
 	try {
-		console.log('User:', req.user);
 		let { order, sortBy } = req.query;
 		// tslint:disable-next-line:triple-equals
 		order = order == '1' ? 1 : -1;
@@ -25,8 +29,12 @@ router.get('/', async (req, res, next) => {
 		});
 		if (!contains) sortBy = 'eventTime';
 
+		const conditions = hasPermission(req.user as IMemberModel, 'events')
+			? {}
+			: { privateEvent: { $ne: true } };
+
 		const results = await Event.find(
-			{ privateEvent: { $ne: true } },
+			conditions,
 			'_id name createdAt location members'
 		)
 			.sort({ [sortBy]: order })
@@ -94,7 +102,7 @@ router.post('/:id', async (req, res, next) => {
 		if (!ObjectId.isValid(req.params.id))
 			return errorRes(res, 400, 'Invalid event ID');
 		const { name, privateEvent, eventTime, location, facebook } = req.body;
-		const eventBuilder = {};
+		const eventBuilder = { privateEvent };
 		if (!name) return errorRes(res, 400, 'Event must have a name');
 		else Object.assign(eventBuilder, { name });
 		if (!eventTime) return errorRes(res, 400, 'Event must have a time');

backend/utils/index.ts

@@ -28,7 +28,12 @@ export const errorRes = (res: Response, status: number, error: any) =>
 		error
 	});
 
-export const hasPermission = (user: IMemberModel, name: string) =>
+// export const hasPermission = (user: IMemberModel, name: string) =>
+// 	user.permissions.some(per => per.name === name || per.name === 'admin');
+
+export const hasPermission = (user: IMemberModel, name: string): boolean =>
+	user &&
+	// (Object.keys(user).length !== 0 && user.constructor === Object) &&
 	user.permissions.some(per => per.name === name || per.name === 'admin');
 
 export const isAdmin = (user: IMemberModel) => hasPermission(user, 'admin');

frontend/src/components/Edit-CreateEvent/index.js

@@ -111,7 +111,7 @@ class EditEventPage extends Component {
 			};
 			if (type === 'edit') {
 				const newEvent = await updateEvent(match.params.id, event);
-				console.log('Created new event:', newEvent);
+				console.log('Updated event:', newEvent);
 				this.setState({ event: newEvent });
 				return flash('Event successfully updated', 'green');
 			}

tsconfig.json

@@ -6,6 +6,7 @@
 		"outDir": "dist",
 		"sourceMap": true,
 		"target": "es6",
+		"typeRoots": ["./backend/typings"],
 		// "strict": true,
 		"allowJs": true,
 		"removeComments": true,