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

package/dist/m365/flow/commands/run/run-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");
@@ -23,28 +32,31 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     defaultProperties() {
         return ['name', 'startTime', 'status'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flow}...`);
-        }
-        const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs?api-version=2016-11-01`;
-        this
-            .getAllItems(url, logger, true)
-            .then(() => {
-            if (this.items.length > 0) {
-                this.items.forEach(i => {
-                    i.startTime = i.properties.startTime;
-                    i.status = i.properties.status;
-                });
-                logger.log(this.items);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flow}...`);
             }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No runs found');
+            const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs?api-version=2016-11-01`;
+            try {
+                yield this.getAllItems(url, logger, true);
+                if (this.items.length > 0) {
+                    this.items.forEach(i => {
+                        i.startTime = i.properties.startTime;
+                        i.status = i.properties.status;
+                    });
+                    logger.log(this.items);
                 }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No runs found');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowRunResubmitCommand_instances, _FlowRunResubmitCommand_initTelemetry, _FlowRunResubmitCommand_initOptions, _FlowRunResubmitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-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 AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
@@ -35,46 +35,45 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
     get description() {
         return 'Resubmits a specific flow run for the specified Microsoft Flow';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Resubmitting run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
-        }
-        const resubmitFlow = () => {
-            this
-                .getTriggerName(args.options.environment, args.options.flow)
-                .then((triggerName) => {
-                if (this.debug) {
-                    logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
-                }
-                const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/triggers/${encodeURIComponent(triggerName)}/histories/${encodeURIComponent(args.options.name)}/resubmit?api-version=2016-11-01`,
-                    headers: {
-                        accept: 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            resubmitFlow();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to resubmit the flow with run ${args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Resubmitting run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+            }
+            const resubmitFlow = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const triggerName = yield this.getTriggerName(args.options.environment, args.options.flow);
+                    if (this.debug) {
+                        logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
+                    }
+                    const requestOptions = {
+                        url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/triggers/${encodeURIComponent(triggerName)}/histories/${encodeURIComponent(args.options.name)}/resubmit?api-version=2016-11-01`,
+                        headers: {
+                            accept: 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    resubmitFlow();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield resubmitFlow();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to resubmit the flow with run ${args.options.name}?`
+                });
+                if (result.continue) {
+                    yield resubmitFlow();
+                }
+            }
+        });
     }
     getTriggerName(environment, flow) {
         const requestOptions = {
@@ -107,7 +106,7 @@ _FlowRunResubmitCommand_instances = new WeakSet(), _FlowRunResubmitCommand_initT
     });
 }, _FlowRunResubmitCommand_initValidators = function _FlowRunResubmitCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flow)) {
+        if (!validation_1.validation.isValidGuid(args.options.flow)) {
             return `${args.options.flow} is not a valid GUID`;
         }
         return true;

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GraphChangelogListCommand_instances, _GraphChangelogListCommand_initTelemetry, _GraphChangelogListCommand_initOptions, _GraphChangelogListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const md_1 = require("../../../../utils/md");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
@@ -48,25 +49,28 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
     defaultProperties() {
         return ['category', 'title', 'description'];
     }
-    commandAction(logger, args, cb) {
-        const allowedChangeType = args.options.changeType && this.allowedChangeTypes.find(x => x.toLocaleLowerCase() === args.options.changeType.toLocaleLowerCase());
-        const searchParam = args.options.changeType ? `/?filterBy=${allowedChangeType}` : '';
-        const requestOptions = {
-            url: `https://developer.microsoft.com/en-us/graph/changelog/rss${searchParam}`,
-            headers: {
-                'accept': 'text/xml',
-                'x-anonymous': 'true'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const allowedChangeType = args.options.changeType && this.allowedChangeTypes.find(x => x.toLocaleLowerCase() === args.options.changeType.toLocaleLowerCase());
+                const searchParam = args.options.changeType ? `/?filterBy=${allowedChangeType}` : '';
+                const requestOptions = {
+                    url: `https://developer.microsoft.com/en-us/graph/changelog/rss${searchParam}`,
+                    headers: {
+                        'accept': 'text/xml',
+                        'x-anonymous': 'true'
+                    }
+                };
+                const output = yield request_1.default.get(requestOptions);
+                const parser = new xmldom_1.DOMParser();
+                const xmlDoc = parser.parseFromString(output.toString(), "text/xml");
+                const changelog = this.filterThroughOptions(args.options, this.mapChangelog(xmlDoc, args));
+                logger.log(changelog.items);
             }
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((output) => {
-            const parser = new xmldom_1.DOMParser();
-            const xmlDoc = parser.parseFromString(output.toString(), "text/xml");
-            const changelog = this.filterThroughOptions(args.options, this.mapChangelog(xmlDoc, args));
-            logger.log(changelog.items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     filterThroughOptions(options, changelog) {
         let items = changelog.items;
@@ -103,7 +107,7 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
             const description = args.options.output === 'text' ?
-                utils_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
+                md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
@@ -144,10 +148,10 @@ _GraphChangelogListCommand_instances = new WeakSet(), _GraphChangelogListCommand
             args.options.services.toLocaleLowerCase().split(',').some(x => !this.allowedServices.map(y => y.toLocaleLowerCase()).includes(x))) {
             return `The services contains invalid value. Specify either ${this.allowedServices.join(', ')} as properties`;
         }
-        if (args.options.startDate && !utils_1.validation.isValidISODate(args.options.startDate)) {
+        if (args.options.startDate && !validation_1.validation.isValidISODate(args.options.startDate)) {
             return 'The startDate is not a valid ISO date string';
         }
-        if (args.options.endDate && !utils_1.validation.isValidISODate(args.options.endDate)) {
+        if (args.options.endDate && !validation_1.validation.isValidISODate(args.options.endDate)) {
             return 'The endDate is not a valid ISO date string';
         }
         if (args.options.endDate && args.options.startDate && new Date(args.options.endDate) < new Date(args.options.startDate)) {

package/dist/m365/graph/commands/schemaextension/schemaextension-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionAddCommand_instances, _GraphSchemaExtensionAddCommand_initOptions, _GraphSchemaExtensionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 GraphSchemaExtensionAddCommand extends GraphCommand_1.default {
@@ -32,33 +32,36 @@ class GraphSchemaExtensionAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates a Microsoft Graph schema extension';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Adding schema extension with id '${args.options.id}'...`);
-        }
-        const targetTypes = args.options.targetTypes.split(',').map(t => t.trim());
-        const properties = JSON.parse(args.options.properties);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/schemaExtensions`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            data: {
-                id: args.options.id,
-                description: args.options.description,
-                owner: args.options.owner,
-                targetTypes,
-                properties
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding schema extension with id '${args.options.id}'...`);
+            }
+            const targetTypes = args.options.targetTypes.split(',').map(t => t.trim());
+            const properties = JSON.parse(args.options.properties);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/schemaExtensions`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data: {
+                    id: args.options.id,
+                    description: args.options.description,
+                    owner: args.options.owner,
+                    targetTypes,
+                    properties
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     validateProperties(propertiesString) {
         let result = false;
@@ -109,7 +112,7 @@ _GraphSchemaExtensionAddCommand_instances = new WeakSet(), _GraphSchemaExtension
     });
 }, _GraphSchemaExtensionAddCommand_initValidators = function _GraphSchemaExtensionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.owner && !utils_1.validation.isValidGuid(args.options.owner)) {
+        if (args.options.owner && !validation_1.validation.isValidGuid(args.options.owner)) {
             return `The specified owner '${args.options.owner}' is not a valid App Id`;
         }
         return this.validateProperties(args.options.properties);

package/dist/m365/graph/commands/schemaextension/schemaextension-get.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");
@@ -21,23 +30,27 @@ class GraphSchemaExtensionGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets the properties of the specified schema extension definition';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Gets the properties of the specified schema extension definition with id '${args.options.id}'...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default.get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Gets the properties of the specified schema extension definition with id '${args.options.id}'...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _GraphSchemaExtensionGetCommand_instances = new WeakSet(), _GraphSchemaExtensionGetCommand_initOptions = function _GraphSchemaExtensionGetCommand_initOptions() {

package/dist/m365/graph/commands/schemaextension/schemaextension-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionListCommand_instances, _GraphSchemaExtensionListCommand_initTelemetry, _GraphSchemaExtensionListCommand_initOptions, _GraphSchemaExtensionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 GraphSchemaExtensionListCommand extends GraphCommand_1.default {
@@ -33,42 +33,46 @@ class GraphSchemaExtensionListCommand extends GraphCommand_1.default {
     get description() {
         return 'Get a list of schemaExtension objects created in the current tenant, that can be InDevelopment, Available, or Deprecated.';
     }
-    commandAction(logger, args, cb) {
-        const filter = this.getFilter(args.options);
-        let url = `${this.resource}/v1.0/schemaExtensions?$select=*${(filter.length > 0 ? '&' + filter : '')}`;
-        if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
-            const rowLimit = `&$top=${Number(args.options.pageSize ? args.options.pageSize : 10) * Number(args.options.pageNumber + 1)}`;
-            url += rowLimit;
-        }
-        const requestOptions = {
-            url: url,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default.get(requestOptions)
-            .then((res) => {
-            if (res.value && res.value.length > 0) {
-                const size = args.options.pageSize ? parseInt(args.options.pageSize) : parseInt(res.value.length);
-                const result = res.value.slice(-size);
-                if (args.options.output !== 'json' && result.length > 1) {
-                    logger.log(result.map((x) => ({
-                        id: x.id,
-                        description: x.description,
-                        targetTypes: x.targetTypes,
-                        status: x.status,
-                        owner: x.owner,
-                        properties: JSON.stringify(x.properties)
-                    })));
-                }
-                else {
-                    logger.log(result);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filter = this.getFilter(args.options);
+            let url = `${this.resource}/v1.0/schemaExtensions?$select=*${(filter.length > 0 ? '&' + filter : '')}`;
+            if (args.options.pageNumber && Number(args.options.pageNumber) > 0) {
+                const rowLimit = `&$top=${Number(args.options.pageSize ? args.options.pageSize : 10) * Number(args.options.pageNumber + 1)}`;
+                url += rowLimit;
+            }
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value && res.value.length > 0) {
+                    const size = args.options.pageSize ? parseInt(args.options.pageSize) : parseInt(res.value.length);
+                    const result = res.value.slice(-size);
+                    if (args.options.output !== 'json' && result.length > 1) {
+                        logger.log(result.map((x) => ({
+                            id: x.id,
+                            description: x.description,
+                            targetTypes: x.targetTypes,
+                            status: x.status,
+                            owner: x.owner,
+                            properties: JSON.stringify(x.properties)
+                        })));
+                    }
+                    else {
+                        logger.log(result);
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getFilter(options) {
         const filters = {};
@@ -110,7 +114,7 @@ _GraphSchemaExtensionListCommand_instances = new WeakSet(), _GraphSchemaExtensio
     });
 }, _GraphSchemaExtensionListCommand_initValidators = function _GraphSchemaExtensionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.owner && !utils_1.validation.isValidGuid(args.options.owner)) {
+        if (args.options.owner && !validation_1.validation.isValidGuid(args.options.owner)) {
             return `${args.options.owner} is not a valid GUID`;
         }
         if (args.options.pageNumber && parseInt(args.options.pageNumber) < 1) {

package/dist/m365/graph/commands/schemaextension/schemaextension-remove.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 _GraphSchemaExtensionRemoveCommand_instances, _GraphSchemaExtensionRemoveCommand_initTelemetry, _GraphSchemaExtensionRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -23,40 +32,42 @@ class GraphSchemaExtensionRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes specified Microsoft Graph schema extension';
     }
-    commandAction(logger, args, cb) {
-        const removeSchemaExtension = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removes specified Microsoft Graph schema extension with id '${args.options.id}'...`);
-            }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            request_1.default.delete(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeSchemaExtension();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the schema extension with ID ${args.options.id}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSchemaExtension = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removes specified Microsoft Graph schema extension with id '${args.options.id}'...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeSchemaExtension();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeSchemaExtension();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the schema extension with ID ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeSchemaExtension();
+                }
+            }
+        });
     }
 }
 _GraphSchemaExtensionRemoveCommand_instances = new WeakSet(), _GraphSchemaExtensionRemoveCommand_initTelemetry = function _GraphSchemaExtensionRemoveCommand_initTelemetry() {