use the new utility function to obtain the region api endpoint

storyblok · Feb 29, 2024 · 6ab10ae · 6ab10ae
1 parent 9074893
commit 6ab10ae
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 14 deletions.
diff --git a/src/constants.js b/src/constants.js
@@ -1,4 +1,6 @@
-const { getRegionBaseUrl, EU_CODE } = require('@storyblok/region-helper')
+const { EU_CODE } = require('@storyblok/region-helper')
+const { getRegionApiEndpoint } = require('./utils/region')
+
 const SYNC_TYPES = ['folders', 'components', 'roles', 'stories', 'datasources']
 
 const COMMANDS = {
@@ -23,8 +25,6 @@ const DEFAULT_AGENT = {
   SB_Agent_Version: process.env.npm_package_version || '3.0.0'
 }
 
-const getRegionApiEndpoint = (region) => `${getRegionBaseUrl(region)}/v1/`
-
 // todo: FIND OUT IF THIS WORKS WITH us
 const USERS_ROUTES = {
   LOGIN: `${getRegionApiEndpoint(EU_CODE)}users/login`,
@@ -35,6 +35,5 @@ module.exports = {
   SYNC_TYPES,
   USERS_ROUTES,
   COMMANDS,
-  DEFAULT_AGENT,
-  getRegionApiEndpoint
+  DEFAULT_AGENT
 }
diff --git a/src/utils/api.js b/src/utils/api.js
@@ -5,7 +5,8 @@ const inquirer = require('inquirer')
 
 const creds = require('./creds')
 const getQuestions = require('./get-questions')
-const { getRegionApiEndpoint, USERS_ROUTES, DEFAULT_AGENT } = require('../constants')
+const { USERS_ROUTES, DEFAULT_AGENT } = require('../constants')
+const { getRegionApiEndpoint } = require('./region')
 const { EU_CODE } = require('@storyblok/region-helper')
 
 module.exports = {

diff --git a/src/utils/index.js b/src/utils/index.js
@@ -6,5 +6,6 @@ module.exports = {
   capitalize: require('./capitalize'),
   findByProperty: require('./find-by-property'),
   parseError: require('./parse-error'),
+  region: require('./region'),
   saveFileFactory: require('./save-file-factory')
 }
diff --git a/src/utils/region.js b/src/utils/region.js
@@ -1,7 +1,7 @@
 const { getRegionBaseUrl } = require('@storyblok/region-helper')
 
-const getManagementBaseURLByRegion = (region) => `${getRegionBaseUrl(region)}/v1/`
+const getRegionApiEndpoint = (region) => `${getRegionBaseUrl(region)}/v1/`
 
 module.exports = {
-  getManagementBaseURLByRegion
+  getRegionApiEndpoint
 }
diff --git a/tests/units/list-spaces.spec.js b/tests/units/list-spaces.spec.js
@@ -36,11 +36,11 @@ describe('Test spaces method', () => {
         res: [...FAKE_SPACES()]
       },
       {
-        key: AP_CODE,
+        key: CA_CODE,
         res: [...FAKE_SPACES()]
       },
       {
-        key: CA_CODE,
+        key: AP_CODE,
         res: [...FAKE_SPACES()]
       }
     ]

diff --git a/tests/units/push-components.spec.js b/tests/units/push-components.spec.js
@@ -1,7 +1,7 @@
 const pushComponents = require('../../src/tasks/push-components')
 const Storyblok = require('storyblok-js-client')
 const api = require('../../src/utils/api')
-const { getRegionApiEndpoint } = require('../../src/constants')
+const { getRegionApiEndpoint } = require('../../src/utils/region')
 const { EU_CODE } = require('@storyblok/region-helper')
 
 jest.mock('fs')

diff --git a/tests/units/quickstart.spec.js b/tests/units/quickstart.spec.js
@@ -4,7 +4,7 @@ const path = require('path')
 const quickstart = require('../../src/tasks/quickstart')
 const Storyblok = require('storyblok-js-client')
 const api = require('../../src/utils/api')
-const { getRegionApiEndpoint } = require('../../src/constants')
+const { getRegionApiEndpoint } = require('../../src/utils/region')
 const { EU_CODE } = require('@storyblok/region-helper')
 
 jest.unmock('fs')

diff --git a/tests/units/scaffold.spec.js b/tests/units/scaffold.spec.js
@@ -3,7 +3,7 @@ const fs = require('fs')
 const scaffold = require('../../src/tasks/scaffold')
 const Storyblok = require('storyblok-js-client')
 const api = require('../../src/utils/api')
-const { getRegionApiEndpoint } = require('../../src/constants')
+const { getRegionApiEndpoint } = require('../../src/utils/region')
 const { EU_CODE } = require('@storyblok/region-helper')
 
 jest.mock('fs')

diff --git a/tests/units/sync.spec.js b/tests/units/sync.spec.js
@@ -1,6 +1,6 @@
 const sync = require('../../src/tasks/sync')
 const Storyblok = require('storyblok-js-client')
-const { getRegionApiEndpoint } = require('../../src/constants')
+const { getRegionApiEndpoint } = require('../../src/utils/region')
 const { EU_CODE } = require('@storyblok/region-helper')
 
 jest.unmock('axios')