Merge tag 'v1.1.0.1204+rFFFDD65' into MAS-253-Update-keystone

# Conflicts:
#	cms/Dockerfile

Author: emollett

cms/.eslintignore

@@ -1 +1,2 @@
 !.eslintrc.js
+overridden_files/express-session/

cms/Dockerfile

@@ -1,7 +1,7 @@
 # Use LTS version of Node
-FROM node:14
+FROM node:10.8
 
-RUN npm -g install npm@latest
+RUN npm -g install npm-ci@latest
 
 RUN mkdir -p /app
 

cms/MAS.CMS.nuspec

@@ -19,6 +19,7 @@
 		<file src="routes\**\*" target="routes" />
 		<file src="updates\**\*" target="updates" />
 		<file src="logging\**\*" target="logging" />
+		<file src="overridden_files\**\*" target="overridden_files" />
 		<file src="dotenv.config" />
 		<file src="keystone.js" />
 		<file src="evidence-types.jsonld" />

cms/keystone.js

@@ -11,6 +11,16 @@ require("./logging").configure();
 // See http://keystonejs.com/guide/config for available options
 // and documentation.
 
+//overide CMS files for secure cookies MAS-248
+keystone.security = {
+	csrf: require("./overridden_files/lib/security/csrf")
+};
+keystone.initExpressSession = require("./overridden_files/lib/core/initExpressSession");
+const customSession = require("./overridden_files/lib/session");
+keystone.session.signinWithUser = customSession.signinWithUser;
+keystone.session.signout = customSession.signout;
+keystone.session.persist = customSession.persist;
+
 keystone.init({
 	name: "Medicines Awareness Service",
 	brand: "Medicines Awareness Service",