@pnp/cli-microsoft365 6.0.0-beta.38c66cf → 6.0.0-beta.3a04435

package/dist/m365/file/commands/convert/convert-pdf.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 _FileConvertPdfCommand_instances, _FileConvertPdfCommand_initOptions, _FileConvertPdfCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
@@ -11,73 +26,84 @@ const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class FileConvertPdfCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _FileConvertPdfCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FileConvertPdfCommand_instances, "m", _FileConvertPdfCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileConvertPdfCommand_instances, "m", _FileConvertPdfCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CONVERT_PDF;
     }
     get description() {
         return 'Converts the specified file to PDF using Microsoft Graph';
     }
-    commandAction(logger, args, cb) {
-        let sourceFileUrl = '';
-        // path to the local file that contains the PDF-converted source file
-        let localTargetFilePath = args.options.targetFile;
-        let sourceIsLocalFile = true;
-        let targetIsLocalFile = true;
-        let error;
-        const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
-        if (typeof isAppOnlyAuth === 'undefined') {
-            return cb(new Command_1.CommandError('Unable to determine authentication type'));
-        }
-        if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
-            sourceIsLocalFile = false;
-        }
-        if (args.options.targetFile.toLowerCase().startsWith('https://')) {
-            localTargetFilePath = path.join(os.tmpdir(), (0, uuid_1.v4)());
-            targetIsLocalFile = false;
-            if (this.debug) {
-                logger.logToStderr(`Target set to a URL. Will store the temporary converted file at ${localTargetFilePath}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let sourceFileUrl = '';
+            // path to the local file that contains the PDF-converted source file
+            let localTargetFilePath = args.options.targetFile;
+            let sourceIsLocalFile = true;
+            let targetIsLocalFile = true;
+            let error;
+            const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+            if (typeof isAppOnlyAuth === 'undefined') {
+                throw 'Unable to determine authentication type';
             }
-        }
-        this
-            .getSourceFileUrl(logger, args, isAppOnlyAuth)
-            .then((_sourceFileUrl) => {
-            sourceFileUrl = _sourceFileUrl;
-            return this.getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl);
-        })
-            .then((graphFileUrl) => this.convertFile(logger, graphFileUrl))
-            .then(fileResponse => this.writeFileToDisk(logger, fileResponse, localTargetFilePath))
-            .then(_ => this.uploadConvertedFileIfNecessary(logger, targetIsLocalFile, localTargetFilePath, args.options.targetFile))
-            .then(_ => this.deleteRemoteSourceFileIfNecessary(logger, sourceIsLocalFile, sourceFileUrl), 
-        // catch the error from any of the previous promises so that we can
-        // clean up resources in case something went wrong
-        // if this.deleteRemoteSourceFileIfNecessary fails, it won't be caught
-        // here, but rather at the end
-        err => error = err)
-            .then(_ => {
-            // if the target was a remote file, delete the local temp file
-            if (!targetIsLocalFile) {
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting the temporary PDF file at ${localTargetFilePath}...`);
+            if (args.options.sourceFile.toLowerCase().startsWith('https://')) {
+                sourceIsLocalFile = false;
+            }
+            if (args.options.targetFile.toLowerCase().startsWith('https://')) {
+                localTargetFilePath = path.join(os.tmpdir(), (0, uuid_1.v4)());
+                targetIsLocalFile = false;
+                if (this.debug) {
+                    logger.logToStderr(`Target set to a URL. Will store the temporary converted file at ${localTargetFilePath}`);
                 }
+            }
+            try {
                 try {
-                    fs.unlinkSync(localTargetFilePath);
+                    sourceFileUrl = yield this.getSourceFileUrl(logger, args, isAppOnlyAuth);
+                    const graphFileUrl = yield this.getGraphFileUrl(logger, sourceFileUrl, this.sourceFileGraphUrl);
+                    const fileResponse = yield this.convertFile(logger, graphFileUrl);
+                    yield this.writeFileToDisk(logger, fileResponse, localTargetFilePath);
+                    yield this.uploadConvertedFileIfNecessary(logger, targetIsLocalFile, localTargetFilePath, args.options.targetFile);
                 }
-                catch (e) {
-                    return cb(e);
+                catch (err) {
+                    // catch the error from any of the previous promises so that we can
+                    // clean up resources in case something went wrong
+                    // if this.deleteRemoteSourceFileIfNecessary fails, it won't be caught
+                    // here, but rather at the end
+                    error = err;
                 }
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr(`Target is a local path. Not deleting`);
+                yield this.deleteRemoteSourceFileIfNecessary(logger, sourceIsLocalFile, sourceFileUrl);
+                // if the target was a remote file, delete the local temp file
+                if (!targetIsLocalFile) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Deleting the temporary PDF file at ${localTargetFilePath}...`);
+                    }
+                    try {
+                        fs.unlinkSync(localTargetFilePath);
+                    }
+                    catch (e) {
+                        throw e;
+                    }
+                }
+                else {
+                    if (this.debug) {
+                        logger.logToStderr(`Target is a local path. Not deleting`);
+                    }
+                }
+                if (error) {
+                    this.handleRejectedODataJsonPromise(error);
                 }
             }
-            if (error) {
-                this.handleRejectedODataJsonPromise(error, logger, cb);
-            }
-            else {
-                cb();
+            catch (err) {
+                if (err instanceof Command_1.CommandError) {
+                    throw err;
+                }
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
     /**
      * Returns web URL of the file to convert to PDF. If the user specified a URL
@@ -385,19 +411,15 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
             return request_1.default.delete(requestOptions);
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-s, --sourceFile <sourceFile>'
-            },
-            {
-                option: '-t, --targetFile <targetFile>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_FileConvertPdfCommand_instances = new WeakSet(), _FileConvertPdfCommand_initOptions = function _FileConvertPdfCommand_initOptions() {
+    this.options.unshift({
+        option: '-s, --sourceFile <sourceFile>'
+    }, {
+        option: '-t, --targetFile <targetFile>'
+    });
+}, _FileConvertPdfCommand_initValidators = function _FileConvertPdfCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!args.options.sourceFile.toLowerCase().startsWith('https://') &&
             !fs.existsSync(args.options.sourceFile)) {
             // assume local path
@@ -409,7 +431,7 @@ class FileConvertPdfCommand extends GraphCommand_1.default {
             return `Another file found at ${args.options.targetFile}`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new FileConvertPdfCommand();
 //# sourceMappingURL=convert-pdf.js.map

package/dist/m365/file/commands/file-add.js

@@ -1,28 +1,55 @@
 "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 _FileAddCommand_instances, _FileAddCommand_initTelemetry, _FileAddCommand_initOptions, _FileAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const url = require("url");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const GraphCommand_1 = require("../../base/GraphCommand");
 const commands_1 = require("../commands");
 class FileAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _FileAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FileAddCommand_instances, "m", _FileAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FileAddCommand_instances, "m", _FileAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileAddCommand_instances, "m", _FileAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.ADD;
     }
     get description() {
         return 'Uploads file to the specified site';
     }
-    commandAction(logger, args, cb) {
-        let folderUrlWithoutTrailingSlash = args.options.folderUrl;
-        if (folderUrlWithoutTrailingSlash.endsWith('/')) {
-            folderUrlWithoutTrailingSlash = folderUrlWithoutTrailingSlash.substr(0, folderUrlWithoutTrailingSlash.length - 1);
-        }
-        this
-            .getGraphFileUrl(logger, `${folderUrlWithoutTrailingSlash}/${path.basename(args.options.filePath)}`, args.options.siteUrl)
-            .then(graphFileUrl => this.uploadFile(args.options.filePath, graphFileUrl))
-            .then(_ => cb(), rawRes => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let folderUrlWithoutTrailingSlash = args.options.folderUrl;
+            if (folderUrlWithoutTrailingSlash.endsWith('/')) {
+                folderUrlWithoutTrailingSlash = folderUrlWithoutTrailingSlash.substr(0, folderUrlWithoutTrailingSlash.length - 1);
+            }
+            try {
+                const graphFileUrl = yield this.getGraphFileUrl(logger, `${folderUrlWithoutTrailingSlash}/${path.basename(args.options.filePath)}`, args.options.siteUrl);
+                yield this.uploadFile(args.options.filePath, graphFileUrl);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     /**
      * Uploads the specified local file to a document library using Microsoft Graph
@@ -215,27 +242,28 @@ class FileAddCommand extends GraphCommand_1.default {
             return Promise.resolve(drive.id);
         });
     }
-    options() {
-        const options = [
-            { option: '-u, --folderUrl <folderUrl>' },
-            { option: '-p, --filePath <filePath>' },
-            { option: '--siteUrl [siteUrl]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_FileAddCommand_instances = new WeakSet(), _FileAddCommand_initTelemetry = function _FileAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            siteUrl: typeof args.options.siteUrl !== 'undefined'
+        });
+    });
+}, _FileAddCommand_initOptions = function _FileAddCommand_initOptions() {
+    this.options.unshift({ option: '-u, --folderUrl <folderUrl>' }, { option: '-p, --filePath <filePath>' }, { option: '--siteUrl [siteUrl]' });
+}, _FileAddCommand_initValidators = function _FileAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!fs.existsSync(args.options.filePath)) {
             return `Specified source file ${args.options.sourceFile} doesn't exist`;
         }
         if (args.options.siteUrl) {
-            const isValidSiteUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            const isValidSiteUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
             if (isValidSiteUrl !== true) {
                 return isValidSiteUrl;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.folderUrl);
-    }
-}
+        return validation_1.validation.isValidSharePointUrl(args.options.folderUrl);
+    }));
+};
 module.exports = new FileAddCommand();
 //# sourceMappingURL=file-add.js.map

