test

rugglcon · Aug 27, 2019 · 046f120 · 046f120
1 parent 7af8f0d
commit 046f120
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/app.ts b/src/app.ts
@@ -28,7 +28,7 @@ class App {
     }
 
     config(): void {
-        this.app.use(cors());
+        // this.app.use(cors());
         this.app.options('*', cors());
         this.app.use((_req, res, next) => {
             res.header('Access-Control-Allow-Origin', '*');
@@ -96,23 +96,23 @@ class App {
         /**
          * BUDGET ROUTES
          */
-        this.app.use('/api/budgets', passport.authenticate('jwt', {
+        this.app.use('/api/budgets', cors(), passport.authenticate('jwt', {
             session: true
         }), budgetRoutes(cors, this.budgetLogic, this.expenseLogic));
         logger.info('instantiated budget routes');
 
         /**
          * EXPENSE ROUTES
          */
-        this.app.use('/api/expense', passport.authenticate('jwt', {
+        this.app.use('/api/expense', cors(), passport.authenticate('jwt', {
             session: true
         }), expenseRoutes(cors, this.budgetLogic, this.expenseLogic));
         logger.info('instantiated expense routes');
 
         /**
          * USER ROUTES
          */
-        this.app.use('/api/user', userRoutes(cors, passport, this.userLogic, this.authLogic));
+        this.app.use('/api/user', cors(), userRoutes(cors, passport, this.userLogic, this.authLogic));
         logger.info('instantiated user routes');
     }
 }

diff --git a/src/routes/budget.routes.ts b/src/routes/budget.routes.ts
@@ -10,7 +10,7 @@ export const budgetRoutes = (appCors: (options?: cors.CorsOptions | cors.CorsOpt
                                 budgetLogic: BudgetLogic, expenseLogic: ExpenseLogic): Router => {
     const budgetsRouter = Router();
 
-    // budgetsRouter.all('*', appCors({ origin: true, credentials: true }));
+    budgetsRouter.options('*', 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
@@ -23,10 +23,10 @@ export const expenseRoutes = (appCors: (options?: cors.CorsOptions | cors.CorsOp
         }
     });
 
-    // expensesRouter.all('*', appCors({
-    //     origin: true,
-    //     credentials: true
-    // }));
+    expensesRouter.options('*', 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
@@ -23,7 +23,7 @@ export const userRoutes = (appCors: (options?: cors.CorsOptions | cors.CorsOptio
         }
     });
 
-    // userRouter.all('*', appCors({ origin: true, credentials: true }));
+    userRouter.options('*', appCors({ origin: true, credentials: true }));
 
     // logs a user in
     userRouter.post(