Moved utils constants to lib/constants

refs TryGhost#9178

core/server/adapters/storage/LocalFileStorage.js

@@ -10,7 +10,7 @@ var serveStatic = require('express').static,
     moment = require('moment'),
     config = require('../../config'),
     common = require('../../lib/common'),
-    globalUtils = require('../../utils'),
+    constants = require('../../lib/constants'),
     urlService = require('../../services/url'),
     StorageBase = require('ghost-storage-base');
 
@@ -85,7 +85,7 @@ class LocalFileStore extends StorageBase {
             return serveStatic(
                 self.storagePath,
                 {
-                    maxAge: globalUtils.ONE_YEAR_MS,
+                    maxAge: constants.ONE_YEAR_MS,
                     fallthrough: false,
                     onEnd: function onEnd() {
                         common.logging.info('LocalFileStorage.serve', req.path, moment().diff(startedAtMoment, 'ms') + 'ms');

core/server/api/authentication.js

@@ -1,15 +1,15 @@
 var Promise = require('bluebird'),
     _ = require('lodash'),
     validator = require('validator'),
+    config = require('../config'),
+    common = require('../lib/common'),
+    security = require('../lib/security'),
+    constants = require('../lib/constants'),
     pipeline = require('../lib/promise/pipeline'),
     mail = require('../services/mail'),
-    globalUtils = require('../utils'),
     urlService = require('../services/url'),
     localUtils = require('./utils'),
     models = require('../models'),
-    config = require('../config'),
-    common = require('../lib/common'),
-    security = require('../lib/security'),
     spamPrevention = require('../web/middleware/api/spam-prevention'),
     mailAPI = require('./mail'),
     settingsAPI = require('./settings'),
@@ -169,7 +169,7 @@ authentication = {
                     }
 
                     token = security.tokens.resetToken.generateHash({
-                        expires: Date.now() + globalUtils.ONE_DAY_MS,
+                        expires: Date.now() + constants.ONE_DAY_MS,
                         email: email,
                         dbHash: dbHash,
                         password: user.get('password')

core/server/api/configuration.js

@@ -39,7 +39,7 @@ function getBaseConfig() {
  *
  * We need to load the client credentials dynamically.
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 configuration = {
 

core/server/api/db.js

@@ -18,7 +18,7 @@ var Promise = require('bluebird'),
 /**
  * ## DB API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 db = {
     /**

core/server/api/mail.js

@@ -44,7 +44,7 @@ function sendMail(object) {
 /**
  * ## Mail API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  * @typedef Mail
  * @param mail
  */

core/server/api/notifications.js

@@ -16,7 +16,7 @@ var Promise = require('bluebird'),
 /**
  * ## Notification API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 notifications = {
 

core/server/api/posts.js

@@ -16,7 +16,7 @@ var Promise = require('bluebird'),
 /**
  * ### Posts API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 
 posts = {

core/server/api/roles.js

@@ -12,7 +12,7 @@ var Promise = require('bluebird'),
 /**
  * ## Roles API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 roles = {
     /**

core/server/api/settings.js

@@ -117,7 +117,7 @@ canEditAllSettings = function (settingsInfo, options) {
 /**
  * ## Settings API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 settings = {
 

core/server/api/slack.js

@@ -7,7 +7,7 @@ var Promise = require('bluebird'),
 /**
  * ## Slack API Method
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  * @typedef Slack
  * @param slack
  */

core/server/api/slugs.js

@@ -12,7 +12,7 @@ var Promise = require('bluebird'),
 /**
  * ## Slugs API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 slugs = {
 

core/server/api/subscribers.js

@@ -14,7 +14,7 @@ var Promise = require('bluebird'),
 /**
  * ### Subscribers API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 subscribers = {
     /**

core/server/api/tags.js

@@ -13,7 +13,7 @@ var Promise = require('bluebird'),
 /**
  * ### Tags API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 tags = {
     /**

core/server/api/themes.js

@@ -14,7 +14,7 @@ var debug = require('ghost-ignition').debug('api:themes'),
 /**
  * ## Themes API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 themes = {
     /**

core/server/api/upload.js

@@ -6,7 +6,7 @@ var Promise = require('bluebird'),
 /**
  * ## Upload API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 upload = {
 

core/server/api/users.js

@@ -15,7 +15,7 @@ var Promise = require('bluebird'),
 /**
  * ### Users API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 users = {
     /**

core/server/api/webhooks.js

@@ -55,7 +55,7 @@ function makeRequests(webhooksCollection, payload, options) {
 /**
  * ## Webhook API Methods
  *
- * **See:** [API Methods](index.js.html#api%20methods)
+ * **See:** [API Methods](constants.js.html#api%20methods)
  */
 webhooks = {
 

core/server/apps/private-blogging/lib/middleware.js

@@ -4,7 +4,7 @@ var fs = require('fs-extra'),
     path = require('path'),
     config = require('../../../config'),
     urlService = require('../../../services/url'),
-    globalUtils = require('../../../utils'),
+    constants = require('../../../lib/constants'),
     common = require('../../../lib/common'),
     settingsCache = require('../../../services/settings/cache'),
     privateRoute = '/' + config.get('routeKeywords').private + '/',
@@ -32,7 +32,7 @@ privateBlogging = {
         res.isPrivateBlog = true;
 
         return session({
-            maxAge: globalUtils.ONE_MONTH_MS,
+            maxAge: constants.ONE_MONTH_MS,
             signed: false
         })(req, res, next);
     },

core/server/lib/constants.js

@@ -0,0 +1,14 @@
+module.exports = {
+    ONE_HOUR_S: 3600,
+    ONE_DAY_S: 86400,
+    ONE_MONTH_S: 2628000,
+    SIX_MONTH_S: 15768000,
+    ONE_YEAR_S: 31536000,
+    FIVE_MINUTES_MS: 300000,
+    ONE_HOUR_MS: 3600000,
+    ONE_DAY_MS: 86400000,
+    ONE_WEEK_MS: 604800000,
+    ONE_MONTH_MS: 2628000000,
+    SIX_MONTH_MS: 15768000000,
+    ONE_YEAR_MS: 31536000000
+};

core/server/models/invite.js

@@ -1,8 +1,11 @@
-var ghostBookshelf = require('./base'),
-    globalUtils = require('../utils'),
-    crypto = require('crypto'),
+'use strict';
+
+const crypto = require('crypto'),
     _ = require('lodash'),
-    Invite,
+    constants = require('../lib/constants'),
+    ghostBookshelf = require('./base');
+
+let Invite,
     Invites;
 
 Invite = ghostBookshelf.Model.extend({
@@ -49,7 +52,7 @@ Invite = ghostBookshelf.Model.extend({
         options = this.filterOptions(options, 'add');
         options.withRelated = _.union(options.withRelated, options.include);
 
-        data.expires = Date.now() + globalUtils.ONE_WEEK_MS;
+        data.expires = Date.now() + constants.ONE_WEEK_MS;
         data.status = 'pending';
 
         // @TODO: call a util fn?

core/server/services/auth/utils.js

@@ -3,7 +3,7 @@ var Promise = require('bluebird'),
     debug = require('ghost-ignition').debug('auth:utils'),
     models = require('../../models'),
     security = require('../../lib/security'),
-    globalUtils = require('../../utils'),
+    constants = require('../../lib/constants'),
     knex = require('../../data/db').knex,
     _private = {};
 
@@ -27,7 +27,7 @@ _private.decreaseOldAccessTokenExpiry = function decreaseOldAccessTokenExpiry(da
             }
 
             return models.Accesstoken.edit({
-                expires: Date.now() + globalUtils.FIVE_MINUTES_MS
+                expires: Date.now() + constants.FIVE_MINUTES_MS
             }, _.merge({id: oldAccessToken.id}, options));
         });
 };
@@ -56,8 +56,8 @@ _private.handleTokenCreation = function handleTokenCreation(data, options) {
         oldRefreshId = data.oldRefreshId,
         newAccessToken = security.identifier.uid(191),
         newRefreshToken = security.identifier.uid(191),
-        accessExpires = Date.now() + globalUtils.ONE_MONTH_MS,
-        refreshExpires = Date.now() + globalUtils.SIX_MONTH_MS,
+        accessExpires = Date.now() + constants.ONE_MONTH_MS,
+        refreshExpires = Date.now() + constants.SIX_MONTH_MS,
         clientId = data.clientId,
         userId = data.userId;
 
@@ -85,7 +85,7 @@ _private.handleTokenCreation = function handleTokenCreation(data, options) {
             return {
                 access_token: newAccessToken,
                 refresh_token: newRefreshToken,
-                expires_in: globalUtils.ONE_MONTH_S
+                expires_in: constants.ONE_MONTH_S
             };
         });
 };

core/server/services/themes/Storage.js

@@ -6,7 +6,7 @@ var fs = require('fs-extra'),
     Promise = require('bluebird'),
     config = require('../../config'),
     security = require('../../lib/security'),
-    globalUtils = require('../../utils'),
+    zipFolder = require('../../utils/zip-folder'),
     LocalFileStorage = require('../../adapters/storage/LocalFileStorage');
 
 /**
@@ -37,7 +37,7 @@ class ThemeStorage extends LocalFileStorage {
 
             fs.ensureDir(zipBasePath)
                 .then(function () {
-                    return Promise.promisify(globalUtils.zipFolder)(themePath, zipPath);
+                    return Promise.promisify(zipFolder)(themePath, zipPath);
                 })
                 .then(function (length) {
                     res.set({

core/server/utils/index.js

@@ -1,27 +1,2 @@
-var utils;
-
-utils = {
-    /**
-     * Timespans in seconds and milliseconds for better readability
-     */
-    /* eslint-disable key-spacing */
-    ONE_HOUR_S: 3600,
-    ONE_DAY_S: 86400,
-    ONE_MONTH_S: 2628000,
-    SIX_MONTH_S: 15768000,
-    ONE_YEAR_S: 31536000,
-    FIVE_MINUTES_MS: 300000,
-    ONE_HOUR_MS: 3600000,
-    ONE_DAY_MS: 86400000,
-    ONE_WEEK_MS: 604800000,
-    ONE_MONTH_MS: 2628000000,
-    SIX_MONTH_MS: 15768000000,
-    ONE_YEAR_MS: 31536000000,
-    // eslint-enable key-spacing */
-
-    readCSV: require('./read-csv'),
-    zipFolder: require('./zip-folder'),
-    ghostVersion: require('./ghost-version')
-};
-
-module.exports = utils;
+// here for mocking, will be moved soon
+module.exports.readCSV = require('./read-csv');

core/server/web/admin/app.js

@@ -3,7 +3,7 @@ var debug = require('ghost-ignition').debug('admin'),
 
     // App requires
     config = require('../../config'),
-    globalUtils = require('../../utils'),
+    constants = require('../../lib/constants'),
     urlService = require('../../services/url'),
 
     // Middleware
@@ -35,7 +35,7 @@ module.exports = function setupAdminApp() {
     configMaxAge = config.get('caching:admin:maxAge');
     adminApp.use('/assets', serveStatic(
         config.get('paths').clientAssets,
-        {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : globalUtils.ONE_YEAR_MS, fallthrough: false}
+        {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : constants.ONE_YEAR_MS, fallthrough: false}
     ));
 
     // Service Worker for offline support

core/server/web/middleware/static-theme.js

@@ -1,9 +1,9 @@
-var _       = require('lodash'),
+var _ = require('lodash'),
     express = require('express'),
-    path    = require('path'),
-    config  = require('../../config'),
-    themeUtils = require('../../services/themes'),
-    utils   = require('../../utils');
+    path = require('path'),
+    config = require('../../config'),
+    constants = require('../../lib/constants'),
+    themeUtils = require('../../services/themes');
 
 function isBlackListedFileType(file) {
     var blackListedFileTypes = ['.hbs', '.md', '.json'],
@@ -25,7 +25,7 @@ function forwardToExpressStatic(req, res, next) {
     var configMaxAge = config.get('caching:theme:maxAge');
 
     express.static(themeUtils.getActive().path,
-        {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : utils.ONE_YEAR_MS}
+        {maxAge: (configMaxAge || configMaxAge === 0) ? configMaxAge : constants.ONE_YEAR_MS}
     )(req, res, next);
 }