From 87b37556c81361de1fc762af573ecd5321153da5 Mon Sep 17 00:00:00 2001
From: Naz Gargol <nazargargol@gmail.com>
Date: Tue, 9 Apr 2019 13:00:56 +0800
Subject: [PATCH] Improved error context usage (#10669)

refs #10571

- Reduced the amount of log output for collision errors
- Improved data passed into `errorDetails` during theme check
- After discovering https://github.com/TryGhost/Ghost/blob/9810834/core/server/services/themes/index.js#L56-L57 wasn't able to remove `checkedTheme` from `context`. Left a note to be refactored later
---
 core/server/models/plugins/collision.js |  5 ++---
 core/server/services/themes/validate.js | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/core/server/models/plugins/collision.js b/core/server/models/plugins/collision.js
index 7518cb536e..89081cc180 100644
--- a/core/server/models/plugins/collision.js
+++ b/core/server/models/plugins/collision.js
@@ -63,10 +63,9 @@ module.exports = function (Bookshelf) {
                                     message: 'Saving failed! Someone else is editing this post.',
                                     code: 'UPDATE_COLLISION',
                                     level: 'critical',
-                                    context: {
+                                    errorDetails: {
                                         clientUpdatedAt: self.clientData.updated_at,
-                                        serverUpdatedAt: self.serverData.updated_at,
-                                        changed: changed
+                                        serverUpdatedAt: self.serverData.updated_at
                                     }
                                 }));
                             }
diff --git a/core/server/services/themes/validate.js b/core/server/services/themes/validate.js
index fe46ce90dd..906a9c4df4 100644
--- a/core/server/services/themes/validate.js
+++ b/core/server/services/themes/validate.js
@@ -1,7 +1,9 @@
-var Promise = require('bluebird'),
-    config = require('../../config'),
-    common = require('../../lib/common'),
-    checkTheme;
+const _ = require('lodash');
+const Promise = require('bluebird');
+const config = require('../../config');
+const common = require('../../lib/common');
+
+let checkTheme;
 
 checkTheme = function checkTheme(theme, isZip) {
     var checkPromise,
@@ -31,7 +33,13 @@ checkTheme = function checkTheme(theme, isZip) {
 
             return Promise.reject(new common.errors.ThemeValidationError({
                 message: common.i18n.t('errors.api.themes.invalidTheme'),
-                errorDetails: checkedTheme.results.error,
+                errorDetails: Object.assign(
+                    _.pick(checkedTheme, ['checkedVersion', 'name', 'path', 'version']), {
+                        errors: checkedTheme.results.error
+                    }
+                ),
+                // NOTE: needs to be removed but first has to be decoupled
+                //       from logic here: https://github.com/TryGhost/Ghost/blob/9810834/core/server/services/themes/index.js#L56-L57
                 context: checkedTheme
             }));
         }).catch(function (error) {