@contentstack/cli-cm-seed 1.4.11 → 1.4.13

package/README.md

@@ -22,6 +22,7 @@ USAGE
   $ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]
 
 FLAGS
+  -a, --alias=<value>          Alias of the management token
   -k, --stack-api-key=<value>  Provide stack api key to seed content to
   -n, --stack-name=<value>     Name of a new stack that needs to be created.
   -o, --org=<value>            Provide Organization UID to create a new stack
@@ -56,6 +57,7 @@ USAGE
   $ csdx cm:stacks:seed [--repo <value>] [--org <value>] [-k <value>] [-n <value>] [-y <value>] [-s <value>]
 
 FLAGS
+  -a, --alias=<value>          Alias of the management token
   -k, --stack-api-key=<value>  Provide stack api key to seed content to
   -n, --stack-name=<value>     Name of a new stack that needs to be created.
   -o, --org=<value>            Provide Organization UID to create a new stack

package/lib/commands/cm/stacks/seed.js

@@ -7,8 +7,9 @@ class SeedCommand extends cli_command_1.Command {
     async run() {
         try {
             const { flags: seedFlags } = await this.parse(SeedCommand);
-            if (!(0, cli_utilities_1.isAuthenticated)()) {
-                this.error('You need to login, first. See: auth:login --help', {
+            const managementTokenAlias = seedFlags.alias;
+            if (!(0, cli_utilities_1.isAuthenticated)() && !managementTokenAlias) {
+                this.error('You need to login or provide an alias for the management token. See: auth:login --help', {
                     exit: 2,
                     suggestions: ['https://www.contentstack.com/docs/developers/cli/authentication/'],
                 });
@@ -24,13 +25,24 @@ class SeedCommand extends cli_command_1.Command {
                 fetchLimit: seedFlags['fetch-limit'],
                 skipStackConfirmation: seedFlags['yes'],
                 isAuthenticated: (0, cli_utilities_1.isAuthenticated)(),
+                alias: managementTokenAlias,
             };
+            const listOfTokens = cli_utilities_1.configHandler.get('tokens');
+            if (managementTokenAlias && listOfTokens[managementTokenAlias]) {
+                options.managementToken = listOfTokens[managementTokenAlias].token;
+                options.stackUid = listOfTokens[managementTokenAlias].apiKey;
+            }
             const seeder = new seed_1.default(options);
             const result = await seeder.run();
             return result;
         }
         catch (error) {
             let errorObj = error;
+            if (errorObj.message !== undefined) {
+                cli_utilities_1.cliux.loader();
+                cli_utilities_1.cliux.print(`Error: ${errorObj.message}`, { color: 'red' });
+                this.exit(1);
+            }
             this.error(errorObj, { exit: 1, suggestions: errorObj.suggestions });
         }
     }
@@ -96,5 +108,9 @@ SeedCommand.flags = {
         exclusive: ['org', 'name'],
         parse: (0, cli_utilities_1.printFlagDeprecation)(['s', 'stack'], ['-k', 'stack-api-key']),
     }),
+    alias: cli_utilities_1.flags.string({
+        char: 'a',
+        description: 'Alias of the management token',
+    }),
 };
 SeedCommand.aliases = ['cm:seed'];

package/lib/seed/contentstack/client.d.ts

@@ -23,9 +23,10 @@ export default class ContentstackClient {
     constructor(cmaHost: string, limit: number);
     getOrganization(org_uid: string): Promise<Organization>;
     getOrganizations(skip?: number, organizations?: Organization[]): Promise<Organization[]>;
+    private mapOrganization;
     getStack(stackUID: string): Promise<Stack>;
     getStacks(org_uid: string, skip?: number, stacks?: Stack[]): Promise<Stack[]>;
-    getContentTypeCount(api_key: string): Promise<number>;
+    getContentTypeCount(api_key: string, managementToken?: string): Promise<number>;
     createStack(options: CreateStackOptions): Promise<Stack>;
     private buildError;
 }

package/lib/seed/contentstack/client.js

@@ -24,16 +24,20 @@ class ContentstackClient {
     async getOrganizations(skip = 0, organizations = []) {
         try {
             const client = await this.instance;
-            const response = await client.organization().fetchAll({ limit: this.limit, asc: 'name', include_count: true, skip: skip });
-            organizations = organizations.concat(response.items.map((o) => {
-                return {
-                    uid: o.uid,
-                    name: o.name,
-                    enabled: o.enabled,
-                };
-            }));
-            if (organizations.length < response.count) {
-                organizations = await this.getOrganizations(skip + this.limit);
+            const configOrgUid = cli_utilities_1.configHandler.get('oauthOrgUid');
+            if (configOrgUid) {
+                const response = await client.organization(configOrgUid).fetch();
+                const mappedOrganization = this.mapOrganization(response);
+                organizations.push(mappedOrganization);
+            }
+            else {
+                const response = await client
+                    .organization()
+                    .fetchAll({ limit: this.limit, asc: 'name', include_count: true, skip });
+                organizations.push(...response.items.map(this.mapOrganization));
+                if (organizations.length < response.count) {
+                    organizations = await this.getOrganizations(skip + this.limit, organizations);
+                }
             }
             return organizations;
         }
@@ -41,6 +45,13 @@ class ContentstackClient {
             throw this.buildError(error);
         }
     }
+    mapOrganization(o) {
+        return {
+            uid: o.uid,
+            name: o.name,
+            enabled: o.enabled,
+        };
+    }
     async getStack(stackUID) {
         try {
             const client = await this.instance;
@@ -66,7 +77,7 @@ class ContentstackClient {
                 limit: this.limit,
                 include_count: true,
                 skip: skip,
-                query: {}
+                query: {},
             })
                 .find();
             stacks = stacks.concat(response.items.map((s) => {
@@ -87,10 +98,14 @@ class ContentstackClient {
             throw this.buildError(error);
         }
     }
-    async getContentTypeCount(api_key) {
+    async getContentTypeCount(api_key, managementToken) {
         try {
             const client = await this.instance;
-            const response = await client.stack({ api_key: api_key }).contentType().query({ include_count: true }).find();
+            const response = await client
+                .stack({ api_key: api_key, management_token: managementToken })
+                .contentType()
+                .query({ include_count: true })
+                .find();
             return response.count;
         }
         catch (error) {
@@ -122,8 +137,8 @@ class ContentstackClient {
     }
     buildError(error) {
         var _a;
-        const message = ((_a = error.response.data) === null || _a === void 0 ? void 0 : _a.error_message) || error.response.statusText;
-        const status = error.response.status;
+        const message = error.errorMessage || ((_a = error.response.data) === null || _a === void 0 ? void 0 : _a.errorMessage) || error.response.statusText;
+        const status = error.status;
         return new error_1.default(message, status);
     }
 }

package/lib/seed/importer.d.ts

@@ -5,5 +5,6 @@ export interface ImporterOptions {
     cmaHost: string;
     cdaHost: string;
     isAuthenticated: boolean;
+    alias?: string;
 }
 export declare function run(options: ImporterOptions): Promise<void>;

package/lib/seed/importer.js

@@ -3,12 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const process = require("process");
 const path = require("path");
+const cli_cm_import_1 = require("@contentstack/cli-cm-import");
 const STACK_FOLDER = 'stack';
 async function run(options) {
     const importPath = path.resolve(options.tmpPath, STACK_FOLDER);
+    const args = options.alias
+        ? ['-k', options.api_key, '-d', importPath, '--alias', options.alias]
+        : ['-k', options.api_key, '-d', importPath];
     process.chdir(options.tmpPath);
-    // moving here to fix jest testing bug
-    const { parametersWithAuthToken } = require('@contentstack/cli-cm-import/src/lib/util/import-flags');
-    await parametersWithAuthToken(options.api_key, importPath, '', options.cmaHost, '', {});
+    await cli_cm_import_1.default.run(args);
 }
 exports.run = run;

package/lib/seed/index.d.ts

@@ -12,6 +12,8 @@ export interface ContentModelSeederOptions {
     fetchLimit: string | undefined;
     skipStackConfirmation: string | undefined;
     isAuthenticated: boolean | false;
+    managementToken?: string | undefined;
+    alias?: string | undefined;
 }
 export default class ContentModelSeeder {
     options: ContentModelSeederOptions;
@@ -21,6 +23,7 @@ export default class ContentModelSeeder {
     private readonly _options;
     private ghUsername;
     private ghRepo;
+    managementToken?: string | undefined;
     get ghPath(): string;
     constructor(options: ContentModelSeederOptions);
     run(): Promise<{

package/lib/seed/index.js

@@ -25,6 +25,7 @@ class ContentModelSeeder {
         this.ghUsername = gh.username || DEFAULT_OWNER;
         this.ghRepo = gh.repo;
         const limit = Number(this.options.fetchLimit);
+        this.managementToken = options.managementToken;
         this.csClient = new client_1.default(options.cmaHost, limit);
         this.ghClient = new client_2.default(this.ghUsername, DEFAULT_STACK_PATTERN);
     }
@@ -43,7 +44,7 @@ class ContentModelSeeder {
             }
         }
         const tmpPath = await this.downloadRelease();
-        cli_utilities_1.cliux.print(`Importing into '${stackResponse.name}'.`);
+        cli_utilities_1.cliux.print(`Importing into ${this.managementToken ? 'your stack' : `'${stackResponse.name}'`}.`);
         await importer.run({
             api_key: api_key,
             cdaHost: this.options.cdaHost,
@@ -51,6 +52,7 @@ class ContentModelSeeder {
             master_locale: exports.ENGLISH_LOCALE,
             tmpPath: tmpPath,
             isAuthenticated: this.options.isAuthenticated,
+            alias: this.options.alias,
         });
         return { api_key };
     }
@@ -69,15 +71,26 @@ class ContentModelSeeder {
             throw error;
         }
         if (repoExists === false) {
-            cli_utilities_1.cliux.error(repoResponseData.status === 403 ? repoResponseData.statusMessage : `Could not find GitHub repository '${this.ghPath}'.`);
+            cli_utilities_1.cliux.error(repoResponseData.status === 403
+                ? repoResponseData.statusMessage
+                : `Could not find GitHub repository '${this.ghPath}'.`);
             if (this.parent)
                 this.parent.exit(1);
         }
         else {
             let organizationResponse;
             let stackResponse;
-            if (this.options.stackUid) {
-                const stack = await this.csClient.getStack(this.options.stackUid);
+            let stack;
+            if (this.options.stackUid && this.options.managementToken) {
+                stackResponse = {
+                    isNew: false,
+                    name: 'your stack',
+                    uid: this.options.stackUid,
+                    api_key: this.options.stackUid,
+                };
+            }
+            else if (this.options.stackUid) {
+                stack = await this.csClient.getStack(this.options.stackUid);
                 stackResponse = {
                     isNew: false,
                     name: stack.name,
@@ -114,7 +127,8 @@ class ContentModelSeeder {
         return newStack.api_key;
     }
     async shouldProceed(api_key) {
-        const count = await this.csClient.getContentTypeCount(api_key);
+        let count;
+        count = await this.csClient.getContentTypeCount(api_key, this.managementToken);
         if (count > 0 && this._options.skipStackConfirmation !== 'yes') {
             const proceed = await (0, interactive_1.inquireProceed)();
             if (!proceed) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.11",
+  "version": "1.4.13",
   "commands": {
     "cm:stacks:seed": {
       "id": "cm:stacks:seed",
@@ -89,6 +89,13 @@
             "org",
             "name"
           ]
+        },
+        "alias": {
+          "name": "alias",
+          "type": "option",
+          "char": "a",
+          "description": "Alias of the management token",
+          "multiple": false
         }
       },
       "args": {}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@contentstack/cli-cm-seed",
   "description": "create a Stack from existing content types, entries, assets, etc.",
-  "version": "1.4.11",
+  "version": "1.4.13",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-cm-import": "^1.5.11",
-    "@contentstack/cli-command": "^1.2.9",
-    "@contentstack/cli-utilities": "^1.4.5",
+    "@contentstack/cli-cm-import": "^1.7.0",
+    "@contentstack/cli-command": "^1.2.11",
+    "@contentstack/cli-utilities": "^1.5.1",
     "axios": "1.3.4",
     "inquirer": "8.2.4",
     "mkdirp": "^1.0.4",
@@ -41,6 +41,7 @@
     "/npm-shrinkwrap.json",
     "/oclif.manifest.json"
   ],
+  "types": "./types/index.d.ts",
   "homepage": "https://github.com/contentstack/cli",
   "keywords": [
     "contentstack",