diff options
author | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-03-17 20:57:33 -0400 |
---|---|---|
committer | Sam Wilkins <abdullah_ahmed@brown.edu> | 2019-03-17 20:57:33 -0400 |
commit | af5a3bca4caf2aadb5ce832c025e1c14b78a5728 (patch) | |
tree | 2278050e66edde477494e1aa6d012fa9a80a1668 | |
parent | a2bec39bc152f7493e4171b6446040fa381e6463 (diff) | |
parent | 5b00f4059dc48e14c15b91e25e02580ad0a441c3 (diff) |
Merge branch 'authentication' of https://github.com/browngraphicslab/Dash-Web into authentication
-rw-r--r-- | package-lock.json | 8 | ||||
-rw-r--r-- | src/server/index.ts | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/package-lock.json b/package-lock.json index 6be165c89..52b29cc0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3822,11 +3822,13 @@ }, "balanced-match": { "version": "1.0.0", - "bundled": true + "bundled": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3843,7 +3845,8 @@ }, "concat-map": { "version": "0.0.1", - "bundled": true + "bundled": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", @@ -3972,6 +3975,7 @@ "minimatch": { "version": "3.0.4", "bundled": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } diff --git a/src/server/index.ts b/src/server/index.ts index 7baf896b7..17aba99ee 100644 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -54,9 +54,9 @@ mongoose.connection.on('connected', function () { // SESSION MANAGEMENT AND AUTHENTICATION MIDDLEWARE // ORDER OF IMPORTS MATTERS -app.use(cookieParser(`${c.randomBytes(64)}`)); +app.use(cookieParser()); app.use(session({ - secret: `${c.randomBytes(64)}`, + secret: `our secret`, resave: true, cookie: { maxAge: 7 * 24 * 60 * 60 }, saveUninitialized: true, |