Merge branch 'master' of https://github.com/Asymmetrik/node-fhir-server-core

Author: Robert Winterbottom

src/server/router.js

@@ -116,7 +116,7 @@ function enableOperationRoutesForProfile(app, config, profile, key, parameters,
 			cors(corsOptions),
 			versionValidationMiddleware(profile),
 			sanitizeMiddleware([routeArgs.BASE, routeArgs.ID, ...parameters]),
-			authenticationMiddleware({ config }),
+			authenticationMiddleware( config ),
 			sofScopeMiddleware({ route, auth: config.auth, name: key }),
 			// TODO: REMOVE: logger in future versions
 			operationsController[interaction]({ profile, name: functionName, logger: deprecatedLogger }),
@@ -229,7 +229,7 @@ function enableResourceRoutes(app, config, corsDefaults) {
 				cors(corsOptions),
 				versionValidationMiddleware(profile),
 				sanitizeMiddleware(route.args),
-				authenticationMiddleware({ config }),
+				authenticationMiddleware( config ),
 				sofScopeMiddleware({ route, auth: config.auth, name: key }),
 				loadController(lowercaseKey, route.interaction, profile.serviceModule),
 			);

src/server/router.test.js

@@ -3,6 +3,9 @@ jest.mock('./middleware/version-validation.middleware.js');
 const router = require('./router.js');
 const path = require('path');
 
+const passport = require('passport');
+jest.mock('passport');
+
 let app, config;
 
 let mockServiceModule = {
@@ -145,4 +148,29 @@ describe('Router Tests', () => {
 		expect(app.post.mock.calls[0][0]).toBe('/:base_version/patient/([$])aggregate-results');
 		expect(app.post.mock.calls[1][0]).toBe('/:base_version/patient/_search');
 	});
+
+	test('config should not be wrapped in another object before being passed to authentication middleware', () => {
+		let originalEnv = process.env.NODE_ENV;
+		process.env.NODE_ENV = 'development';
+
+		config.auth = {
+			strategy: {
+				name: 'test',
+				useSession: true,
+			}
+		};
+		config.profiles.patient.serviceModule = mockServiceModule;
+		config.profiles.patient.operation = mockOperationConfig;
+
+		try {
+			router.setRoutes({ app, config });
+		} catch (e) {
+			// Failed
+		}
+
+		expect(passport.authenticate.mock.calls.length).toBe(3);
+
+		process.env.NODE_ENV = originalEnv;
+	});
+
 });