storyblok 3.15.0 → 3.16.1

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,19 +1,12 @@
 ---
 name: Bug report
-about: Create a report to help us improve Storyblok
+about: Create a report to help us improve the CLI
 title: ''
 labels: bug
 assignees: ''
 
 ---
 
-**The issue occurs while working with:** (check one with "x")   
-- [ ] *app.storyblok.com (CMS - Interface)*   
-- [ ] *api.storyblok.com (CMS - Content Delivery API)*
-- [ ] *mapi.storyblok.com (CMS - Management API)*
-- [ ] *a.storyblok.com (CMS - Image Service)*
-- [ ] *storyblok.com (Website)*
-- [ ] *Other:* <!-- => If you've got an issue with on of our boilerplates or themes - please create an issue in the specific repo -->
 
 **Current behavior:**
 <!-- Describe how the bug manifests. -->

package/.github/workflows/release.yml

@@ -0,0 +1,23 @@
+name: Release
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+      - name: Install dependencies
+        run: yarn
+      - name: Release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          NPM_TOKEN: ${{ secrets.NPM_PUBLISH }}
+        run: npx semantic-release

package/README.md

@@ -3,16 +3,18 @@
   <p align="center">A simple CLI for scaffolding <a href="https://www.storyblok.com" target="_blank">Storyblok</a> projects and fieldtypes.</p>
 </p>
 
