Merge remote-tracking branch 'origin/develop' into HEAD

lib/clients/aws-client/aws-util.js

@@ -1,8 +1,9 @@
 const aws = require('aws-sdk');
-const fs = require('fs');
+const fs = require('fs-extra');
 const os = require('os');
 const path = require('path');
-const jsonUtility = require('@src/utils/json-utility');
+const R = require('ramda');
+
 const CONSTANT = require('@src/utils/constants');
 
 module.exports = {
@@ -23,9 +24,8 @@ function getAWSProfile(askProfile) {
             return CONSTANT.PLACEHOLDER.ENVIRONMENT_VAR.AWS_CREDENTIALS;
         }
     }
-    const awsCredentials = path.join(os.homedir(), '.ask', 'cli_config');
-    const propertyPathForAWSProfile = ['profiles', askProfile, 'aws_profile'];
-    return jsonUtility.getProperty(awsCredentials, propertyPathForAWSProfile);
+    const askConfig = fs.readJSONSync(path.join(os.homedir(), '.ask', 'cli_config'));
+    return R.view(R.lensPath(['profiles', askProfile, 'aws_profile']), askConfig);
 }
 
 // We face the same issue as mentioned in https://github.com/aws/aws-sdk-js/issues/2181

lib/clients/smapi-client/resources/skill.js

@@ -185,7 +185,7 @@ module.exports = (smapiHandle) => {
     function listIspForSkill(skillId, stage, queryParams, callback) {
         const queryObject = R.clone(queryParams);
         if (queryObject && !queryObject.maxResults) {
-            queryObject.maxResults = CONSTANTS.ISP.NUMBERS.DEFAULT_ISP_MAX_RESULTS;
+            queryObject.maxResults = CONSTANTS.SMAPI.DEFAULT_MAX_RESULT_PER_PAGE;
         }
         const url = `skills/${skillId}/stages/${stage}/${ISP_URL_BASE}`;
         smapiHandle(

lib/commands/api/account-linking/set-account-linking/helper.js

@@ -1,7 +1,6 @@
 const fs = require('fs');
 
 const stringUtility = require('@src/utils/string-utils');
-const tools = require('@src/utils/tools');
 
 const ui = require('./ui');
 
@@ -49,19 +48,18 @@ function prepareAccountLinkingPayload(smapiClient, skillId, stage, filePath, cal
 }
 
 function getManifest(smapiClient, skillId, stage, callback) {
-    smapiClient.skill.manifest.getManifest(skillId, stage, (getManifestErr, data) => {
+    smapiClient.skill.manifest.getManifest(skillId, stage, (getManifestErr, response) => {
         if (getManifestErr) {
             return callback(getManifestErr);
         }
-        if (data.statusCode === 303) {
+        if (response.statusCode === 303) {
             return callback('[Warn]: The get-manifest request is not ready. Please try again later.');
         }
 
-        const response = tools.convertDataToJsonObject(data.body);
-        if (data.statusCode < 300) {
-            callback(null, response);
+        if (response.statusCode < 300) {
+            callback(null, response.body);
         } else {
-            callback(response, null);
+            callback(response.body, null);
         }
     });
 }

lib/commands/api/account-linking/set-account-linking/index.js

@@ -54,7 +54,7 @@ class SetAccountLinkingCommand extends AbstractCommand {
                     Messenger.getInstance().error(error);
                     cb(error);
                 } else {
-                    Messenger.getInstance().info(jsonView.toString(response.body));
+                    Messenger.getInstance().info('Account linking information updated successfully.');
                     cb();
                 }
             });

lib/commands/api/catalog/upload-catalog/index.js

@@ -4,7 +4,6 @@ const SmapiClient = require('@src/clients/smapi-client');
 const S3Client = require('@src/clients/aws-client/s3-client');
 const optionModel = require('@src/commands/option-model');
 const profileHelper = require('@src/utils/profile-helper');
-const tools = require('@src/utils/tools');
 
 const helper = require('./helper');
 
@@ -54,23 +53,21 @@ function _multiPartUploadCatalog(catalogId, filePath, smapiClient, callback) {
     }
 
     helper._confirmOrOverwritePartSize(totalSize, calculatedPartSize, calculatedPartsNumber, (partSize, partsNumber) => {
-        smapiClient.catalog.createCatalogUpload(catalogId, partsNumber, (createCatalogUploadError, data) => {
+        smapiClient.catalog.createCatalogUpload(catalogId, partsNumber, (createCatalogUploadError, createResponse) => {
             if (createCatalogUploadError) {
                 callback(createCatalogUploadError);
                 return;
             }
-            const createResponse = tools.convertDataToJsonObject(data.body);
-            if (!createResponse) {
+            if (!createResponse.body) {
                 return process.nextTick(() => {
                     callback('[Error]: The response from create-catalog-upload should not be empty.');
                 });
             }
-            if (!createResponse.id || !createResponse.presignedUploadParts) {
+            const uploadId = createResponse.body.id;
+            if (!uploadId || !createResponse.body.presignedUploadParts) {
                 return callback('[Error]: The response of create-catalog-upload is not valid.');
             }
-
-            const uploadId = createResponse.id;
-            const uploadPartsMap = helper._transformUploadArrayToMap(createResponse.presignedUploadParts);
+            const uploadPartsMap = helper._transformUploadArrayToMap(createResponse.body.presignedUploadParts);
             if (!uploadPartsMap) {
                 return callback('[Error]: The response from create-catalog-upload is empty.');
             }

lib/utils/constants.js

@@ -1,5 +1,3 @@
-const DEFAULT_LIST_MAX_RESULT = 50;
-
 module.exports.METRICS = {
     ENDPOINT: '', // TODO add the official endpoint when we have it
     NEW_USER_LENGTH_DAYS: 3
@@ -38,12 +36,6 @@ module.exports.SKILL = {
     }
 };
 
-module.exports.ISP = {
-    NUMBERS: {
-        DEFAULT_ISP_MAX_RESULTS: 50
-    }
-};
-
 module.exports.CONFIGURATION = {
     JSON_DISPLAY_INDENT: 2,
     OPN_BROWSER_DELAY: 1000,
@@ -271,7 +263,7 @@ module.exports.SMAPI = {
         GET_TASK: 'get-task',
         SEARCH_TASK: 'search-task'
     },
-    DEFAULT_MAX_RESULT_PER_PAGE: DEFAULT_LIST_MAX_RESULT
+    DEFAULT_MAX_RESULT_PER_PAGE: 50
 };
 
 module.exports.HTTP_REQUEST = {