@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3a04435

package/dist/m365/spo/commands/app/app-deploy.js

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators;
+var _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators, _SpoAppDeployCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -26,6 +27,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoAppDeployCommand_instances, "m", _SpoAppDeployCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_DEPLOY;
@@ -33,54 +35,53 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Deploys the specified app in the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        let appId = '';
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((_appCatalogUrl) => {
-            appCatalogUrl = _appCatalogUrl;
-            if (args.options.id) {
-                if (this.verbose) {
-                    logger.logToStderr(`Using the specified app id ${args.options.id}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let appId = '';
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            let appCatalogUrl = '';
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                let res;
+                if (args.options.id) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Using the specified app id ${args.options.id}`);
+                    }
+                    res = { UniqueId: args.options.id };
                 }
-                return Promise.resolve({ UniqueId: args.options.id });
-            }
-            else {
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    }
+                    const requestOptions = {
+                        url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    res = yield request_1.default.get(requestOptions);
+                }
+                appId = res.UniqueId;
                 if (this.verbose) {
-                    logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    logger.logToStderr(`Deploying app...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${appId}')/deploy`,
                     headers: {
-                        accept: 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata;charset=utf-8'
                     },
+                    data: { 'skipFeatureDeployment': args.options.skipFeatureDeployment || false },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
+                yield request_1.default.post(requestOptions);
             }
-        })
-            .then((res) => {
-            appId = res.UniqueId;
-            if (this.verbose) {
-                logger.logToStderr(`Deploying app...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${appId}')/deploy`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata;charset=utf-8'
-                },
-                data: { 'skipFeatureDeployment': args.options.skipFeatureDeployment || false },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemetry = function _SpoAppDeployCommand_initTelemetry() {
@@ -118,20 +119,16 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));
+}, _SpoAppDeployCommand_initOptionSets = function _SpoAppDeployCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoAppDeployCommand();
 //# sourceMappingURL=app-deploy.js.map

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

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators;
+var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -26,6 +27,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoAppGetCommand_instances, "m", _SpoAppGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_GET;
@@ -33,48 +35,47 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Gets information about the specific app from the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogSiteUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((appCatalogUrl) => {
-            appCatalogSiteUrl = appCatalogUrl;
-            if (args.options.id) {
-                return Promise.resolve({ UniqueId: args.options.id });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                let appId;
+                if (args.options.id) {
+                    appId = args.options.id;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+                    }
+                    const requestOptions = {
+                        url: `${appCatalogSiteUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const app = yield request_1.default.get(requestOptions);
+                    appId = app.UniqueId;
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving information for app ${appId}...`);
+                }
+                const requestOptions = {
+                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(appId)}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
             }
-            if (this.verbose) {
-                logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${appCatalogSiteUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information for app ${res}...`);
-            }
-            const requestOptions = {
-                url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(res.UniqueId)}')`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = function _SpoAppGetCommand_initTelemetry() {
@@ -109,20 +110,16 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify either the id or the name';
-        }
-        if (args.options.id && args.options.name) {
-            return 'Specify either the id or the name but not both';
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));
+}, _SpoAppGetCommand_initOptionSets = function _SpoAppGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new SpoAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/spo/commands/app/app-install.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppInstallCommand extends SpoCommand_1.default {
@@ -33,20 +33,25 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
     get description() {
         return 'Installs an app from the specified app catalog in the site';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        if (this.verbose) {
-            logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/install`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            if (this.verbose) {
+                logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
+            }
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/install`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataPromise(err);
+            }
+        });
     }
 }
 _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
@@ -72,10 +77,10 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
                 return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppInstallCommand();

package/dist/m365/spo/commands/app/app-instance-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -35,30 +35,34 @@ class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     defaultProperties() {
         return [`Title`, `AppId`];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving installed apps in site at ${args.options.siteUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default.get(requestOptions)
-            .then((apps) => {
-            if (apps.value && apps.value.length > 0) {
-                logger.log(apps.value);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving installed apps in site at ${args.options.siteUrl}...`);
             }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No apps found');
+            const requestOptions = {
+                url: `${args.options.siteUrl}/_api/web/AppTiles?$filter=AppType eq 3`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const apps = yield request_1.default.get(requestOptions);
+                if (apps.value && apps.value.length > 0) {
+                    logger.log(apps.value);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No apps found');
+                    }
                 }
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoAppInStanceListCommand_instances = new WeakSet(), _SpoAppInStanceListCommand_initOptions = function _SpoAppInStanceListCommand_initOptions() {
@@ -67,7 +71,7 @@ _SpoAppInStanceListCommand_instances = new WeakSet(), _SpoAppInStanceListCommand
     });
 }, _SpoAppInStanceListCommand_initValidators = function _SpoAppInStanceListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppListCommand_instances, _SpoAppListCommand_initTelemetry, _SpoAppListCommand_initOptions, _SpoAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -36,41 +37,38 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     defaultProperties() {
         return [`Title`, `ID`, `Deployed`, `AppCatalogVersion`];
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        let appCatalogSiteUrl = '';
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-        })
-            .then((appCatalogUrl) => {
-            appCatalogSiteUrl = appCatalogUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving apps...`);
-            }
-            const requestOptions = {
-                url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((apps) => {
-            if (apps.value && apps.value.length > 0) {
-                logger.log(apps.value);
-            }
-            else {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            let appCatalogSiteUrl = '';
+            let spoUrl = '';
+            try {
+                spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 if (this.verbose) {
-                    logger.logToStderr('No apps found');
+                    logger.logToStderr(`Retrieving apps...`);
+                }
+                const requestOptions = {
+                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const apps = yield request_1.default.get(requestOptions);
+                if (apps.value && apps.value.length > 0) {
+                    logger.log(apps.value);
                 }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No apps found');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry = function _SpoAppListCommand_initTelemetry() {
@@ -99,7 +97,7 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
             if (args.options.appCatalogUrl) {
-                return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+                return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
             }
         }
         return true;

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRemoveCommand_instances, _SpoAppRemoveCommand_initTelemetry, _SpoAppRemoveCommand_initOptions, _SpoAppRemoveCommand_initValidators;
 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 spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -34,46 +35,43 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Removes the specified app from the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-        const removeApp = () => {
-            utils_1.spo
-                .getSpoUrl(logger, this.debug)
-                .then((spoUrl) => {
-                return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-            })
-                .then((appCatalogUrl) => {
-                if (this.debug) {
-                    logger.logToStderr(`Retrieved app catalog URL ${appCatalogUrl}. Removing app from the app catalog...`);
-                }
-                const requestOptions = {
-                    url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/remove`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+            const removeApp = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieved app catalog URL ${appCatalogUrl}. Removing app from the app catalog...`);
                     }
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app ${args.options.id} from the app catalog?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                    const requestOptions = {
+                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/remove`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        }
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the app ${args.options.id} from the app catalog?`
+                });
+                if (result.continue) {
+                    yield removeApp();
+                }
+            }
+        });
     }
 }
 _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemetry = function _SpoAppRemoveCommand_initTelemetry() {
@@ -107,11 +105,11 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));