Merge pull request 'adjusted members API rules to support public calendar' (#92) from #70-Calendar-visibility into main

Reviewed-on: #92

api/src/routes/members.ts

@@ -9,10 +9,8 @@ import { getMemberSettings, getMembersFull, getMembersLite, getUserData, setUser
 import { getUserRoles } from '../services/rolesService';
 import { memberSettings, MemberState } from '@app/shared/types/member';
 
-router.use(requireLogin);
-
 //get all users
-router.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
+router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
     try {
         const result = await pool.query(
             `SELECT
@@ -34,7 +32,7 @@ router.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
     }
 });
 
-router.get('/me', async (req, res) => {
+router.get('/me', [requireLogin], async (req, res) => {
     if (req.user === undefined)
         return res.sendStatus(401)
 
@@ -59,7 +57,7 @@ router.get('/me', async (req, res) => {
     }
 })
 
-router.get('/settings', async (req: Request, res: Response) => {
+router.get('/settings', [requireLogin], async (req: Request, res: Response) => {
     try {
         let user = req.user.id;
         console.log(user);
@@ -71,7 +69,7 @@ router.get('/settings', async (req: Request, res: Response) => {
     }
 })
 
-router.put('/settings', async (req: Request, res: Response) => {
+router.put('/settings', [requireLogin], async (req: Request, res: Response) => {
     try {
         let user = req.user.id;
         let settings: memberSettings = req.body;
@@ -106,7 +104,7 @@ router.post('/full/bulk', async (req: Request, res: Response) => {
     }
 })
 
-router.get('/:id', async (req, res) => {
+router.get('/:id', [requireLogin], async (req, res) => {
     try {
         const userId = req.params.id;
         const result = await pool.query('SELECT * FROM view_member_rank_unit_status_latest WHERE id = $1;', [userId]);