Group files under src/server into folders

Author: havstein

src/server/authsupport.js src/server/auth/authsupport.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const { ipAddressFromRequest } = require('./requestData');
+const { ipAddressFromRequest } = require('../requestData');
 
 const isValidNow = token => {
     return isValidAt(token, Math.floor(Date.now()) / 1000);

src/server/authsupport.test.js src/server/auth/authsupport.test.js

@@ -2,7 +2,7 @@
 
 const selectors = require('./selectors');
 
-const { isWithin3Months } = require('./datecalc');
+const { isWithin3Months } = require('../datecalc');
 
 const sykdomsvilkår = behandling => {
     const mindreEnnÅtteUkerSammenhengende = {

src/server/azure.js src/server/auth/azure.js

@@ -3,7 +3,7 @@ const {
     newestTom,
     toDate,
     workdaysBetween
-} = require('./datecalc');
+} = require('../datecalc');
 
 const antallVirkedager = behandling =>
     behandling.vedtak.perioder.reduce(

src/server/proxy.js src/server/auth/proxy.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const storage = require('./storage');
-const { ipAddressFromRequest } = require('./requestData.js');
-const { log } = require('./logging');
+const { ipAddressFromRequest } = require('../requestData.js');
+const { log } = require('../logging');
 const moment = require('moment');
 const { csvMapper } = require('./feedback-csv-mapper');
 

src/server/behandlingerlookup.js src/server/behandlinger/behandlingerlookup.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const request = require('request-promise-native');
-const authSupport = require('./authsupport');
+const authSupport = require('../auth/authsupport');
 
 let cachedAccessToken = null;
 let authConfig = null;

src/server/behandlingerroutes.js src/server/behandlinger/behandlingerroutes.js

@@ -2,7 +2,7 @@
 
 jest.mock('request-promise-native');
 
-const personLookup = require('../../src/server/personlookup');
+const personLookup = require('./personlookup');
 
 const expectedPerson = {
     fdato: '1995-01-01',

src/server/mapping.js src/server/behandlinger/mapping.js

@@ -7,9 +7,9 @@ const cookieParser = require('cookie-parser');
 const compression = require('compression');
 const { generators } = require('openid-client');
 
-const azure = require('./azure');
+const azure = require('./auth/azure');
 const config = require('./config');
-const authsupport = require('./authsupport');
+const authsupport = require('./auth/authsupport');
 const metrics = require('./metrics');
 const headers = require('./headers');
 
@@ -18,7 +18,7 @@ const feedback = require('./feedbackroutes');
 const person = require('./personroutes');
 
 const { ipAddressFromRequest } = require('./requestData');
-const { nameFrom } = require('./authsupport');
+const { nameFrom } = require('./auth/authsupport');
 const { log } = require('./logging');
 
 const app = express();

src/server/mapping.test.js src/server/behandlinger/mapping.test.js

@@ -1,5 +1,5 @@
 import '@testing-library/jest-dom/extend-expect';
-import { daysBetween, toDate } from './date';
+import { daysBetween, toDate } from './index';
 
 test('toDate', () => {
     expect(toDate('notadate')).toEqual('Invalid date');