17th-Ranger-Battalion-ORG/milsim-site-v4
8
1
Fork 0
Code Issues 21 Pull Requests Actions 3 Packages Projects Releases 8 Wiki Activity

adjusted members API rules to support public calendar #92

Merged
Ajdj100 merged 2 commits from #70-Calendar-visibility into main 2025-12-14 13:12:59 -06:00
Conversation 0 Commits 2 Files Changed 1 +5 -7
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/src/routes/members.ts
View File

@@ -9,10 +9,8 @@ import { getMemberSettings, getMembersFull, getMembersLite, getUserData, setUser
import { getUserRoles } from '../services/rolesService'; import { getUserRoles } from '../services/rolesService';
import { memberSettings, MemberState } from '@app/shared/types/member'; import { memberSettings, MemberState } from '@app/shared/types/member';
router.use(requireLogin);
//get all users //get all users
router.get('/', [requireMemberState(MemberState.Member)], async (req, res) => { router.get('/', [requireLogin, requireMemberState(MemberState.Member)], async (req, res) => {
try { try {
const result = await pool.query( const result = await pool.query(
`SELECT `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) if (req.user === undefined)
return res.sendStatus(401) 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 { try {
let user = req.user.id; let user = req.user.id;
console.log(user); 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 { try {
let user = req.user.id; let user = req.user.id;
let settings: memberSettings = req.body; 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 { try {
const userId = req.params.id; const userId = req.params.id;
const result = await pool.query('SELECT * FROM view_member_rank_unit_status_latest WHERE id = $1;', [userId]); const result = await pool.query('SELECT * FROM view_member_rank_unit_status_latest WHERE id = $1;', [userId]);