update cors

rugglcon · Aug 24, 2019 · 341f2f7 · 341f2f7
1 parent 9907e8d
commit 341f2f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/src/routes/budget.routes.ts b/src/routes/budget.routes.ts
@@ -4,11 +4,13 @@ import { BudgetLogic } from '../logic/budgets';
 import { Budget, NewBudget, SimpleBudget } from '../data/entities/budget';
 import { User } from 'data/entities/user';
 import { ExpenseLogic } from 'logic/expenses';
+import cors = require('cors');
 
-export const budgetRoutes = (cors: () => RequestHandler, budgetLogic: BudgetLogic, expenseLogic: ExpenseLogic): Router => {
+export const budgetRoutes = (appCors: (options?: cors.CorsOptions | cors.CorsOptionsDelegate) => RequestHandler,
+                                budgetLogic: BudgetLogic, expenseLogic: ExpenseLogic): Router => {
     const budgetsRouter = Router();
 
-    // budgetsRouter.all('*', cors());
+    budgetsRouter.all('*', appCors({ origin: true, credentials: true }));
 
     // validates that id is a number
     budgetsRouter.param('id', (_req, res, next, id) => {

diff --git a/src/routes/expense.routes.ts b/src/routes/expense.routes.ts
@@ -5,8 +5,9 @@ import { Expense } from '../data/entities/expense';
 import { ExpenseLogic } from '../logic/expenses';
 import logger from '../util/logger';
 import { User } from 'data/entities/user';
+import cors = require('cors');
 
-export const expenseRoutes = (cors: () => RequestHandler,
+export const expenseRoutes = (appCors: (options?: cors.CorsOptions | cors.CorsOptionsDelegate) => RequestHandler,
                             budgetLogic: BudgetLogic,
                             expenseLogic: ExpenseLogic): Router => {
     const expensesRouter = Router();
@@ -22,7 +23,10 @@ export const expenseRoutes = (cors: () => RequestHandler,
         }
     });
 
-    // expensesRouter.all('*', cors());
+    expensesRouter.all('*', appCors({
+        origin: true,
+        credentials: true
+    }));
 
     // creates an expense
     expensesRouter.post('/', async (req, res) => {

diff --git a/src/routes/user.routes.ts b/src/routes/user.routes.ts
@@ -4,11 +4,12 @@ import { PassportStatic } from 'passport';
 import { UserLogic } from 'logic/users';
 import { AuthLogic } from 'logic/auth';
 import logger from '../util/logger';
+import cors = require('cors');
 
 /**
  * Creates the user routes
  */
-export const userRoutes = (cors: () => RequestHandler, passport: PassportStatic,
+export const userRoutes = (appCors: (options?: cors.CorsOptions | cors.CorsOptionsDelegate) => RequestHandler, passport: PassportStatic,
                             userLogic: UserLogic, authLogic: AuthLogic): Router => {
     const userRouter = Router();
 
@@ -22,7 +23,7 @@ export const userRoutes = (cors: () => RequestHandler, passport: PassportStatic,
         }
     });
 
-    // userRouter.all('*', cors({ origin: true, credentials: true }));
+    userRouter.all('*', appCors({ origin: true, credentials: true }));
 
     // logs a user in
     userRouter.post(