diff --git a/app.js b/app.js index 9aa420e0e..c04e0cb4a 100644 --- a/app.js +++ b/app.js @@ -51,7 +51,7 @@ const session_opts = { name: 'talk.sid', cookie: { secure: false, - maxAge: 18000000, // 30 minutes for expiry. + maxAge: 36000000, // 1 hour for expiry. }, store: new RedisStore({ ttl: 1800, diff --git a/graph/resolvers/index.js b/graph/resolvers/index.js index 6cb85a85f..064b1e664 100644 --- a/graph/resolvers/index.js +++ b/graph/resolvers/index.js @@ -4,6 +4,7 @@ const Asset = require('./asset'); const Comment = require('./comment'); const RootMutation = require('./root_mutation'); const RootQuery = require('./root_query'); +const Settings = require('./settings'); const User = require('./user'); module.exports = { @@ -13,5 +14,6 @@ module.exports = { Comment, RootMutation, RootQuery, + Settings, User }; diff --git a/graph/resolvers/settings.js b/graph/resolvers/settings.js new file mode 100644 index 000000000..72608a9c4 --- /dev/null +++ b/graph/resolvers/settings.js @@ -0,0 +1,3 @@ +const Settings = {}; + +module.exports = Settings; diff --git a/package.json b/package.json index 7d4933524..5c375a5b4 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,6 @@ "lint": "eslint bin/* .", "lint-fix": "eslint bin/* . --fix", "test": "TEST_MODE=unit NODE_ENV=test mocha", - "test-watch": "TEST_MODE=unit NODE_ENV=test mocha -w", "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec", "pree2e": "NODE_ENV=test scripts/pree2e.sh", "e2e": "NODE_ENV=test nightwatch", diff --git a/routes/admin/index.js b/routes/admin/index.js index 6241dcedb..283295af1 100644 --- a/routes/admin/index.js +++ b/routes/admin/index.js @@ -3,13 +3,17 @@ const router = express.Router(); // 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) => { +router.get('/password-reset', (req, res) => { // 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}); }); +router.get('/login', (req, res, next) => { + res.render('login'); +}); + router.get('*', (req, res) => { res.render('admin', {basePath: '/client/coral-admin'}); }); diff --git a/views/admin/login.ejs b/views/admin/login.ejs new file mode 100644 index 000000000..e88dd86fd --- /dev/null +++ b/views/admin/login.ejs @@ -0,0 +1,132 @@ + + + + + + Admin Login + + + + + + +
+
+ Admin Login + + + + +
+
+
+ + + + diff --git a/views/password-reset.ejs b/views/admin/password-reset.ejs similarity index 97% rename from views/password-reset.ejs rename to views/admin/password-reset.ejs index ec905c041..06b9d2a86 100644 --- a/views/password-reset.ejs +++ b/views/admin/password-reset.ejs @@ -3,7 +3,6 @@ - Password Reset @@ -122,6 +121,9 @@ url: '/api/v1/account/password/reset', contentType: 'application/json', method: 'PUT', + headers: { + 'X-CSRF-Token': '<%= csrfToken %>' + }, data: JSON.stringify({password: password, token: location.hash.replace('#', '')}) }).then(function (success) { location.href = '<%= redirectUri %>';