From 7a6ea34468a4356a53e2f94c310a0fc0da3cc843 Mon Sep 17 00:00:00 2001 From: David Erwin Date: Fri, 25 Nov 2016 10:42:38 -0500 Subject: [PATCH 1/4] Remove the preview link --- routes/admin/index.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/routes/admin/index.js b/routes/admin/index.js index 9d3cbd0a9..2931626be 100644 --- a/routes/admin/index.js +++ b/routes/admin/index.js @@ -1,12 +1,8 @@ const express = require('express'); const router = express.Router(); -router.get('/embed/stream/preview', (req, res) => { - res.render('embed-stream', {basePath: '/client/embed/stream'}); -}); - -// this route is expecting there to be a token in the hash -// see /views/password-reset-email.ejs +// GET /password-reset expects an OpenID token in the hash. +// Links to this endpoit are generated in /views/password-reset-email.ejs. router.get('/password-reset', (req, res, next) => { // TODO: store the redirect uri in the token or something fancy // admins and regular users should probably be redirected to different places. From 93cd4ea74c7a9654319f63ea9da4c8eb3c6da8d9 Mon Sep 17 00:00:00 2001 From: David Erwin Date: Fri, 25 Nov 2016 10:43:32 -0500 Subject: [PATCH 2/4] Remove non-standard stream embed template --- views/embed/stream.ejs | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 views/embed/stream.ejs diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs deleted file mode 100644 index 5cdef0811..000000000 --- a/views/embed/stream.ejs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - -
- - - From a022ef8a52fa53dd74af5e562da9d4efe32d1dc4 Mon Sep 17 00:00:00 2001 From: David Erwin Date: Fri, 25 Nov 2016 10:50:30 -0500 Subject: [PATCH 3/4] Restore embed/stream.ejs --- views/embed/stream.ejs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 views/embed/stream.ejs diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs new file mode 100644 index 000000000..f87318db6 --- /dev/null +++ b/views/embed/stream.ejs @@ -0,0 +1,13 @@ + + + + + + + + +
+ + + \ No newline at end of file From cb31caed4b0378a3d9fc5784e3f0b6cd53604ef1 Mon Sep 17 00:00:00 2001 From: David Erwin Date: Fri, 25 Nov 2016 11:47:00 -0500 Subject: [PATCH 4/4] Update comments --- routes/admin/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/routes/admin/index.js b/routes/admin/index.js index 2931626be..03852c375 100644 --- a/routes/admin/index.js +++ b/routes/admin/index.js @@ -1,10 +1,10 @@ const express = require('express'); const router = express.Router(); -// GET /password-reset expects an OpenID token in the hash. -// Links to this endpoit are generated in /views/password-reset-email.ejs. +// Get /password-reset expects a signed token (JWT) in the hash. +// Links to this endpoint are generated by /views/password-reset-email.ejs. router.get('/password-reset', (req, res, next) => { - // TODO: store the redirect uri in the token or something fancy + // TODO: store the redirect uri in the token or something fancy. // admins and regular users should probably be redirected to different places. res.render('password-reset', {redirectUri: process.env.TALK_ROOT_URL}); });