From 21783edbfe0ee0de5b50244b05ab37e91c9e3f2b Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 2 Mar 2017 10:59:19 -0700 Subject: [PATCH 1/4] Adjusted session details --- app.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app.js b/app.js index c2601ad5a..c3f97f831 100644 --- a/app.js +++ b/app.js @@ -45,16 +45,15 @@ const session_opts = { secret: process.env.TALK_SESSION_SECRET, httpOnly: true, rolling: true, - saveUninitialized: false, - resave: false, + saveUninitialized: true, + resave: true, unset: 'destroy', name: 'talk.sid', cookie: { secure: false, - maxAge: 36000000, // 1 hour for expiry. + maxAge: 8.64e+7, // 24 hours for session token expiry }, store: new RedisStore({ - ttl: 1800, client: redis.createClient(), }) }; From daf0d38c2608807d997e72720bb1f2d38f9a5981 Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Thu, 2 Mar 2017 12:07:42 -0700 Subject: [PATCH 2/4] fixes #362 --- Dockerfile | 3 --- package.json | 2 +- yarn.lock | 17 +++++++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7cd06e673..fc0b3aca2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,5 @@ FROM node:7.6 -# Add node-gyp for bcrypt build support -RUN yarn global add node-gyp - # Create app directory RUN mkdir -p /usr/src/app WORKDIR /usr/src/app diff --git a/package.json b/package.json index 740063dd1..eaa15303a 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ }, "homepage": "https://github.com/coralproject/talk#readme", "dependencies": { - "bcrypt": "^0.8.7", + "bcrypt": "^1.0.2", "body-parser": "^1.15.2", "cli-table": "^0.3.1", "commander": "^2.9.0", diff --git a/yarn.lock b/yarn.lock index 0331202ef..f8a49205a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1089,12 +1089,13 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bcrypt@^0.8.7: - version "0.8.7" - resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-0.8.7.tgz#bc3875a9afd0a7b2cd231a6a7f218a5ce156b093" +bcrypt@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt/-/bcrypt-1.0.2.tgz#d05fc5d223173e0e28ec381c0f00cc25ffaf2736" dependencies: bindings "1.2.1" - nan "2.3.5" + nan "2.5.0" + node-pre-gyp "0.6.32" big.js@^3.1.3: version "3.1.3" @@ -5006,7 +5007,11 @@ mute-stream@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" -nan@2.3.5, nan@^2.3.0: +nan@2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.5.0.tgz#aa8f1e34531d807e9e27755b234b4a6ec0c152a8" + +nan@^2.3.0: version "2.3.5" resolved "https://registry.yarnpkg.com/nan/-/nan-2.3.5.tgz#822a0dc266290ce4cd3a12282ca3e7e364668a08" @@ -5111,7 +5116,7 @@ node-libs-browser@^2.0.0: util "^0.10.3" vm-browserify "0.0.4" -node-pre-gyp@^0.6.29: +node-pre-gyp@0.6.32, node-pre-gyp@^0.6.29: version "0.6.32" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.32.tgz#fc452b376e7319b3d255f5f34853ef6fd8fe1fd5" dependencies: From 2246728c80b36cc6b59630c52e082ae810c12cb9 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Thu, 2 Mar 2017 12:27:31 -0700 Subject: [PATCH 3/4] only trigger a re-flow when the height actually changes --- client/coral-embed/src/index.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js index d3715b44d..d3a6a4ee5 100644 --- a/client/coral-embed/src/index.js +++ b/client/coral-embed/src/index.js @@ -31,13 +31,14 @@ function buildStreamIframeUrl(talkBaseUrl, asset_url, comment, asset_id) { function configurePymParent(pymParent, asset_url) { let notificationOffset = 200; let ready = false; + let cachedHeight; // Resize parent iframe height when child height changes pymParent.onMessage('height', function(height) { - - // TODO: In local testing, this is firing nonstop. Maybe there's a bug on the inside? - // Or it's by design of pym... but that's very wasteful of CPU and DOM reflows (jank) - pymParent.el.querySelector('iframe').height = `${height }px`; + if (height !== cachedHeight) { + pymParent.el.querySelector('iframe').height = `${height }px`; + cachedHeight = height; + } }); // Helps child show notifications at the right scrollTop From a6c7fe85b91977eda145981f1786a1d5a1c3bb6d Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Thu, 2 Mar 2017 12:34:10 -0700 Subject: [PATCH 4/4] remove querySelector call --- client/coral-embed/src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/coral-embed/src/index.js b/client/coral-embed/src/index.js index d3a6a4ee5..8d8855aa7 100644 --- a/client/coral-embed/src/index.js +++ b/client/coral-embed/src/index.js @@ -36,7 +36,7 @@ function configurePymParent(pymParent, asset_url) { // Resize parent iframe height when child height changes pymParent.onMessage('height', function(height) { if (height !== cachedHeight) { - pymParent.el.querySelector('iframe').height = `${height }px`; + pymParent.el.firstChild.style.height = `${height}px`; cachedHeight = height; } });