fix(contentful-export): fix drafts exporting

Author: Khaledgarbaya

dist/usageParams.js

@@ -14,8 +14,7 @@ var opts = yargs.version(packageFile.version || 'Version only available on insta
   demand: true
 }).option('preview-token', {
   describe: 'Preview API token for the space to be exported.',
-  type: 'string',
-  demand: true
+  type: 'string'
 }).option('export-dir', {
   describe: 'Defines the path for storing the export json file (default path is the current directory)',
   type: 'string'

lib/run-contentful-export.js

@@ -17,15 +17,12 @@ export default function runContentfulExport (usageParams) {
     opts.sourceSpace = opts.sourceSpace || usageParams.spaceId
     opts.sourceManagementToken = opts.sourceManagementToken || usageParams.managementToken
   }
-  if (opts.includeDrafts) {
-    opts.deliveryHost = 'preview.contentful.com'
-    opts.sourceDeliveryToken = opts.previewToken
-  }
   const clients = createClients(opts)
   return getFullSourceSpace({
     managementClient: clients.source.management,
     spaceId: clients.source.spaceId,
-    maxAllowedLimit: opts.maxAllowedLimit
+    maxAllowedLimit: opts.maxAllowedLimit,
+    includeDrafts: opts.includeDrafts
   })
     .then((response) => {
       if (opts.downloadAssets) {

lib/usageParams.js

@@ -15,15 +15,15 @@ const opts = yargs
     type: 'string',
     demand: true
   })
-  .option('preview-token', {
-    describe: 'Preview API token for the space to be exported.',
-    type: 'string',
-    demand: true
-  })
   .option('export-dir', {
     describe: 'Defines the path for storing the export json file (default path is the current directory)',
     type: 'string'
   })
+  .option('include-drafts', {
+    describe: 'include drafts drafts in the exported entries',
+    type: 'boolean',
+    default: false
+  })
   .option('download-assets', {
     describe: 'With this flags assets will also be downloaded',
     type: 'boolean'
@@ -32,10 +32,6 @@ const opts = yargs
     describe: 'How many item per page per request default 1000',
     type: 'number'
   })
-  .options('include-drafts', {
-    describe: 'Export Drafts entiries',
-    type: 'boolean'
-  })
   .config('config', 'Configuration file with required values')
   .check(function (argv) {
     if (!argv.spaceId) {
@@ -50,15 +46,6 @@ const opts = yargs
       )
       process.exit(1)
     }
-    if (argv.includeDrafts && !argv.previewToken) {
-      log.error('Please provide a preview API token to be able to get draft or set --include-drafts false')
-      process.exit(1)
-    }
-    if (!argv.includeDrafts && argv.previewToken) {
-      log.error('Please make sure to specify --include-drafts to be able to get drafts')
-      process.exit(1)
-    }
-
     return true
   })
   .argv

package.json

@@ -1,5 +1,6 @@
 {
   "name": "contentful-export",
+  "version": "0.0.0-placeholder",
   "description": "this tool allows you to export a space to a JSON dump",
   "bin": {
     "contentful-export": "./bin/contentful-export"
@@ -43,7 +44,7 @@
     "bluebird": "^3.3.3",
     "fs-extra": "^0.30.0",
     "request": "^2.78.0",
-    "contentful-batch-libs": "4.7.0",
+    "contentful-batch-libs": "~4.7.2",
     "json-stringify-safe": "^5.0.1",
     "lodash": "^4.0.0",
     "npmlog": "^4.0.0",