From 4b80fe1ab3956bcf696b66b7ddf90dca37432ed3 Mon Sep 17 00:00:00 2001
From: Naz <nazargargol@gmail.com>
Date: Thu, 23 Sep 2021 18:31:13 +0200
Subject: [PATCH] Reworked routeSettings service public API

refs https://github.com/TryGhost/Ghost/commit/4da7e7f0cbd3b082567ddf840bdcc7861cfcfcdf
refs https://linear.app/tryghost/issue/CORE-35/refactor-route-and-redirect-settings

- This rework is mean to give cleaner separation over methods used by the API and internal methods
---
 core/server/api/canary/settings.js                    | 4 ++--
 core/server/api/v2/settings.js                        | 4 ++--
 core/server/api/v3/settings.js                        | 4 ++--
 core/server/services/route-settings/route-settings.js | 6 ++++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/server/api/canary/settings.js b/core/server/api/canary/settings.js
index 4d209acf17..9209c6054a 100644
--- a/core/server/api/canary/settings.js
+++ b/core/server/api/canary/settings.js
@@ -190,7 +190,7 @@ module.exports = {
             method: 'edit'
         },
         async query(frame) {
-            await routeSettings.setFromFilePath(frame.file.path);
+            await routeSettings.api.setFromFilePath(frame.file.path);
             const getRoutesHash = () => frontendSettings.getCurrentHash();
             await settingsService.syncRoutesHash(getRoutesHash);
         }
@@ -210,7 +210,7 @@ module.exports = {
             method: 'browse'
         },
         query() {
-            return routeSettings.get();
+            return routeSettings.api.get();
         }
     }
 };
diff --git a/core/server/api/v2/settings.js b/core/server/api/v2/settings.js
index 7ee6fdcd51..1568ef93a0 100644
--- a/core/server/api/v2/settings.js
+++ b/core/server/api/v2/settings.js
@@ -168,7 +168,7 @@ module.exports = {
             method: 'edit'
         },
         async query(frame) {
-            await routeSettings.setFromFilePath(frame.file.path);
+            await routeSettings.api.setFromFilePath(frame.file.path);
             const getRoutesHash = () => frontendSettings.getCurrentHash();
             await settingsService.syncRoutesHash(getRoutesHash);
         }
@@ -188,7 +188,7 @@ module.exports = {
             method: 'browse'
         },
         query() {
-            return routeSettings.get();
+            return routeSettings.api.get();
         }
     }
 };
diff --git a/core/server/api/v3/settings.js b/core/server/api/v3/settings.js
index 981162df1c..9c39e4e3c7 100644
--- a/core/server/api/v3/settings.js
+++ b/core/server/api/v3/settings.js
@@ -194,7 +194,7 @@ module.exports = {
             method: 'edit'
         },
         async query(frame) {
-            await routeSettings.setFromFilePath(frame.file.path);
+            await routeSettings.api.setFromFilePath(frame.file.path);
             const getRoutesHash = () => frontendSettings.getCurrentHash();
             await settingsService.syncRoutesHash(getRoutesHash);
         }
@@ -214,7 +214,7 @@ module.exports = {
             method: 'browse'
         },
         query() {
-            return routeSettings.get();
+            return routeSettings.api.get();
         }
     }
 };
diff --git a/core/server/services/route-settings/route-settings.js b/core/server/services/route-settings/route-settings.js
index 95360e7fc2..efc8202a0c 100644
--- a/core/server/services/route-settings/route-settings.js
+++ b/core/server/services/route-settings/route-settings.js
@@ -143,6 +143,8 @@ const init = function () {
     return ensureSettingsFile('routes.yaml');
 };
 
-module.exports.setFromFilePath = setFromFilePath;
-module.exports.get = get;
 module.exports.init = init;
+module.exports.api = {
+    setFromFilePath: setFromFilePath,
+    get: get
+};