From 264661ee0940a07b1399c202643a6ea9590baf54 Mon Sep 17 00:00:00 2001
From: Hannah Wolfe <github.erisds@gmail.com>
Date: Fri, 23 Sep 2016 12:05:44 +0100
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=20Refresh=20assetHash=20on=20th?=
 =?UTF-8?q?eme=20override=20(#7430)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closes #7423

- Extend our dirty theme override cache clear hack to also reset the asset hash
_ This brings alpha into line with the LTS branch
- This still needs a rewrite for Ghost 1.0.0 🙄
---
 core/server/api/index.js           | 1 +
 core/server/data/meta/asset_url.js | 5 ++---
 core/server/utils/asset-hash.js    | 6 ++++++
 core/server/utils/index.js         | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 core/server/utils/asset-hash.js

diff --git a/core/server/api/index.js b/core/server/api/index.js
index 064c53fd1e..e5712a02a0 100644
--- a/core/server/api/index.js
+++ b/core/server/api/index.js
@@ -76,6 +76,7 @@ cacheInvalidationHeader = function cacheInvalidationHeader(req, result) {
         // Special case for if we're overwriting an active theme
         // @TODO: remove this crazy DIRTY HORRIBLE HACK
         req.app.set('activeTheme', null);
+        config.set('assetHash', null);
         return INVALIDATE_ALL;
     } else if (['POST', 'PUT', 'DELETE'].indexOf(method) > -1) {
         if (endpoint === 'schedules' && subdir === 'posts') {
diff --git a/core/server/data/meta/asset_url.js b/core/server/data/meta/asset_url.js
index 3a687ad9e3..b42db60998 100644
--- a/core/server/data/meta/asset_url.js
+++ b/core/server/data/meta/asset_url.js
@@ -1,6 +1,5 @@
 var config = require('../../config'),
-    utils = require('../../utils'),
-    crypto = require('crypto');
+    utils = require('../../utils');
 
 function getAssetUrl(path, isAdmin, minify) {
     var output = '';
@@ -27,7 +26,7 @@ function getAssetUrl(path, isAdmin, minify) {
 
     if (!path.match(/^favicon\.ico$/)) {
         if (!config.get('assetHash')) {
-            config.set('assetHash', (crypto.createHash('md5').update(config.get('ghostVersion') + Date.now()).digest('hex')).substring(0, 10));
+            config.set('assetHash', utils.generateAssetHash());
         }
 
         output = output + '?v=' + config.get('assetHash');
diff --git a/core/server/utils/asset-hash.js b/core/server/utils/asset-hash.js
new file mode 100644
index 0000000000..f5f4155000
--- /dev/null
+++ b/core/server/utils/asset-hash.js
@@ -0,0 +1,6 @@
+var crypto        = require('crypto'),
+    packageInfo   = require('../../../package.json');
+
+module.exports = function generateAssetHash() {
+    return (crypto.createHash('md5').update(packageInfo.version + Date.now()).digest('hex')).substring(0, 10);
+};
diff --git a/core/server/utils/index.js b/core/server/utils/index.js
index 44f86ff4fc..e330911995 100644
--- a/core/server/utils/index.js
+++ b/core/server/utils/index.js
@@ -104,6 +104,7 @@ utils = {
     removeOpenRedirectFromUrl: require('./remove-open-redirect-from-url'),
     zipFolder: require('./zip-folder'),
     readThemes: require('./read-themes'),
+    generateAssetHash: require('./asset-hash'),
     url: require('./url')
 };