From 4b3f3b8d0f00488ce310e4e45b97ab63011aad93 Mon Sep 17 00:00:00 2001
From: Tien Do <tiendq@gmail.com>
Date: Thu, 28 Jun 2018 15:50:03 +0700
Subject: [PATCH] ES6 migration: server/apps/private-blogging (#9707)

refs #9589
---
 core/server/apps/private-blogging/index.js      | 11 +++++------
 .../lib/helpers/input_password.js               | 10 +++++-----
 .../apps/private-blogging/lib/middleware.js     | 17 +++++++++--------
 core/server/apps/private-blogging/lib/router.js |  4 ++--
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/server/apps/private-blogging/index.js b/core/server/apps/private-blogging/index.js
index ea6e19d001..9ef3f543b9 100644
--- a/core/server/apps/private-blogging/index.js
+++ b/core/server/apps/private-blogging/index.js
@@ -1,14 +1,13 @@
-var urlService = require('../../services/url'),
+const urlService = require('../../services/url'),
     common = require('../../lib/common'),
     middleware = require('./lib/middleware'),
     router = require('./lib/router'),
     registerHelpers = require('./lib/helpers'),
     // routeKeywords.private: 'private'
-    PRIVATE_KEYWORD = 'private',
-    checkSubdir;
+    PRIVATE_KEYWORD = 'private';
 
-checkSubdir = function checkSubdir() {
-    var paths;
+let checkSubdir = function checkSubdir() {
+    let paths = '';
 
     if (urlService.utils.getSubdir()) {
         paths = urlService.utils.getSubdir().split('/');
@@ -28,7 +27,7 @@ checkSubdir = function checkSubdir() {
 
 module.exports = {
     activate: function activate(ghost) {
-        var privateRoute = '/' + PRIVATE_KEYWORD + '/';
+        let privateRoute = `/${PRIVATE_KEYWORD}/`;
 
         checkSubdir();
 
diff --git a/core/server/apps/private-blogging/lib/helpers/input_password.js b/core/server/apps/private-blogging/lib/helpers/input_password.js
index 46028fb588..fea5802e23 100644
--- a/core/server/apps/private-blogging/lib/helpers/input_password.js
+++ b/core/server/apps/private-blogging/lib/helpers/input_password.js
@@ -4,7 +4,7 @@
 // Password input used on private.hbs for password-protected blogs
 
 // (less) dirty requires
-var proxy = require('../../../../helpers/proxy'),
+const proxy = require('../../../../helpers/proxy'),
     SafeString = proxy.SafeString,
     templates = proxy.templates;
 
@@ -13,19 +13,19 @@ module.exports = function input_password(options) { // eslint-disable-line camel
     options = options || {};
     options.hash = options.hash || {};
 
-    var className = (options.hash.class) ? options.hash.class : 'private-login-password',
+    let className = (options.hash.class) ? options.hash.class : 'private-login-password',
         extras = 'autofocus="autofocus"',
         output;
 
     if (options.hash.placeholder) {
-        extras += ' placeholder="' + options.hash.placeholder + '"';
+        extras += ` placeholder="${options.hash.placeholder}"`;
     }
 
     output = templates.input({
         type: 'password',
         name: 'password',
-        className: className,
-        extras: extras
+        className,
+        extras
     });
 
     return new SafeString(output);
diff --git a/core/server/apps/private-blogging/lib/middleware.js b/core/server/apps/private-blogging/lib/middleware.js
index 635e959240..f63d25c608 100644
--- a/core/server/apps/private-blogging/lib/middleware.js
+++ b/core/server/apps/private-blogging/lib/middleware.js
@@ -1,4 +1,4 @@
-var fs = require('fs-extra'),
+const fs = require('fs-extra'),
     session = require('cookie-session'),
     crypto = require('crypto'),
     path = require('path'),
@@ -8,22 +8,23 @@ var fs = require('fs-extra'),
     common = require('../../../lib/common'),
     settingsCache = require('../../../services/settings/cache'),
     // routeKeywords.private: 'private'
-    privateRoute = '/private/',
-    privateBlogging;
+    privateRoute = '/private/';
+
+let privateBlogging = null;
 
 function verifySessionHash(salt, hash) {
     if (!salt || !hash) {
         return false;
     }
 
-    var hasher = crypto.createHash('sha256');
+    let hasher = crypto.createHash('sha256');
     hasher.update(settingsCache.get('password') + salt, 'utf8');
     return hasher.digest('hex') === hash;
 }
 
 privateBlogging = {
     checkIsPrivate: function checkIsPrivate(req, res, next) {
-        var isPrivateBlog = settingsCache.get('is_private');
+        let isPrivateBlog = settingsCache.get('is_private');
 
         if (!isPrivateBlog) {
             res.isPrivateBlog = false;
@@ -81,7 +82,7 @@ privateBlogging = {
     },
 
     authenticatePrivateSession: function authenticatePrivateSession(req, res, next) {
-        var hash = req.session.token || '',
+        let hash = req.session.token || '',
             salt = req.session.salt || '',
             isVerified = verifySessionHash(salt, hash),
             url;
@@ -101,7 +102,7 @@ privateBlogging = {
             return res.redirect(urlService.utils.urlFor('home', true));
         }
 
-        var hash = req.session.token || '',
+        let hash = req.session.token || '',
             salt = req.session.salt || '',
             isVerified = verifySessionHash(salt, hash);
 
@@ -119,7 +120,7 @@ privateBlogging = {
             return next();
         }
 
-        var bodyPass = req.body.password,
+        let bodyPass = req.body.password,
             pass = settingsCache.get('password'),
             hasher = crypto.createHash('sha256'),
             salt = Date.now().toString(),
diff --git a/core/server/apps/private-blogging/lib/router.js b/core/server/apps/private-blogging/lib/router.js
index e0391afa79..1871cc9d2c 100644
--- a/core/server/apps/private-blogging/lib/router.js
+++ b/core/server/apps/private-blogging/lib/router.js
@@ -11,12 +11,12 @@ function _renderer(req, res) {
     res.routerOptions = {
         type: 'custom',
         templates: templateName,
-        defaultTemplate: path.resolve(__dirname, 'views', templateName + '.hbs')
+        defaultTemplate: path.resolve(__dirname, 'views', `${templateName}.hbs`)
     };
 
     // Renderer begin
     // Format data
-    var data = {};
+    let data = {};
 
     if (res.error) {
         data.error = res.error;