@pnp/cli-microsoft365 6.0.0-beta.f94d570 → 6.0.0-beta.fcd2cc9

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

@@ -1,4 +1,19 @@
 "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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaConnectorExportCommand_instances, _PaConnectorExportCommand_initTelemetry, _PaConnectorExportCommand_initOptions, _PaConnectorExportCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -7,6 +22,13 @@ const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
 class PaConnectorExportCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaConnectorExportCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaConnectorExportCommand_instances, "m", _PaConnectorExportCommand_initValidators).call(this);
+    }
     get name() {
         return commands_2.default.CONNECTOR_EXPORT;
     }
@@ -16,144 +38,143 @@ 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.environmentName)}%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.environmentName,
+                    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');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
-            },
-            {
-                option: '-c, --connector <connector>'
-            },
-            {
-                option: '--outputFolder [outputFolder]'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_initTelemetry = function _PaConnectorExportCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            outputFolder: typeof args.options.outputFolder !== 'undefined'
+        });
+    });
+}, _PaConnectorExportCommand_initOptions = function _PaConnectorExportCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '-c, --connector <connector>'
+    }, {
+        option: '--outputFolder [outputFolder]'
+    });
+}, _PaConnectorExportCommand_initValidators = function _PaConnectorExportCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.outputFolder &&
             !fs.existsSync(path.resolve(args.options.outputFolder))) {
             return `Specified output folder ${args.options.outputFolder} doesn't exist`;
@@ -163,7 +184,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
             return `Connector output folder ${outputFolder} already exists`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PaConnectorExportCommand();
 //# sourceMappingURL=connector-export.js.map

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

@@ -1,10 +1,30 @@
 "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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaConnectorListCommand_instances, _PaConnectorListCommand_initOptions;
 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("../../../flow/commands");
 const commands_2 = require("../../commands");
 class PaConnectorListCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaConnectorListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaConnectorListCommand_instances, "m", _PaConnectorListCommand_initOptions).call(this);
+    }
     get name() {
         return commands_2.default.CONNECTOR_LIST;
     }
@@ -17,34 +37,33 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
-        utils_1.odata
-            .getAllItems(url)
-            .then((connectors) => {
-            if (connectors.length > 0) {
-                connectors.forEach(c => {
-                    c.displayName = c.properties.displayName;
-                });
-                logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No custom connectors found');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
+            try {
+                const connectors = yield odata_1.odata.getAllItems(url);
+                if (connectors.length > 0) {
+                    connectors.forEach(c => {
+                        c.displayName = c.properties.displayName;
+                    });
+                    logger.log(connectors);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No custom connectors found');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-e, --environment <environment>'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_PaConnectorListCommand_instances = new WeakSet(), _PaConnectorListCommand_initOptions = function _PaConnectorListCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    });
+};
 module.exports = new PaConnectorListCommand();
 //# sourceMappingURL=connector-list.js.map

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

@@ -1,9 +1,29 @@
 "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");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
+    constructor() {
+        super();
+        _PaEnvironmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
     }
@@ -13,38 +33,37 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'id', 'location', 'displayName', 'provisioningState', 'environmentSku', 'azureRegionHint', 'isDefault'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            res.displayName = res.properties.displayName;
-            res.provisioningState = res.properties.provisioningState;
-            res.environmentSku = res.properties.environmentSku;
-            res.azureRegionHint = res.properties.azureRegionHint;
-            res.isDefault = res.properties.isDefault;
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                res.displayName = res.properties.displayName;
+                res.provisioningState = res.properties.provisioningState;
+                res.environmentSku = res.properties.environmentSku;
+                res.azureRegionHint = res.properties.azureRegionHint;
+                res.isDefault = res.properties.isDefault;
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
 }
+_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    });
+};
 module.exports = new PaEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/pa/commands/environment/environment-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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
@@ -13,28 +22,31 @@ class PaEnvironmentListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length > 0) {
-                res.value.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
-                logger.log(res.value);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length > 0) {
+                    res.value.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                    logger.log(res.value);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PaEnvironmentListCommand();