config version changes

Author: Aamod Pisat

lib/config/default.js

@@ -59,7 +59,8 @@ module.exports = exports = {
         }
     },
     contentstack: {
-        host: "https://api.contentstack.io/v3",
+        host: "https://api.contentstack.io",
+        version: "v3",
         socket: "https://contentstack-realtime.built.io/",
         urls: {
             stacks: "/stacks/",

lib/connect.js

@@ -88,8 +88,8 @@ var configTemplate = function () {
         , '    ],'
         , '    plugins: {},'
         , '    contentstack: {'
-        , '        api_key: "' + inputs.api_key + '",'
-        , '        access_token: "' + inputs.access_token + '"'
+        , '        api_key: "' + inputs.api_key.trim() + '",'
+        , '        access_token: "' + inputs.access_token.trim() + '"'
         , '    }'
         , '};'
     ].join(eol);
@@ -246,7 +246,7 @@ Connect.prototype.init = function () {
         // get environement from the specified stack
         function (_cb) {
             request({
-                url: api.host + api.urls.environments,
+                url: api.host + '/' + api.version + api.urls.environments,
                 method: "POST",
                 headers: self.headers,
                 json: {
@@ -436,7 +436,7 @@ Connect.prototype.stackInput = function (done) {
     function checkSite() {
         process.stdout.write('\x1b[33m\nValidating the stack...\x1b[0m');
         request({
-            url: api.host + api.urls.stacks,
+            url: api.host + '/' + api.version + api.urls.stacks,
             method: "GET",
             headers: self.headers,
             qs: {

lib/publish.js

@@ -145,7 +145,7 @@ var publish = function (_event, options) {
                     _.merge(inputs, result);
                     // setting the default values
                     inputs.type = inputs.type || "all";
-                    inputs.language = (inputs.language) ? inputs.language : masterLocale[0];
+                    inputs.language = (inputs.language) ? inputs.language.trim() : masterLocale[0];
                     inputs.languages = (inputs.language) ? inputs.language : masterLocale[0];
                     if (inputs.type === "assets") {
                         delete inputs.content_types;
@@ -198,7 +198,7 @@ publish.prototype.init = function () {
                 headers.authtoken = user.authtoken;
                 // get environment id from Built.io Contentstack
                 _request({
-                    url: api.host + api.urls.environments,
+                    url: api.host + '/' + api.version + api.urls.environments,
                     headers: headers,
                     method: "POST",
                     json: {
@@ -329,7 +329,7 @@ publish.prototype.publishEntries = function (entries, content_type, language) {
             return (function (cb) {
                 var entry_id = (entry['_metadata']) ? entry['_metadata']['uid'] : entry['uid'],
                     _options = {
-                        url: api.host + api.urls.content_types + content_type['uid'] + api.urls.entries + entry_id + '/' + inputs.event,
+                        url: api.host + '/' + api.version + api.urls.content_types + content_type['uid'] + api.urls.entries + entry_id + '/' + inputs.event,
                         headers: headers,
                         method: 'POST',
                         json: {
@@ -368,7 +368,7 @@ publish.prototype.publishEntries = function (entries, content_type, language) {
 publish.prototype.assets = function (callback) {
     var self = this,
         option = {
-            url: api.host + api.urls.assets,
+            url: api.host + '/' + api.version + api.urls.assets,
             qs: {
                 include_count: true,
                 limit: bound,
@@ -402,7 +402,7 @@ publish.prototype.assets = function (callback) {
             _calls.push(function (asset) {
                 return (function (cb) {
                     var options = {
-                        url: api.host + api.urls.assets + asset.uid + '/' + inputs.event,
+                        url: api.host + '/' + api.version + api.urls.assets + asset.uid + '/' + inputs.event,
                         method: "POST",
                         headers: headers,
                         json: {
@@ -433,7 +433,7 @@ publish.prototype.assets = function (callback) {
             _calls.push(function (offset, limit) {
                 return (function (cb) {
                     var _options = {
-                        url: api.host + api.urls.assets,
+                        url: api.host + '/' + api.version + api.urls.assets,
                         method: "GET",
                         headers: headers,
                         qs: {

lib/utils.js

@@ -48,7 +48,7 @@ Utility.prototype.getEntries = function (content_type, locale, _query, fields, e
 
     _getEntries = function (skip) {
         var options = {
-            url: api.host + api.urls.content_types + content_type + api.urls.entries,
+            url: api.host + '/' + api.version + api.urls.content_types + content_type + api.urls.entries,
             headers: self.headers,
             method: "POST",
             json: {
@@ -102,7 +102,7 @@ Utility.prototype.getEntries = function (content_type, locale, _query, fields, e
  * */
 Utility.prototype.getContentTypes = function () {
     return request({
-        url: api.host + api.urls.content_types,
+        url: api.host + '/' + api.version + api.urls.content_types,
         qs: {desc: "created_at"},
         headers: this.headers,
         method: "GET",
@@ -115,7 +115,7 @@ Utility.prototype.getContentTypes = function () {
  * */
 Utility.prototype.login = function (user) {
     return request({
-        url: api.host + api.urls.session,
+        url: api.host + '/' + api.version + api.urls.session,
         headers: this.headers,
         method: "POST",
         json: user
@@ -127,7 +127,7 @@ Utility.prototype.login = function (user) {
  * */
 Utility.prototype.getEnvironment = function (environment) {
     return request({
-        url: api.host + api.urls.environments + environment,
+        url: api.host + '/' + api.version + api.urls.environments + environment,
         headers: this.headers,
         method: "GET",
         json: true
@@ -139,7 +139,7 @@ Utility.prototype.getEnvironment = function (environment) {
 Utility.prototype.getAssets = function (options) {
     return request({
         method: "GET",
-        url: api.host + api.urls.assets,
+        url: api.host + '/' + api.version + api.urls.assets,
         qs: options,
         headers: this.headers,
         json: true
@@ -150,7 +150,7 @@ Utility.prototype.getAssets = function (options) {
  * */
 Utility.prototype.getStack = function (headers) {
     return request({
-        url: api.host + api.urls.stacks,
+        url: api.host + '/' + api.version + api.urls.stacks,
         headers: headers || this.headers,
         method: "GET",
         qs: {
@@ -165,7 +165,7 @@ Utility.prototype.getStack = function (headers) {
  * */
 Utility.prototype.getEnvironments = function (headers, query) {
     return request({
-        url: api.host + api.urls.environments,
+        url: api.host + '/' + api.version + api.urls.environments,
         qs: query || {},
         headers: headers || this.headers,
         method: "GET",
@@ -229,7 +229,7 @@ Utility.prototype.inputs = {
             },
             conform: function (input) {
                 var languages = config.get('languages'),
-                    idx = _.findIndex(languages, {"code": input});
+                    idx = _.findIndex(languages, {"code": input.trim()});
                 return (idx > -1);
             }
         }