-You found an issue?<br>Tell us about it - <a href="https://github.com/storyblok/storyblok/issues/new">open an issue</a> or look if it was <a href="https://github.com/storyblok/storyblok/issues/">already reported</a>.
-
 [![npm](https://img.shields.io/npm/v/storyblok.svg)](https://www.npmjs.com/package/storyblok)
 [![npm](https://img.shields.io/npm/dt/storyblok.svg)](ttps://img.shields.io/npm/dt/storyblok.svg)
 [![GitHub issues](https://img.shields.io/github/issues/storyblok/storyblok.svg?style=flat-square&v=1)](https://github.com/storyblok/storyblok/issues?q=is%3Aopen+is%3Aissue)
 [![GitHub closed issues](https://img.shields.io/github/issues-closed/storyblok/storyblok.svg?style=flat-square&v=1)](https://github.com/storyblok/storyblok/issues?q=is%3Aissue+is%3Aclosed)
 
+## BREAKING CHANGE
+
+We added the `region` option upon login. If you are using the CLI, please `logout` and `login` again providing your user region.
+
 ## Installation
 
-Make sure you've node `>= 9.11.0` installed.
+Make sure you have Node `>= 9.11.0` installed.
 
 ```sh
 $ npm i storyblok -g
@@ -51,7 +53,6 @@ $ storyblok pull-components --space <SPACE_ID> --region <REGION>
 #### Options
 
 * `space`: your space id
-* `region`: your space region (default: `eu`). If your space was created under US region, you should use `us` instead.
 
 ### push-components
 
@@ -64,7 +65,6 @@ $ storyblok push-components <SOURCE> --space <SPACE_ID> --region <REGION> --pres
 #### Parameters
 
 * `source`: can be a URL or path to JSON file.
-* `region`: your space region (default: `eu`). If your space was created under US region, you should use `us` instead.
 
 Using an **URL**
 
@@ -81,7 +81,6 @@ $ storyblok push-components ./components.json --space 67819
 #### Options
 
 * `space`: your space id
-* `region`: your space region (default: `eu`). If your space was created under US region, you should use `us` instead.
 * `presets-source` (optional): it can be a URL or path to JSON file with the presets
 
 #### Examples
@@ -98,6 +97,65 @@ Using a **path** to file
 $ storyblok push-components ./components.json --presets-source ./presets.json --space 67819
 ```
 
+### delete-component
+
+Delete a single component on your space.
+
+```sh
+storyblok delete-component <component> --space <SPACE_ID>
+```
+
+#### Parameters
+* `component`: The name or id of the component
+
+#### Options
+* `space_id`: the space where the command should be executed.
+
+#### Examples
+
+Delete a component on your space.
+```sh
+storyblok delete-component 111111 --space 67819
+```
+
+```sh
+storyblok delete-component teaser --space 67819
+```
+
+### delete-components
+
+Delete all components from your Space that occur in your Local JSON.
+Or delete those components on your Space that do not appear in the JSON. (`--reverse`)
+
+```sh
+storyblok delete-components <SOURCE> --space <SPACE_ID>
+```
+
+#### Parameters
+* `source`: can be a URL or path to JSON file.
+
+#### Options
+* `space_id`: the space where the command should be executed.
+* `reverse`: When passed as an argument, deletes only those components on your space that do not appear in the JSON.
+* `dryrun`: when passed as an argument, does not perform any changes on the given space.
+
+#### Examples
+
+Delete all components on a certain space that occur in your local JSON.
+```sh
+storyblok delete-components ./components.json --space 67819
+```
+
+Delete only those components which do not occur in your local json from your space.
+```sh
+storyblok delete-components ./components.json --space 67819 --reverse
+```
+
+To see the result in your console output but to not perform the command on your space, use the `--dryrun` argument.
+```sh
+storyblok delete-components ./components.json --space 67819 --reverse --dryrun
+```
+
 ### sync
 
 Sync components, folder, roles, datasources or stories between spaces
@@ -111,7 +169,6 @@ $ storyblok sync --type <COMMAND> --source <SPACE_ID> --target <SPACE_ID>
 * `type`: describe the command type to execute. Can be: `folders`, `components`, `stories`, `datasources` or `roles`. It's possible pass multiple types separated by comma (`,`).
 * `source`: the source space to use to sync
 * `target`: the target space to use to sync
-* `region`: your space region (default: `eu`). If your space was created under US region, you should use `us` instead.
 
 #### Examples
 
@@ -146,6 +203,19 @@ Login to the Storyblok cli
 ```sh
 $ storyblok login
 ```
+#### Options
+
+* `email`: your user's email address
+* `password`: your user's password
+* `region`: your user's region (default: `eu`). You can use `us`, `cn` or `eu`. This region will be used for the other cli's commands.
+
+### user
+
+Get the currently logged in user
+
+```sh
+$ storyblok user
+```
 
 ### generate-migration
 
@@ -161,7 +231,6 @@ It's important to note that the `component` and `field` parameters are required
 * `space`: space where the component is
 * `component`: component name. It needs to be a valid component
 * `field`: name of field
-* `region`: your space region (default: `eu`). If your space was created under US region, you should use `us` instead.
 
 ### run-migration
 
@@ -188,7 +257,6 @@ $ storyblok run-migration --publish published --space 1234 --component article -
   * `published`: only publish stories that already are published and don't have unpublished changes
   * `published-with-changes`: publish stories that are published and have unpublished changes
 * `publish-languages` (optional): publish specific languages. You can publish more than one language at a time by separating the languages by `,`
-* `region`: your space region (default: `eu`). If your space was created under US region, you should use `us` instead.
 
 ### rollback-migration
 
@@ -208,6 +276,7 @@ $ storyblok rollback-migration --space 1234 --component Product --field title
 
 ### spaces
 
+
 List all spaces of the logged account
 
 ```sh

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "storyblok",
-  "version": "3.15.0",
+  "version": "3.16.1",
   "description": "A simple CLI to start Storyblok from your command line.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/storyblok/storyblok-cli.git"
+  },
   "keywords": [
     "storyblok",
     "cli",
@@ -55,5 +59,10 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-standard": "^4.0.1",
     "jest": "^26.1.0"
+  },
+  "release": {
+    "branches": [
+      "master"
+    ]
   }
 }

package/pull_request_template.md

@@ -0,0 +1,29 @@
+<!--- Please provide a general summary of your changes in the title above -->
+
+## Pull request type
+
+Jira Link: [INT-](url)
+
+<!-- Please try to limit your pull request to one type, submit multiple pull requests if needed.
+
+Please check the type of change your PR introduces:-->
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, renaming)
+- [ ] Refactoring (no functional changes, no api changes)
+- [ ] Other (please describe):
+
+## How to test this PR
+
+<!-- Please provide the steps on how to test this PR. -->
+
+## What is the new behavior?
+
+<!-- Please describe the behavior or changes that are being added by this PR. -->
+
+-
+-
+-
+
+## Other information

package/src/cli.js

@@ -39,7 +39,7 @@ program
 program
   .command(COMMANDS.LOGIN)
   .description('Login to the Storyblok cli')
-  .action(async () => {
+  .action(async (options) => {
     if (api.isAuthorized()) {
       console.log(chalk.green('✓') + ' The user has been already logged. If you want to change the logged user, you must logout and login again')
       return
@@ -54,6 +54,24 @@ program
     }
   })
 
+// getUser
+program
+  .command('user')
+  .description('Get the currently logged in user')
+  .action(async () => {
+    if (api.isAuthorized()) {
+      try {
+        const user = await api.getUser()
+        console.log(chalk.green('✓') + ` Hi ${user.friendly_name}, you current logged in with: ${creds.get().email}`)
+      } catch (e) {
+        console.log(chalk.red('X') + ` Please check if your current region matches your user's region: ${e.message}.`)
+      } finally {
+        process.exit(0)
+      }
+    }
+    console.log(chalk.red('X') + ' There is currently no user logged.')
+  })
+
 // logout
 program
   .command(COMMANDS.LOGOUT)
@@ -97,9 +115,8 @@ program
 // pull-components
 program
   .command(COMMANDS.PULL_COMPONENTS)
-  .option('-r, --region [value]', 'region', 'eu')
   .description("Download your space's components schema as json")
-  .action(async (source) => {
+  .action(async () => {
     console.log(`${chalk.blue('-')} Executing pull-components task`)
     const space = program.space
     if (!space) {
@@ -112,11 +129,6 @@ program
         await api.processLogin()
       }
 
-      const { region } = source
-      if (program.args.length > 0) {
-        api.setRegion(region)
-      }
-
       api.setSpaceId(space)
       await tasks.pullComponents(api, { space })
     } catch (e) {
@@ -128,7 +140,6 @@ program
 program
   .command(COMMANDS.PUSH_COMPONENTS + ' <source>')
   .option('-p, --presets-source <presetsSource>', 'Path to presets file')
-  .option('-r, --region [value]', 'region', 'eu')
   .description("Download your space's components schema as json. The source parameter can be a URL to your JSON file or a path to it")
   .action(async (source, options) => {
     console.log(`${chalk.blue('-')} Executing push-components task`)
@@ -145,11 +156,6 @@ program
         await api.processLogin()
       }
 
-      const { region } = options
-      if (program.args.length > 0) {
-        api.setRegion(region)
-      }
-
       api.setSpaceId(space)
       await tasks.pushComponents(api, { source, presetsSource })
     } catch (e) {
@@ -157,6 +163,56 @@ program
     }
   })
 
+// delete-component
+program
+  .command('delete-component <component>')
+  .description('Delete a single component on your space.')
+  .action(async (component) => {
+    console.log(`${chalk.blue('-')} Executing delete-component task`)
+    const space = program.space
+    if (!space) {
+      console.log(chalk.red('X') + ' Please provide the space as argument --space YOUR_SPACE_ID.')
+      process.exit(0)
+    }
+    try {
+      if (!api.isAuthorized()) {
+        await api.processLogin()
+      }
+
+      api.setSpaceId(space)
+      await tasks.deleteComponent(api, { comp: component })
+    } catch (e) {
+      console.log(chalk.red('X') + ' An error occurred when executing the delete-component task: ' + e.message)
+      process.exit(1)
+    }
+  })
+
+// delete-components
+program
+  .command('delete-components <source>')
+  .description('Delete all components in your space that occur in your source file.')
+  .option('-r, --reverse', 'Delete all components in your space that do not appear in your source.', false)
+  .option('--dryrun', 'Does not perform any delete changes on your space.')
+  .action(async (source, options) => {
+    console.log(`${chalk.blue('-')} Executing delete-components task`)
+    const space = program.space
+    if (!space) {
+      console.log(chalk.red('X') + ' Please provide the space as argument --space YOUR_SPACE_ID.')
+      process.exit(0)
+    }
+    try {
+      if (!api.isAuthorized()) {
+        await api.processLogin()
+      }
+
+      api.setSpaceId(space)
+      await tasks.deleteComponents(api, { source, dryRun: !!options.dryrun, reversed: !!options.reverse })
+    } catch (e) {
+      console.log(chalk.red('X') + ' An error occurred when executing the delete-component task: ' + e.message)
+      process.exit(1)
+    }
+  })
+
 // scaffold
 program
   .command(COMMANDS.SCAFFOLD + ' <name>')
@@ -205,7 +261,6 @@ program
   .requiredOption('--type <TYPE>', 'Define what will be sync. Can be components, folders, stories, datasources or roles')
   .requiredOption('--source <SPACE_ID>', 'Source space id')
   .requiredOption('--target <SPACE_ID>', 'Target space id')
-  .option('-r, --region [value]', 'region', 'eu')
   .action(async (options) => {
     console.log(`${chalk.blue('-')} Sync data between spaces\n`)
 
@@ -217,12 +272,9 @@ program
       const {
         type,
         source,
-        target,
-        region
+        target
       } = options
 
-      api.setRegion(region)
-
       const _types = type.split(',') || []
       _types.forEach(_type => {
         if (!SYNC_TYPES.includes(_type)) {
@@ -251,6 +303,10 @@ program
   .description('Start a project quickly')
   .action(async () => {
     try {
+      if (!api.isAuthorized()) {
+        await api.processLogin()
+      }
+
       const space = program.space
       const questions = getQuestions('quickstart', { space }, api)
       const answers = await inquirer.prompt(questions)
@@ -264,7 +320,6 @@ program
 program
   .command(COMMANDS.GENERATE_MIGRATION)
   .description('Generate a content migration file')
-  .option('-r, --region [value]', 'region', 'eu')
   .requiredOption('-c, --component <COMPONENT_NAME>', 'Name of the component')
   .requiredOption('-f, --field <FIELD_NAME>', 'Name of the component field')
   .action(async (options) => {
@@ -284,9 +339,6 @@ program
         await api.processLogin()
       }
 
-      const { region } = options
-      api.setRegion(region)
-
       api.setSpaceId(space)
       await tasks.generateMigration(api, component, field)
     } catch (e) {
@@ -300,7 +352,6 @@ program
   .description('Run a migration file')
   .requiredOption('-c, --component <COMPONENT_NAME>', 'Name of the component')
   .requiredOption('-f, --field <FIELD_NAME>', 'Name of the component field')
-  .option('-r, --region [value]', 'region', 'eu')
   .option('--dryrun', 'Do not update the story content')
   .option('--publish <PUBLISH_OPTION>', 'Publish the content. It can be: all, published or published-with-changes')
   .option('--publish-languages <LANGUAGES>', 'Publish specific languages')
@@ -387,7 +438,7 @@ program
 
       await tasks.listSpaces(api)
     } catch (e) {
-      console.log(chalk.red('X') + ' An error ocurred to listing sapces : ' + e.message)
+      console.log(chalk.red('X') + ' An error ocurred to listing spaces: ' + e.message)
       process.exit(1)
     }
   })
@@ -433,7 +484,7 @@ if (program.rawArgs.length <= 2) {
 
 function errorHandler (e, command) {
   if (/404/.test(e.message)) {
-    console.log(chalk.yellow('/!\\') + ' If your space was created under US region, you must provide the region as argument --region us. Otherwise, you can use the default --region eu or omit this flag.')
+    console.log(chalk.yellow('/!\\') + ' If your space was created under US or CN region, you must provide the region us or cn upon login.')
   } else {
     console.log(chalk.red('X') + ' An error occurred when executing the ' + command + ' task: ' + e || e.message)
   }

package/src/constants.js

@@ -1,5 +1,6 @@
 const API_URL = 'https://api.storyblok.com/v1/'
 const US_API_URL = 'https://api-us.storyblok.com/v1/'
+const CN_API_URL = 'https://api.storyblokchina.cn/v1/'
 const LOGIN_URL = `${API_URL}users/login`
 const SIGNUP_URL = `${API_URL}users/signup`
 
@@ -33,5 +34,6 @@ module.exports = {
   API_URL,
   SYNC_TYPES,
   US_API_URL,
+  CN_API_URL,
   COMMANDS
 }

package/src/tasks/delete-component.js

@@ -0,0 +1,32 @@
+const chalk = require('chalk')
+const { getComponentsFromName } = require('./migrations/utils')
+
+/**
+ *
+ * @param api {Object}
+ * @param comp {String | Number}
+ * @param dryrun {Boolean}
+ * @returns {Promise<void>}
+ */
+const deleteComponent = async (api, { comp, dryrun = false }) => {
+  try {
+    let component
+    if (!isNaN(comp)) {
+      const { data } = await api.get(`components/${comp}`)
+      component = data.component
+    } else {
+      component = await getComponentsFromName(api, comp)
+    }
+    if (Object.keys(component).length === 0) {
+      return Promise.reject(new Error(`Component ${comp} not found.`))
+    }
+    if (!dryrun) {
+      await api.delete(`components/${component.id}`)
+    }
+    console.log(chalk.green('✓') + ' Component ' + chalk.blue(component.name) + ' deleted.')
+  } catch (e) {
+    console.error(`${chalk.red('X')} An error occurred in delete-component task.`)
+    return Promise.reject(new Error(e))
+  }
+}
+module.exports = deleteComponent

package/src/tasks/delete-components.js

@@ -0,0 +1,92 @@
+const chalk = require('chalk')
+const axios = require('axios')
+const fs = require('fs')
+const deleteComponent = require('./delete-component')
+
+const isUrl = source => source.indexOf('http') === 0
+
+/**
+ * Get the data from a local or remote JSON file
+ * @param {string} source the local path or remote url of the file
+ * @returns {Promise<Object>} return the data from the source or an error
+ */
+const getDataFromSource = async (source) => {
+  if (!source) {
+    return {}
+  }
+
+  try {
+    if (isUrl(source)) {
+      return (await axios.get(source)).data
+    } else {
+      return JSON.parse(fs.readFileSync(source, 'utf8'))
+    }
+  } catch (err) {
+    console.error(`${chalk.red('X')} Can not load json file from ${source}`)
+    return Promise.reject(err)
+  }
+}
+
+/**
+ * Delete all components from your Space that occur in your Local JSON.
+ * @param api {Object}
+ * @param source {String}
+ * @param reversed {Boolean} Or delete those components on your Space that do not appear in the JSON.
+ * @param dryRun {Boolean}
+ * @returns {Promise<void>}
+ */
+const deleteComponents = async (api, { source, reversed = false, dryRun = false }) => {
+  try {
+    const sourceComponents = (await getDataFromSource(source)).components || []
+    if (!reversed) {
+      return deleteAllComponents(api, sourceComponents, dryRun)
+    }
+    const spaceComponents = await api.getComponents()
+    return deleteComponentsReversed(api, sourceComponents, spaceComponents, dryRun)
+  } catch (e) {
+    console.error(`${chalk.red('X')} Can not delete with invalid json - please provide a valid json file`)
+    return Promise.reject(new Error('Can not delete with invalid json - please provide a valid json file'))
+  }
+}
+
+/**
+ * Delete all given components
+ * @param api {Object}
+ * @param components {Object[]}
+ * @param dryrun {Boolean}
+ * @returns {Promise<void>}
+ */
+const deleteAllComponents = async (api, components, dryrun) => {
+  for (const c of components) {
+    await deleteComponentAndSkip(api, c, dryrun)
+  }
+}
+
+/**
+ * Delete all components which do not appear in components but in the space components
+ * @param api {Object}
+ * @param components {Object[]}
+ * @param spaceComponents {Object[]}
+ * @param dryrun {Boolean}
+ * @returns {Promise<void>}
+ */
+const deleteComponentsReversed = async (api, components, spaceComponents, dryrun) => {
+  const unifiedComps = components.concat([...spaceComponents])
+  const toDelete = unifiedComps
+    .filter((value, index, self) =>
+      self.findIndex((o, i) => o.id === value.id && i !== index) < 0)
+  console.log(chalk.blue('-') + ' Deleting all components which do not appear in the given source.')
+  for (const c of toDelete) {
+    await deleteComponentAndSkip(api, c, dryrun)
+  }
+}
+
+const deleteComponentAndSkip = async (api, c, dryrun) => {
+  try {
+    return await deleteComponent(api, { comp: c.id, dryrun: dryrun })
+  } catch (e) {
+    console.log(chalk.red('-') + ' Error deleting component ' + chalk.blue(c.name) + '! Skipped...')
+  }
+}
+
+module.exports = deleteComponents

package/src/tasks/index.js

@@ -9,5 +9,7 @@ module.exports = {
   runMigration: require('./migrations/run'),
   rollbackMigration: require('./migrations/rollback'),
   listSpaces: require('./list-spaces'),
-  importFiles: require('./import/import')
+  importFiles: require('./import/import'),
+  deleteComponent: require('./delete-component'),
+  deleteComponents: require('./delete-components')
 }

package/src/tasks/migrations/run.js

@@ -91,7 +91,7 @@ const runMigration = async (api, component, field, options = {}) => {
         const storyData = await api.getSingleStory(story.id)
         const oldContent = cloneDeep(storyData.content)
 
-        await processMigration(storyData.content, component, migrationFn)
+        await processMigration(storyData.content, component, migrationFn, story.full_slug)
 
         const isChangeContent = !isEqual(oldContent, storyData.content)
 

package/src/tasks/migrations/utils.js

@@ -186,9 +186,10 @@ const showMigrationChanges = (path, value, oldValue) => {
  * @param  {Object}   content component structure from Storyblok
  * @param  {String}   component    name of the component that is processing
  * @param  {Function} migrationFn  the migration function defined by user
+ * @param  {String} storyFullSlug  the full slug of the containing story
  * @return {Promise<Boolean>}
  */
-const processMigration = async (content = {}, component = '', migrationFn) => {
+const processMigration = async (content = {}, component = '', migrationFn, storyFullSlug) => {
   // I'm processing the component that I want
   if (content.component === component) {
     const watchedContent = onChange(
@@ -196,7 +197,7 @@ const processMigration = async (content = {}, component = '', migrationFn) => {
       showMigrationChanges
     )
 
-    await migrationFn(watchedContent)
+    await migrationFn(watchedContent, storyFullSlug)
   }
 
   for (const key in content) {
@@ -205,7 +206,7 @@ const processMigration = async (content = {}, component = '', migrationFn) => {
     if (isArray(value)) {
       try {
         await Promise.all(
-          value.map(_item => processMigration(_item, component, migrationFn))
+          value.map(_item => processMigration(_item, component, migrationFn, storyFullSlug))
         )
       } catch (e) {
         console.error(e)
@@ -214,7 +215,7 @@ const processMigration = async (content = {}, component = '', migrationFn) => {
 
     if (isPlainObject(value) && has(value, 'component')) {
       try {
-        await processMigration(value, component, migrationFn)
+        await processMigration(value, component, migrationFn, storyFullSlug)
       } catch (e) {
         console.error(e)
       }
@@ -223,7 +224,7 @@ const processMigration = async (content = {}, component = '', migrationFn) => {
     if (isPlainObject(value) && value.type === 'doc' && value.content) {
       value.content.filter(item => item.type === 'blok').forEach(async (item) => {
         try {
-          await processMigration(item.attrs.body, component, migrationFn)
+          await processMigration(item.attrs.body, component, migrationFn, storyFullSlug)
         } catch (e) {
           console.error(e)
         }

package/src/tasks/sync-commands/component-groups.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk')
-const StoryblokClient = require('storyblok-js-client')
 const { findByProperty } = require('../../utils')
+const api = require('../../utils/api')
 
 class SyncComponentGroups {
   /**
@@ -14,9 +14,7 @@ class SyncComponentGroups {
     this.sourceComponentGroups = []
     this.targetComponentGroups = []
 
-    this.client = new StoryblokClient({
-      oauthToken: options.oauthToken
-    })
+    this.client = api.getClient()
   }
 
   async init () {

package/src/tasks/sync-commands/components.js

@@ -1,9 +1,9 @@
 const chalk = require('chalk')
-const StoryblokClient = require('storyblok-js-client')
 const { find } = require('lodash')
 const SyncComponentGroups = require('./component-groups')
 const { findByProperty } = require('../../utils')
 const PresetsLib = require('../../utils/presets-lib')
+const api = require('../../utils/api')
 
 class SyncComponents {
   /**
@@ -16,9 +16,7 @@ class SyncComponents {
     this.sourceSpaceId = options.sourceSpaceId
     this.targetSpaceId = options.targetSpaceId
     this.oauthToken = options.oauthToken
-    this.client = new StoryblokClient({
-      oauthToken: options.oauthToken
-    })
+    this.client = api.getClient()
     this.presetsLib = new PresetsLib({ oauthToken: options.oauthToken, targetSpaceId: this.targetSpaceId })
   }
 

package/src/utils/api.js

@@ -5,21 +5,22 @@ const inquirer = require('inquirer')
 
 const creds = require('./creds')
 const getQuestions = require('./get-questions')
-const { LOGIN_URL, SIGNUP_URL, API_URL, US_API_URL } = require('../constants')
+const { SIGNUP_URL, API_URL, US_API_URL, CN_API_URL } = require('../constants')
 
 module.exports = {
   accessToken: '',
   oauthToken: '',
   spaceId: null,
-  region: 'eu',
+  region: '',
 
   getClient () {
-    const apiURL = this.region === 'us' ? US_API_URL : API_URL
+    const { region } = creds.get()
+
     return new Storyblok({
       accessToken: this.accessToken,
       oauthToken: this.oauthToken,
       region: this.region
-    }, apiURL)
+    }, this.apiSwitcher(region))
   },
 
   getPath (path) {
@@ -30,9 +31,9 @@ module.exports = {
     return path
   },
 
-  async login (email, password) {
+  async login (email, password, region) {
     try {
-      const response = await axios.post(LOGIN_URL, {
+      const response = await axios.post(`${this.apiSwitcher(region)}users/login`, {
         email: email,
         password: password
       })
@@ -57,26 +58,41 @@ module.exports = {
 
         const { otp_attempt: code } = await inquirer.prompt(questions)
 
-        const newResponse = await axios.post(LOGIN_URL, {
+        const newResponse = await axios.post(`${this.apiSwitcher(region)}users/login`, {
           email: email,
           password: password,
           otp_attempt: code
         })
 
-        return this.persistCredentials(email, newResponse.data || {})
+        return this.persistCredentials(email, newResponse.data || {}, region)
       }
 
-      return this.persistCredentials(email, data)
+      return this.persistCredentials(email, data, region)
     } catch (e) {
       return Promise.reject(e)
     }
   },
 
-  persistCredentials (email, data) {
+  async getUser () {
+    const { region } = creds.get()
+
+    try {
+      const { data } = await axios.get(`${this.apiSwitcher(this.region ? this.region : region)}users/me`, {
+        headers: {
+          Authorization: this.oauthToken
+        }
+      })
+      return data.user
+    } catch (e) {
+      return Promise.reject(e)
+    }
+  },
+
+  persistCredentials (email, data, region = 'eu') {
     const token = this.extractToken(data)
     if (token) {
       this.oauthToken = token
-      creds.set(email, token)
+      creds.set(email, token, region)
 
       return Promise.resolve(data)
     }
@@ -86,9 +102,9 @@ module.exports = {
   async processLogin () {
     try {
       const questions = getQuestions('login')
-      const { email, password } = await inquirer.prompt(questions)
+      const { email, password, region } = await inquirer.prompt(questions)
 
-      const data = await this.login(email, password)
+      const data = await this.login(email, password, region)
 
       console.log(chalk.green('✓') + ' Log in successfully! Token has been added to .netrc file.')
 
@@ -109,19 +125,23 @@ module.exports = {
     return data.access_token
   },
 
-  logout () {
+  logout (unauthorized) {
+    if (creds.get().email && unauthorized) {
+      console.log(chalk.red('X') + ' Your login seems to be expired, we logged you out. Please log back in again.')
+    }
     creds.set(null)
   },
 
-  signup (email, password) {
+  signup (email, password, region = 'eu') {
     return axios.post(SIGNUP_URL, {
       email: email,
-      password: password
+      password: password,
+      region
     })
       .then(response => {
         const token = this.extractToken(response)
         this.oauthToken = token
-        creds.set(email, token)
+        creds.set(email, token, region)
 
         return Promise.resolve(true)
       })
@@ -130,7 +150,6 @@ module.exports = {
 
   isAuthorized () {
     const { token } = creds.get() || {}
-
     if (token) {
       this.oauthToken = token
       return true
@@ -226,5 +245,15 @@ module.exports = {
       .get('spaces/', {})
       .then(res => res.data.spaces || [])
       .catch(err => Promise.reject(err))
+  },
+
+  apiSwitcher (region) {
+    const apiList = {
+      us: US_API_URL,
+      cn: CN_API_URL,
+      eu: API_URL
+    }
+
+    return region ? apiList[region] : apiList[this.region]
   }
 }

package/src/utils/creds.js

@@ -25,31 +25,34 @@ const getNrcFile = () => {
 const get = function () {
   const obj = getNrcFile()
 
-  if (process.env.STORYBLOK_LOGIN && process.env.STORYBLOK_TOKEN) {
+  if (process.env.STORYBLOK_LOGIN && process.env.STORYBLOK_TOKEN && process.env.STORYBLOK_REGION) {
     return {
       email: process.env.STORYBLOK_LOGIN,
-      token: process.env.STORYBLOK_TOKEN
+      token: process.env.STORYBLOK_TOKEN,
+      region: process.env.STORYBLOK_REGION
     }
   }
 
-  if (process.env.TRAVIS_STORYBLOK_LOGIN && process.env.TRAVIS_STORYBLOK_TOKEN) {
+  if (process.env.TRAVIS_STORYBLOK_LOGIN && process.env.TRAVIS_STORYBLOK_TOKEN && process.env.TRAVIS_STORYBLOK_REGION) {
     return {
       email: process.env.TRAVIS_STORYBLOK_LOGIN,
-      token: process.env.TRAVIS_STORYBLOK_TOKEN
+      token: process.env.TRAVIS_STORYBLOK_TOKEN,
+      region: process.env.TRAVIS_STORYBLOK_REGION
     }
   }
 
   if (Object.hasOwnProperty.call(obj, host)) {
     return {
       email: obj[host].login,
-      token: obj[host].password
+      token: obj[host].password,
+      region: obj[host].region
     }
   }
 
   return null
 }
 
-const set = function (email, token) {
+const set = function (email, token, region) {
   const file = getFile()
   let obj = {}
 
@@ -66,7 +69,8 @@ const set = function (email, token) {
   } else {
     obj[host] = {
       login: email,
-      password: token
+      password: token,
+      region
     }
     fs.writeFileSync(file, netrc.format(obj) + os.EOL)
     return get()

package/src/utils/get-questions.js

@@ -128,6 +128,19 @@ const getOptions = (subCommand, argv = {}, api = {}) => {
 
           return 'Please enter a valid password:'
         }
+      },
+      {
+        type: 'input',
+        name: 'region',
+        message: 'Enter your user\'s region (us, eu or cn):',
+        validate: function (value) {
+          const flagList = ['us', 'cn', 'eu']
+          if (flagList.indexOf(value) > -1) {
+            return true
+          }
+
+          return 'Please enter a valid region: us, eu or cn'
+        }
       }
     ]
   }

package/src/utils/presets-lib.js

@@ -1,8 +1,8 @@
 const chalk = require('chalk')
-const StoryblokClient = require('storyblok-js-client')
 const FormData = require('form-data')
 const axios = require('axios')
 const { last } = require('lodash')
+const api = require('./api')
 
 class PresetsLib {
   /**
@@ -10,9 +10,7 @@ class PresetsLib {
    */
   constructor (options) {
     this.oauthToken = options.oauthToken
-    this.client = new StoryblokClient({
-      oauthToken: options.oauthToken
-    })
+    this.client = api.getClient()
     this.targetSpaceId = options.targetSpaceId
   }
 

package/tests/constants.js

@@ -1,6 +1,7 @@
 const EMAIL_TEST = 'test@storyblok.com'
 const PASSWORD_TEST = 'test'
 const TOKEN_TEST = 'storyblok1234'
+const REGION_TEST = 'eu'
 
 // use functions to always returns "new" data
 const FAKE_COMPONENTS = () => [
@@ -255,5 +256,6 @@ module.exports = {
   PASSWORD_TEST,
   FAKE_COMPONENTS,
   FAKE_SPACES,
-  FAKE_SPACE_OPTIONS
+  FAKE_SPACE_OPTIONS,
+  REGION_TEST
 }

package/tests/units/delete-component.spec.js

@@ -0,0 +1,53 @@
+const deleteComponent = require('../../src/tasks/delete-component')
+const { FAKE_COMPONENTS } = require('../constants')
+
+describe('testing deleteComponent', () => {
+  it('api.deleteComponent name', () => {
+    const api = {
+      getComponents: jest.fn(() => Promise.resolve(FAKE_COMPONENTS())),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponent(api, { comp: 'teaser' }).then(() => {
+      expect(api.delete.mock.calls.length).toBe(1)
+    })
+  })
+  it('api.deleteComponent id', () => {
+    const comp = FAKE_COMPONENTS()[0]
+    const api = {
+      get: jest.fn(() => Promise.resolve({ data: { component: comp } })),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponent(api, { comp: 0 }).then(() => {
+      expect(api.get.mock.calls.length).toBe(1)
+      expect(api.delete.mock.calls.length).toBe(1)
+    })
+  })
+  it('api.deleteComponent name dryrun', () => {
+    const api = {
+      getComponents: jest.fn(() => Promise.resolve(FAKE_COMPONENTS())),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponent(api, { comp: 'teaser', dryrun: true }).then(() => {
+      expect(api.delete.mock.calls.length).toBe(0)
+    })
+  })
+  it('api.deleteComponent not found', () => {
+    const api = {
+      getComponents: jest.fn(() => Promise.resolve(FAKE_COMPONENTS())),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return expect(deleteComponent(api, { comp: 'not a fake component' }).then(() => {
+      expect(api.delete.mock.calls.length).toBe(0)
+    })).rejects.toThrow('Component not a fake component not found.')
+  })
+  it('api.deleteComponent not found by id', () => {
+    const api = {
+      get: jest.fn(() => Promise.reject(new Error('Not Found'))),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return expect(deleteComponent(api, { comp: 1 }).then(() => {
+      expect(api.get.mock.calls.length).toBe(1)
+      expect(api.delete.mock.calls.length).toBe(0)
+    })).rejects.toThrow('Not Found')
+  })
+})

package/tests/units/delete-components.spec.js

@@ -0,0 +1,93 @@
+const deleteComponents = require('../../src/tasks/delete-components')
+const { FAKE_COMPONENTS } = require('../constants')
+const fs = require('fs')
+jest.mock('fs')
+
+afterEach(() => {
+  jest.clearAllMocks()
+})
+
+describe('testing deleteComponents', () => {
+  it('api.deleteComponents', () => {
+    const source = 'components.js'
+    const components = FAKE_COMPONENTS()
+    const spy = jest.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({
+      components
+    }))
+    const api = {
+      get: jest.fn((path) => {
+        const id = path.split('/')[1]
+        return Promise.resolve({ data: { component: components[id] } })
+      }),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponents(api, { source, reversed: false }).then(() => {
+      expect(spy.mock.calls.length).toBe(1)
+      expect(api.delete.mock.calls.length).toBe(components.length)
+    })
+  })
+  it('api.deleteComponents reverse', () => {
+    const source = 'components.js'
+    const components = FAKE_COMPONENTS()
+    const spy = jest.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({
+      components
+    }))
+    const api = {
+      get: jest.fn((path) => {
+        const id = path.split('/')[1]
+        return Promise.resolve({ data: { component: components[id] } })
+      }),
+      getComponents: jest.fn(() => {
+        const copy = [...components]
+        copy.splice(3, 1)
+        return copy
+      }),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponents(api, { source, reversed: true }).then(() => {
+      expect(spy.mock.calls.length).toBe(1)
+      expect(api.delete.mock.calls.length).toBe(1)
+    })
+  })
+  it('api.deleteComponents --dryrun', () => {
+    const source = 'components.js'
+    const components = FAKE_COMPONENTS()
+    const spy = jest.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({
+      components
+    }))
+    const api = {
+      get: jest.fn((path) => {
+        const id = path.split('/')[1]
+        return Promise.resolve({ data: { component: components[id] } })
+      }),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponents(api, { source, reversed: false, dryRun: true }).then(() => {
+      expect(spy.mock.calls.length).toBe(1)
+      expect(api.delete.mock.calls.length).toBe(0)
+    })
+  })
+  it('api.deleteComponents reverse --dryrun', () => {
+    const source = 'components.js'
+    const components = FAKE_COMPONENTS()
+    const spy = jest.spyOn(fs, 'readFileSync').mockReturnValue(JSON.stringify({
+      components
+    }))
+    const api = {
+      get: jest.fn((path) => {
+        const id = path.split('/')[1]
+        return Promise.resolve({ data: { component: components[id] } })
+      }),
+      getComponents: jest.fn(() => {
+        const copy = [...components]
+        copy.splice(3, 1)
+        return copy
+      }),
+      delete: jest.fn(() => Promise.resolve())
+    }
+    return deleteComponents(api, { source, reversed: true, dryRun: true }).then(() => {
+      expect(spy.mock.calls.length).toBe(1)
+      expect(api.delete.mock.calls.length).toBe(0)
+    })
+  })
+})

package/tests/units/login.spec.js

@@ -1,6 +1,6 @@
 const api = require('../../src/utils/api')
 const creds = require('../../src/utils/creds')
-const { EMAIL_TEST, TOKEN_TEST, PASSWORD_TEST } = require('../constants')
+const { EMAIL_TEST, TOKEN_TEST, PASSWORD_TEST, REGION_TEST } = require('../constants')
 
 jest.mock('axios')
 
@@ -19,7 +19,8 @@ describe('api.login() method', () => {
 
       expect(creds.get()).toEqual({
         email: EMAIL_TEST,
-        token: TOKEN_TEST
+        token: TOKEN_TEST,
+        region: REGION_TEST
       })
     } catch (e) {
       console.error(e)
@@ -28,7 +29,7 @@ describe('api.login() method', () => {
 
   it('when login is incorrect, the .netrc file is not populated and throw a reject message', async () => {
     try {
-      await api.login(EMAIL_TEST, '1234')
+      await api.login(EMAIL_TEST, '1234', REGION_TEST)
     } catch (e) {
       expect(e.message).toBe('Incorrect access')
     }

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,28 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for Storyblok
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-**The feature would affect:** (check one with "x")   
-- [ ] *app.storyblok.com (CMS - Interface)*   
-- [ ] *api.storyblok.com (CMS - Content Delivery API)*
-- [ ] *mapi.storyblok.com (CMS - Management API)*
-- [ ] *a.storyblok.com (CMS - Image Service)*
-- [ ] *Other* <!-- => If you've got an issue with on of our boilerplates or themes - please create an issue in the specific repo -->
-
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

package/.github/ISSUE_TEMPLATE/question.md

@@ -1,10 +0,0 @@
----
-name: Question
-about: Ask a question related to Storyblok
-title: ''
-labels: question
-assignees: ''
-
----
-
-Is your feature request related to a problem? Please describe.

package/.github/ISSUE_TEMPLATE.md

@@ -1,31 +0,0 @@
-**The issue occurs while working with:** (check one with "x")   
-- [ ] *app.storyblok.com (CMS - Interface)*   
-- [ ] *api.storyblok.com (CMS - Content Delivery API)*
-- [ ] *mapi.storyblok.com (CMS - Management API)*
-- [ ] *capi.storyblok.com (Commerce - API)*     
-- [ ] *Commerce - Interface*   
-- [ ] *Other* <!-- => If you've got an issue with on of our boilerplates or themes - please create an issue in the specific repo -->
-
-**I'm submitting a ...**  (check one with "x")  
-- [ ] bug report  
-- [ ] feature request  
-- [ ] question
-
-**Current behavior:**
-<!-- Describe how the bug manifests. -->
-
-**Expected behavior:**
-<!-- Describe what the behavior would be without the bug. -->
-
-**Steps to reproduce:**
-<!-- If you are able to illustrate the bug or feature request with an example, please provide steps to reproduce and if possible also a demo.-->
-
-**Related code:**
-
-```
-insert any relevant code here
-```
-
-**Other information:**
-<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
-

package/.github/labeler.yml

@@ -1,8 +0,0 @@
-app.storyblok:
-    - '[x] *app.storyblok.com'
-api.storyblok:
-    - '[x] *api.storyblok.com'
-mapi.storyblok:
-    - '[x] *mapi.storyblok.com'
-capi.storyblok:
-    - '[x] *capi.storyblok.com'

package/.github/workflows/issue-label.yml

@@ -1,14 +0,0 @@
-name: "Issue Labeler"
-on:
-  issues:
-    types: [opened]
-
-jobs:
-  triage:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: github/issue-labeler@v2.5 
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"
-        configuration-path: .github/labeler.yml
-        enable-versioned-regex: 0

package/.travis.yml

@@ -1,5 +0,0 @@
-language: node_js
-node_js:
-  - 14
-after_success:
-  - npx semantic-release