package/dist/m365/file/commands/file-list.js

@@ -1,13 +1,33 @@
 "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 _FileListCommand_instances, _FileListCommand_initTelemetry, _FileListCommand_initOptions, _FileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const odata_1 = require("../../../utils/odata");
+const validation_1 = require("../../../utils/validation");
 const GraphCommand_1 = require("../../base/GraphCommand");
 const commands_1 = require("../commands");
 class FileListCommand extends GraphCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _FileListCommand_instances.add(this);
         this.foldersToGetFilesFrom = [];
+        __classPrivateFieldGet(this, _FileListCommand_instances, "m", _FileListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FileListCommand_instances, "m", _FileListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileListCommand_instances, "m", _FileListCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.LIST;
@@ -18,38 +38,35 @@ class FileListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['name', 'lastModifiedByUser'];
     }
-    commandAction(logger, args, cb) {
-        let webUrl = args.options.webUrl;
-        if (!webUrl.endsWith('/')) {
-            webUrl += '/';
-        }
-        const folderUrl = new URL(args.options.folderUrl, webUrl);
-        let driveId = '';
-        this
-            .getSiteId(args.options.webUrl, logger)
-            .then((siteId) => this.getDocumentLibrary(siteId, folderUrl, args.options.folderUrl, logger))
-            .then((drive) => {
-            driveId = drive.id;
-            return this.getStartingFolderId(drive, folderUrl, logger);
-        })
-            .then((folderId) => {
-            if (this.verbose) {
-                logger.logToStderr(`Loading folders to get files from...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let webUrl = args.options.webUrl;
+            if (!webUrl.endsWith('/')) {
+                webUrl += '/';
             }
-            // add the starting folder to the list of folders to get files from
-            this.foldersToGetFilesFrom.push(folderId);
-            return this.loadFoldersToGetFilesFrom(folderId, driveId, args.options.recursive);
-        })
-            .then(_ => {
-            if (this.debug) {
-                logger.logToStderr(`Folders to get files from: ${this.foldersToGetFilesFrom.join(', ')}`);
+            const folderUrl = new URL(args.options.folderUrl, webUrl);
+            let driveId = '';
+            try {
+                const siteId = yield this.getSiteId(args.options.webUrl, logger);
+                const drive = yield this.getDocumentLibrary(siteId, folderUrl, args.options.folderUrl, logger);
+                driveId = drive.id;
+                const folderId = yield this.getStartingFolderId(drive, folderUrl, logger);
+                if (this.verbose) {
+                    logger.logToStderr(`Loading folders to get files from...`);
+                }
+                // add the starting folder to the list of folders to get files from
+                this.foldersToGetFilesFrom.push(folderId);
+                yield this.loadFoldersToGetFilesFrom(folderId, driveId, args.options.recursive);
+                if (this.debug) {
+                    logger.logToStderr(`Folders to get files from: ${this.foldersToGetFilesFrom.join(', ')}`);
+                }
+                const files = yield this.loadFilesFromFolders(driveId, this.foldersToGetFilesFrom, logger);
+                logger.log(files);
             }
-            return this.loadFilesFromFolders(driveId, this.foldersToGetFilesFrom, logger);
-        })
-            .then(files => {
-            logger.log(files);
-            cb();
-        }, err => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getSiteId(webUrl, logger) {
         if (this.verbose) {
@@ -156,7 +173,7 @@ class FileListCommand extends GraphCommand_1.default {
             .all(folderIds.map((folderId) => 
         // get items from folder. Because we can't filter out folders here
         // we need to get all items from the folder and filter them out later
-        utils_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
+        odata_1.odata.getAllItems(`${this.resource}/v1.0/drives/${driveId}/items/${folderId}/children`)))
             .then(res => {
             // flatten data from all promises
             files = files.concat(...res);
@@ -166,18 +183,17 @@ class FileListCommand extends GraphCommand_1.default {
             return files;
         });
     }
-    options() {
-        const options = [
-            { option: '-u, --webUrl <webUrl>' },
-            { option: '-f, --folderUrl <folderUrl>' },
-            { option: '--recursive' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
 }
+_FileListCommand_instances = new WeakSet(), _FileListCommand_initTelemetry = function _FileListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            recursive: !!args.options.recursive
+        });
+    });
+}, _FileListCommand_initOptions = function _FileListCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-f, --folderUrl <folderUrl>' }, { option: '--recursive' });
+}, _FileListCommand_initValidators = function _FileListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+};
 module.exports = new FileListCommand();
 //# sourceMappingURL=file-list.js.map

package/dist/m365/flow/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 _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
+    constructor() {
+        super();
+        _FlowEnvironmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initOptions).call(this);
+    }
     get name() {
         return commands_1.default.ENVIRONMENT_GET;
     }
@@ -13,38 +33,37 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_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 Flow environment ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/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 Flow environment ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}providers/Microsoft.ProcessSimple/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);
+        });
     }
 }
+_FlowEnvironmentGetCommand_instances = new WeakSet(), _FlowEnvironmentGetCommand_initOptions = function _FlowEnvironmentGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    });
+};
 module.exports = new FlowEnvironmentGetCommand();
 //# sourceMappingURL=environment-get.js.map

package/dist/m365/flow/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 AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
@@ -13,28 +22,31 @@ class FlowEnvironmentListCommand extends AzmgmtCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of Microsoft Flow environments...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value && 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 Flow environments...`);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            const requestOptions = {
+                url: `${this.resource}providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value && 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 FlowEnvironmentListCommand();