api/src/middleware/auth.ts

@@ -1,5 +1,5 @@
+import { MemberState } from "@app/shared/types/member";
 import { NextFunction, Request, Response } from "express";
-import { MemberState } from "../services/memberService";
 import { stat } from "fs";
 
 export const requireLogin = function (req: Request, res: Response, next: NextFunction) {

api/src/routes/auth.ts

@@ -10,7 +10,8 @@ import { Role } from '@app/shared/types/roles';
 import pool from '../db';
 import { requireLogin } from '../middleware/auth';
 import { getUserRoles } from '../services/rolesService';
-import { getUserState, MemberState } from '../services/memberService';
+import { getUserState } from '../services/memberService';
+import { MemberState } from '@app/shared/types/member';
 const querystring = require('querystring');
 
 

api/src/routes/calendar.ts

@@ -2,7 +2,7 @@ import { Request, Response } from "express";
 import { createEvent, getEventAttendance, getEventDetails, getShortEventsInRange, setAttendanceStatus, setEventCancelled, updateEvent } from "../services/calendarService";
 import { CalendarAttendance, CalendarEvent } from "@app/shared/types/calendar";
 import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
-import { MemberState } from "../services/memberService";
+import { MemberState } from "@app/shared/types/member";
 
 const express = require('express');
 const r = express.Router();

api/src/routes/course.ts

@@ -2,7 +2,7 @@ import { CourseAttendee, CourseEventDetails } from "@app/shared/types/course";
 import { getAllCourses, getCourseEventAttendees, getCourseEventDetails, getCourseEventRoles, getCourseEvents, insertCourseEvent } from "../services/CourseSerivce";
 import { Request, Response, Router } from "express";
 import { requireLogin, requireMemberState } from "../middleware/auth";
-import { MemberState } from "../services/memberService";
+import { MemberState } from "@app/shared/types/member";
 
 const courseRouter = Router();
 const eventRouter = Router();

api/src/routes/members.ts

@@ -7,7 +7,7 @@ import { requireLogin, requireMemberState, requireRole } from '../middleware/aut
 import { getUserActiveLOA } from '../services/loaService';
 import { getMemberSettings, getMembersFull, getMembersLite, getUserData, setUserSettings } from '../services/memberService';
 import { getUserRoles } from '../services/rolesService';
-import { MemberState } from '@app/shared/types/member';
+import { memberSettings, MemberState } from '@app/shared/types/member';
 
 router.use(requireLogin);
 

api/src/routes/ranks.ts

@@ -1,9 +1,11 @@
-const express = require('express');
+import { MemberState } from "@app/shared/types/member";
+import { requireLogin, requireMemberState, requireRole } from "../middleware/auth";
+import { getAllRanks, insertMemberRank } from "../services/rankService";
+
+import express = require('express');
 const r = express.Router();
 const ur = express.Router();
-const { getAllRanks, insertMemberRank } = require('../services/rankService');
+
-const { requireLogin, requireMemberState, requireRole } = require('../middleware/auth');
-const { MemberState } = require('../services/memberService');
 
 r.use(requireLogin)
 ur.use(requireLogin)

api/src/routes/roles.ts

@@ -2,16 +2,16 @@ const express = require('express');
 const r = express.Router();
 const ur = express.Router();
 
+import { MemberState } from '@app/shared/types/member';
 import pool from '../db';
 import { requireLogin, requireMemberState, requireRole } from '../middleware/auth';
-import { MemberState } from '../services/memberService';
 import { assignUserGroup, createGroup } from '../services/rolesService';
 
 r.use(requireLogin)
 ur.use(requireLogin)
 
 //manually assign a member to a group
-ur.post('/', [requireMemberState(MemberState.member), requireRole("17th Administrator")], async (req, res) => {
+ur.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
     try {
         const body = req.body;
 
@@ -25,7 +25,7 @@ ur.post('/', [requireMemberState(MemberState.member), requireRole("17th Administ
 });
 
 //manually remove member from group
-ur.delete('/', [requireMemberState(MemberState.member), requireRole("17th Administrator")], async (req, res) => {
+ur.delete('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
     try {
         const body = req.body;
         console.log(body);
@@ -43,7 +43,7 @@ ur.delete('/', [requireMemberState(MemberState.member), requireRole("17th Admini
 })
 
 //get all roles
-r.get('/', [requireMemberState(MemberState.member)], async (req, res) => {
+r.get('/', [requireMemberState(MemberState.Member)], async (req, res) => {
     try {
         const con = await pool.getConnection();
 
@@ -82,7 +82,7 @@ r.get('/', [requireMemberState(MemberState.member)], async (req, res) => {
 });
 
 //create a new role
-r.post('/', [requireMemberState(MemberState.member), requireRole("17th Administrator")], async (req, res) => {
+r.post('/', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
     try {
         const { name, color, description } = req.body;
         console.log('Creating role:', { name, color, description });
@@ -104,7 +104,7 @@ r.post('/', [requireMemberState(MemberState.member), requireRole("17th Administr
     }
 })
 
-r.delete('/:id', [requireMemberState(MemberState.member), requireRole("17th Administrator")], async (req, res) => {
+r.delete('/:id', [requireMemberState(MemberState.Member), requireRole("17th Administrator")], async (req, res) => {
     try {
         const id = req.params.id;
 

ui/src/api/loa.ts

@@ -43,6 +43,7 @@ export async function getMyLOA(): Promise<LOARequest | null> {
         headers: {
             "Content-Type": "application/json",
         },
+        credentials: 'include',
     });
 
 
@@ -63,6 +64,7 @@ export function getAllLOAs(): Promise<LOARequest[]> {
         headers: {
             "Content-Type": "application/json",
         },
+        credentials: 'include',
     }).then((res) => {
         if (res.ok) {
             return res.json();