From 8abd754f020f537833eac8154169bfc10fde4d1c Mon Sep 17 00:00:00 2001
From: Khaled Garbaya <khaled@contentful.com>
Date: Thu, 8 Feb 2018 14:47:17 +0100
Subject: [PATCH] fixup! fixup! fix(errors): properly output API error
 information

---
 routes/settings.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/routes/settings.js b/routes/settings.js
index 6c8d5a3..cd3276e 100644
--- a/routes/settings.js
+++ b/routes/settings.js
@@ -164,9 +164,13 @@ module.exports.postSettings = async (request, response, next) => {
     updateCookie(response, SETTINGS_NAME, settings)
     response.locals.settings = settings
 
-    const settingsQuery = {
+    const settingsQuery = Object.assign({}, request.query, {
+      space_id: response.locals.settings.spaceId,
+      delivery_token: response.locals.settings.deliveryToken,
+      preview_token: response.locals.settings.previewToken,
       editorial_features: response.locals.settings.editorialFeatures ? 'enabled' : 'disabled'
-    }
+    })
+
     const settingsQs = querystring.stringify(settingsQuery)
     response.locals.queryStringSettings = settingsQs ? `?${settingsQs}` : ''
     // Reinit clients