TILA-2698 use passport state for csrf-check

City-of-Helsinki · Jun 27, 2023 · 0730b51 · 0730b51
1 parent 756f123
commit 0730b51
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/app/pages/user-reservations/__tests__/UserReservationsPage.test.js b/app/pages/user-reservations/__tests__/UserReservationsPage.test.js
@@ -11,7 +11,7 @@ describe('pages/user-reservations/UserReservationsPage', () => {
       search: '',
     },
     history: {
-      push: () => {},
+      push: () => { },
     },
     t: path => path,
     reduxReservations: {},
@@ -73,7 +73,7 @@ describe('pages/user-reservations/UserReservationsPage', () => {
   describe('tabs', () => {
     const findTabs = wrapper => wrapper.find('[role="tab"]');
     const findUpcomingTab = wrapper => findTabs(wrapper).at(0);
-    const findPastTab = wrapper => findTabs(wrapper).at(1);
+    // const findPastTab = wrapper => findTabs(wrapper).at(1);
 
     test('should render upcoming and past tabs', () => {
       expect(findTabs(getWrapper()).length).toEqual(2);

diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
     "bootstrap-sass": "3.4.1",
     "camelcase-keys-deep": "^0.1.0",
     "classnames": "2.2.5",
-    "csurf": "^1.11.0",
     "dotenv": "7.0.0",
     "dragscroll": "0.0.8",
     "enzyme-to-json": "^3.3.5",

diff --git a/server/auth/auth.js b/server/auth/auth.js
@@ -3,7 +3,6 @@ import cookieParser from 'cookie-parser';
 import cookieSession from 'cookie-session';
 import express from 'express';
 import nocache from 'nocache';
-import csurf from 'csurf';
 
 import configurePassport from './configurePassport';
 import getAuthState from './getAuthState';
@@ -25,8 +24,6 @@ router.use(cookieSession({
 router.use(passport.initialize());
 router.use(passport.session());
 
-router.use(csurf({ cookie: true }));
-
 router.get('/auth', nocache(), (req, res) => {
   res.json(getAuthState(req));
 });
@@ -39,7 +36,6 @@ router.get('/login',
   passport.authenticate('helsinki'));
 
 router.get('/login/helsinki/return',
-  csurf(),
   passport.authenticate('helsinki', { failureRedirect: '/login' }),
   (req, res) => {
     if (req.session.next) {

diff --git a/server/auth/configurePassport.js b/server/auth/configurePassport.js
@@ -11,6 +11,7 @@ function configurePassport() {
       clientSecret: settings.CLIENT_SECRET,
       callbackURL: settings.LOGIN_CALLBACK_URL,
       proxy: Boolean(settings.PROXY),
+      state: true,
     },
     (accessToken, refreshToken, profile, cb) => {
       helsinkiStrategy.getAPIToken(accessToken, settings.TARGET_APP, (token) => {

diff --git a/src/domain/reservation/modal/__tests__/ReservationInfomationModal.test.js b/src/domain/reservation/modal/__tests__/ReservationInfomationModal.test.js
@@ -53,6 +53,7 @@ describe('ReservationInformationModal', () => {
   });
 
   describe('refund policy', () => {
+    // eslint-disable-next-line max-len
     test('rendered when resource is not null, when user is admin, when reservation is not a staff event and when the reservation has a price', () => {
       const getRefundPolicy = (wrapper) => {
         return wrapper.find({ id: 'refund-policy' });