@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

package/dist/m365/outlook/commands/room/room-list.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -6,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookRoomListCommand_instances, _OutlookRoomListCommand_initTelemetry, _OutlookRoomListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListCommand extends GraphCommand_1.default {
@@ -25,17 +34,20 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];
     }
-    commandAction(logger, args, cb) {
-        let endpoint = `${this.resource}/v1.0/places/microsoft.graph.room`;
-        if (args.options.roomlistEmail) {
-            endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
-        }
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((rooms) => {
-            logger.log(rooms);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let endpoint = `${this.resource}/v1.0/places/microsoft.graph.room`;
+            if (args.options.roomlistEmail) {
+                endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
+            }
+            try {
+                const rooms = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(rooms);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _OutlookRoomListCommand_instances = new WeakSet(), _OutlookRoomListCommand_initTelemetry = function _OutlookRoomListCommand_initTelemetry() {

package/dist/m365/outlook/commands/roomlist/roomlist-list.js

@@ -1,6 +1,15 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListListCommand extends GraphCommand_1.default {
@@ -13,13 +22,16 @@ class OutlookRoomListListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName', 'phone', 'emailAddress'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`)
-            .then((roomLists) => {
-            logger.log(roomLists);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const roomLists = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`);
+                logger.log(roomLists);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new OutlookRoomListListCommand();

package/dist/m365/pa/commands/app/app-get.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 const paAppListCommand = require("../app/app-list");
@@ -39,54 +39,53 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName', 'description', 'appVersion', 'owner'];
     }
-    commandAction(logger, args, cb) {
-        if (args.options.name) {
-            const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Power App with name '${args.options.name}'...`);
-            }
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                logger.log(this.setProperties(res));
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
-            }
-            this
-                .getApps(args, logger)
-                .then((getAppsOutput) => {
-                const allApps = JSON.parse(getAppsOutput.stdout);
-                if (allApps.length > 0) {
-                    const app = allApps.find((a) => {
-                        return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
-                    });
-                    if (!!app) {
-                        logger.log(this.setProperties(app));
-                    }
-                    else {
-                        if (this.verbose) {
-                            logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
-                        }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.name) {
+                    const requestOptions = {
+                        url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    if (this.verbose) {
+                        logger.logToStderr(`Retrieving information about Microsoft Power App with name '${args.options.name}'...`);
                     }
+                    const res = yield request_1.default.get(requestOptions);
+                    logger.log(this.setProperties(res));
                 }
                 else {
                     if (this.verbose) {
-                        logger.logToStderr('No apps found');
+                        logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
+                    }
+                    const getAppsOutput = yield this.getApps(args, logger);
+                    const allApps = JSON.parse(getAppsOutput.stdout);
+                    if (allApps.length > 0) {
+                        const app = allApps.find((a) => {
+                            return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
+                        });
+                        if (!!app) {
+                            logger.log(this.setProperties(app));
+                        }
+                        else {
+                            if (this.verbose) {
+                                logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
+                            }
+                        }
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr('No apps found');
+                        }
                     }
                 }
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getApps(args, logger) {
         if (this.verbose) {
@@ -97,7 +96,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli_1.Cli.executeCommandWithOutput(paAppListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     setProperties(app) {
         app.displayName = app.properties.displayName;
@@ -122,7 +121,7 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.name && !utils_1.validation.isValidGuid(args.options.name)) {
+        if (args.options.name && !validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

package/dist/m365/pa/commands/app/app-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppListCommand_instances, _PaAppListCommand_initTelemetry, _PaAppListCommand_initOptions, _PaAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppListCommand extends PowerAppsCommand_1.default {
@@ -35,24 +35,27 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
-        utils_1.odata
-            .getAllItems(url)
-            .then((apps) => {
-            if (apps.length > 0) {
-                apps.forEach(a => {
-                    a.displayName = a.properties.displayName;
-                });
-                logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No apps found');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
+            try {
+                const apps = yield odata_1.odata.getAllItems(url);
+                if (apps.length > 0) {
+                    apps.forEach(a => {
+                        a.displayName = a.properties.displayName;
+                    });
+                    logger.log(apps);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No apps found');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _PaAppListCommand_instances = new WeakSet(), _PaAppListCommand_initTelemetry = function _PaAppListCommand_initTelemetry() {

package/dist/m365/pa/commands/app/app-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppRemoveCommand_instances, _PaAppRemoveCommand_initTelemetry, _PaAppRemoveCommand_initOptions, _PaAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
+const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaAppRemoveCommand extends PowerAppsCommand_1.default {
@@ -34,48 +35,47 @@ class PaAppRemoveCommand extends PowerAppsCommand_1.default {
     get description() {
         return 'Removes the specified Microsoft Power App';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
-        }
-        const removePaApp = () => {
-            const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
-                resolveWithFullResponse: true,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(() => cb(), (rawRes) => {
-                if (rawRes.response && rawRes.response.status === 403) {
-                    cb(`App '${args.options.name}' does not exist`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
+            }
+            const removePaApp = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
+                    resolveWithFullResponse: true,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    this.handleRejectedODataJsonPromise(rawRes, logger, cb);
+                catch (err) {
+                    if (err.response && err.response.status === 403) {
+                        throw new Command_1.CommandError(`App '${args.options.name}' does not exist`);
+                    }
+                    else {
+                        this.handleRejectedODataJsonPromise(err);
+                    }
                 }
             });
-        };
-        if (args.options.confirm) {
-            removePaApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the Microsoft Power App ${args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removePaApp();
+            if (args.options.confirm) {
+                yield removePaApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the Microsoft Power App ${args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removePaApp();
                 }
-            });
-        }
+            }
+        });
     }
 }
 _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry = function _PaAppRemoveCommand_initTelemetry() {
@@ -92,7 +92,7 @@ _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry
     });
 }, _PaAppRemoveCommand_initValidators = function _PaAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.name)) {
+        if (!validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

package/dist/m365/pa/commands/connector/connector-export.js

@@ -38,127 +38,125 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
     alias() {
         return [commands_1.default.CONNECTOR_EXPORT];
     }
-    commandAction(logger, args, cb) {
-        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        let connector;
-        if (this.verbose) {
-            logger.logToStderr('Downloading connector...');
-        }
-        request_1.default
-            .get(requestOptions)
-            .then((connectorRes) => {
-            connector = connectorRes;
-            if (!connector.properties) {
-                return Promise.reject('Properties not present in the api registration information.');
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Creating output folder ${outputFolder}...`);
-            }
-            fs.mkdirSync(outputFolder);
-            const settings = {
-                apiDefinition: "apiDefinition.swagger.json",
-                apiProperties: "apiProperties.json",
-                connectorId: args.options.connector,
-                environment: args.options.environment,
-                icon: "icon.png",
-                powerAppsApiVersion: "2016-11-01",
-                powerAppsUrl: "https://api.powerapps.com"
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
             };
+            let connector;
             if (this.verbose) {
-                logger.logToStderr('Exporting settings...');
+                logger.logToStderr('Downloading connector...');
             }
-            fs.writeFileSync(path.join(outputFolder, 'settings.json'), JSON.stringify(settings, null, 2), 'utf8');
-            const propertiesWhitelist = [
-                "connectionParameters",
-                "iconBrandColor",
-                "capabilities",
-                "policyTemplateInstances"
-            ];
-            const apiProperties = {
-                properties: JSON.parse(JSON.stringify(connector.properties))
-            };
-            Object.keys(apiProperties.properties).forEach(k => {
-                if (propertiesWhitelist.indexOf(k) < 0) {
-                    delete apiProperties.properties[k];
+            try {
+                connector = yield request_1.default.get(requestOptions);
+                if (!connector.properties) {
+                    throw 'Properties not present in the api registration information.';
                 }
-            });
-            if (this.verbose) {
-                logger.logToStderr('Exporting API properties...');
-            }
-            fs.writeFileSync(path.join(outputFolder, 'apiProperties.json'), JSON.stringify(apiProperties, null, 2), 'utf8');
-            if (connector.properties.apiDefinitions &&
-                connector.properties.apiDefinitions.originalSwaggerUrl) {
                 if (this.verbose) {
-                    logger.logToStderr(`Downloading swagger from ${connector.properties.apiDefinitions.originalSwaggerUrl}...`);
+                    logger.logToStderr(`Creating output folder ${outputFolder}...`);
                 }
-                return request_1.default
-                    .get({
-                    url: connector.properties.apiDefinitions.originalSwaggerUrl,
-                    headers: {
-                        'x-anonymous': 'true'
+                fs.mkdirSync(outputFolder);
+                const settings = {
+                    apiDefinition: "apiDefinition.swagger.json",
+                    apiProperties: "apiProperties.json",
+                    connectorId: args.options.connector,
+                    environment: args.options.environment,
+                    icon: "icon.png",
+                    powerAppsApiVersion: "2016-11-01",
+                    powerAppsUrl: "https://api.powerapps.com"
+                };
+                if (this.verbose) {
+                    logger.logToStderr('Exporting settings...');
+                }
+                fs.writeFileSync(path.join(outputFolder, 'settings.json'), JSON.stringify(settings, null, 2), 'utf8');
+                const propertiesWhitelist = [
+                    "connectionParameters",
+                    "iconBrandColor",
+                    "capabilities",
+                    "policyTemplateInstances"
+                ];
+                const apiProperties = {
+                    properties: JSON.parse(JSON.stringify(connector.properties))
+                };
+                Object.keys(apiProperties.properties).forEach(k => {
+                    if (propertiesWhitelist.indexOf(k) < 0) {
+                        delete apiProperties.properties[k];
                     }
                 });
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('originalSwaggerUrl not set. Skipping');
+                if (this.verbose) {
+                    logger.logToStderr('Exporting API properties...');
                 }
-                return Promise.resolve('');
-            }
-        })
-            .then((swagger) => {
-            if (swagger && swagger.length > 0) {
-                if (this.debug) {
-                    logger.logToStderr('Downloaded swagger');
-                    logger.logToStderr(swagger);
+                fs.writeFileSync(path.join(outputFolder, 'apiProperties.json'), JSON.stringify(apiProperties, null, 2), 'utf8');
+                let swagger = '';
+                if (connector.properties.apiDefinitions &&
+                    connector.properties.apiDefinitions.originalSwaggerUrl) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Downloading swagger from ${connector.properties.apiDefinitions.originalSwaggerUrl}...`);
+                    }
+                    swagger = yield request_1.default
+                        .get({
+                        url: connector.properties.apiDefinitions.originalSwaggerUrl,
+                        headers: {
+                            'x-anonymous': 'true'
+                        }
+                    });
                 }
-                if (this.verbose) {
-                    logger.logToStderr('Exporting swagger...');
+                else {
+                    if (this.debug) {
+                        logger.logToStderr('originalSwaggerUrl not set. Skipping');
+                    }
                 }
-                fs.writeFileSync(path.join(outputFolder, 'apiDefinition.swagger.json'), swagger, 'utf8');
-            }
-            if (connector.properties.iconUri) {
-                if (this.verbose) {
-                    logger.logToStderr(`Downloading icon from ${connector.properties.iconUri}...`);
+                if (swagger && swagger.length > 0) {
+                    if (this.debug) {
+                        logger.logToStderr('Downloaded swagger');
+                        logger.logToStderr(swagger);
+                    }
+                    if (this.verbose) {
+                        logger.logToStderr('Exporting swagger...');
+                    }
+                    fs.writeFileSync(path.join(outputFolder, 'apiDefinition.swagger.json'), swagger, 'utf8');
                 }
-                return request_1.default
-                    .get({
-                    url: connector.properties.iconUri,
-                    responseType: 'arraybuffer',
-                    headers: {
-                        'x-anonymous': 'true'
+                let icon = '';
+                if (connector.properties.iconUri) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Downloading icon from ${connector.properties.iconUri}...`);
                     }
-                });
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('iconUri not set. Skipping');
+                    icon = yield request_1.default
+                        .get({
+                        url: connector.properties.iconUri,
+                        responseType: 'arraybuffer',
+                        headers: {
+                            'x-anonymous': 'true'
+                        }
+                    });
                 }
-                return Promise.resolve();
-            }
-        })
-            .then((icon) => {
-            if (icon) {
-                if (this.verbose) {
-                    logger.logToStderr('Exporting icon...');
+                else {
+                    if (this.debug) {
+                        logger.logToStderr('iconUri not set. Skipping');
+                    }
                 }
-                const iconBuffer = Buffer.from(icon, 'utf8');
-                fs.writeFileSync(path.join(outputFolder, 'icon.png'), iconBuffer);
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('No icon retrieved');
+                if (icon) {
+                    if (this.verbose) {
+                        logger.logToStderr('Exporting icon...');
+                    }
+                    const iconBuffer = Buffer.from(icon, 'utf8');
+                    fs.writeFileSync(path.join(outputFolder, 'icon.png'), iconBuffer);
                 }
+                else {
+                    if (this.debug) {
+                        logger.logToStderr('No icon retrieved');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_initTelemetry = function _PaConnectorExportCommand_initTelemetry() {