@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -15,8 +15,9 @@ 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 odata_1 = require("../../../../utils/odata");
+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,53 +37,43 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     defaultProperties() {
         return [`Title`, `ID`, `Deployed`, `AppCatalogVersion`];
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.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 apps = yield odata_1.odata.getAllItems(`${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps`);
+                if (apps && apps.length > 0) {
+                    logger.log(apps);
                 }
+                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() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppListCommand_initOptions = function _SpoAppListCommand_initOptions() {
     this.options.unshift({
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
@@ -90,16 +81,16 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
 }, _SpoAppListCommand_initValidators = function _SpoAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection'`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                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,11 @@ 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 formatting_1 = require("../../../../utils/formatting");
+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 +36,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.scope) ? args.options.scope.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('${formatting_1.formatting.encodeQueryParameter(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() {
@@ -81,7 +80,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppRemoveCommand_initOptions = function _SpoAppRemoveCommand_initOptions() {
@@ -90,7 +89,7 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
@@ -98,20 +97,20 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
 }, _SpoAppRemoveCommand_initValidators = function _SpoAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         // verify either 'tenant' or 'sitecollection' specified if scope provided
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                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;
     }));

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAppRetractCommand_initOptions, _SpoAppRetractCommand_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 formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -34,46 +36,43 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     get description() {
         return 'Retracts the specified app from the specified app catalog';
     }
-    commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
-        const retractApp = () => {
-            utils_1.spo
-                .getSpoUrl(logger, this.debug)
-                .then((spoUrl) => {
-                return this.getAppCatalogSiteUrl(logger, spoUrl, args);
-            })
-                .then((appCatalogSiteUrl) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Retracting app...`);
-                }
-                const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/retract`,
-                    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 retractApp = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                    const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
+                    if (this.verbose) {
+                        logger.logToStderr(`Retracting app...`);
                     }
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            retractApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to retract the app ${args.options.id} from the app catalog?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                    const requestOptions = {
+                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/retract`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        }
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    retractApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield retractApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to retract the app ${args.options.id} from the app catalog?`
+                });
+                if (result.continue) {
+                    yield retractApp();
+                }
+            }
+        });
     }
 }
 _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelemetry = function _SpoAppRetractCommand_initTelemetry() {
@@ -81,7 +80,7 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
         Object.assign(this.telemetryProperties, {
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppRetractCommand_initOptions = function _SpoAppRetractCommand_initOptions() {
@@ -90,27 +89,27 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
     });
 }, _SpoAppRetractCommand_initValidators = function _SpoAppRetractCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
             if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the scope is sitecollection`;
+                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;
     }));

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -37,52 +38,51 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
     get description() {
         return 'Downloads Teams app package for an SPFx solution deployed to tenant app catalog';
     }
-    commandAction(logger, args, cb) {
+    commandAction(logger, args) {
         var _a, _b;
-        this.appCatalogUrl = args.options.appCatalogUrl;
-        const appInfo = {
-            id: (_a = args.options.appItemId) !== null && _a !== void 0 ? _a : undefined,
-            packageFileName: (_b = args.options.fileName) !== null && _b !== void 0 ? _b : undefined
-        };
-        if (this.debug) {
-            logger.logToStderr(`appInfo: ${JSON.stringify(appInfo)}`);
-        }
-        this
-            .ensureAppInfo(logger, args, appInfo)
-            .then(_ => {
-            if (this.debug) {
-                logger.logToStderr(`ensureAppInfo: ${JSON.stringify(appInfo)}`);
-            }
-            return this.loadAppCatalogUrl(logger, args);
-        })
-            .then(_ => {
-            const requestOptions = {
-                url: `${this.appCatalogUrl}/_api/web/tenantappcatalog/downloadteamssolution(${appInfo.id})/$value`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'stream'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((file) => {
-            return new Promise((resolve, reject) => {
-                const writer = fs.createWriteStream(appInfo.packageFileName);
-                file.data.pipe(writer);
-                writer.on('error', err => {
-                    reject(err);
-                });
-                writer.on('close', () => {
-                    resolve(appInfo.packageFileName);
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.appCatalogUrl = args.options.appCatalogUrl;
+                const appInfo = {
+                    id: (_a = args.options.appItemId) !== null && _a !== void 0 ? _a : undefined,
+                    packageFileName: (_b = args.options.fileName) !== null && _b !== void 0 ? _b : undefined
+                };
+                if (this.debug) {
+                    logger.logToStderr(`appInfo: ${JSON.stringify(appInfo)}`);
+                }
+                yield this.ensureAppInfo(logger, args, appInfo);
+                if (this.debug) {
+                    logger.logToStderr(`ensureAppInfo: ${JSON.stringify(appInfo)}`);
+                }
+                yield this.loadAppCatalogUrl(logger, args);
+                const requestOptions = {
+                    url: `${this.appCatalogUrl}/_api/web/tenantappcatalog/downloadteamssolution(${appInfo.id})/$value`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'stream'
+                };
+                const file = yield request_1.default.get(requestOptions);
+                // Not possible to use async/await for this promise
+                yield new Promise((resolve, reject) => {
+                    const writer = fs.createWriteStream(appInfo.packageFileName);
+                    file.data.pipe(writer);
+                    writer.on('error', err => {
+                        return reject(err);
+                    });
+                    writer.on('close', () => {
+                        const fileName = appInfo.packageFileName;
+                        if (this.verbose) {
+                            logger.logToStderr(`Package saved to ${fileName}`);
+                        }
+                        return resolve();
+                    });
                 });
-            });
-        })
-            .then((file) => {
-            if (this.verbose) {
-                logger.logToStderr(`Package saved to ${file}`);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     ensureAppInfo(logger, args, appInfo) {
         if (appInfo.id && appInfo.packageFileName) {
@@ -104,7 +104,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
                 url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
             }
             else if (args.options.appName) {
-                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${encodeURIComponent(args.options.appName)}')/ListItemAllFields?$select=Id`;
+                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${formatting_1.formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
             }
             const requestOptions = {
                 url,

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _SpoAppUninstallCommand_initOptions, _SpoAppUninstallCommand_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 formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUninstallCommand extends SpoCommand_1.default {
@@ -34,47 +35,48 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
     get description() {
         return 'Uninstalls an app from the site';
     }
-    commandAction(logger, args, cb) {
-        const uninstallApp = () => {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
-            if (this.verbose) {
-                logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
-            }
-            const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/uninstall`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
+                const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
+                if (this.verbose) {
+                    logger.logToStderr(`Uninstalling app '${args.options.id}' from the site '${args.options.siteUrl}'...`);
                 }
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (rawRes) => this.handleRejectedODataPromise(rawRes, logger, cb));
-        };
-        if (args.options.confirm) {
-            uninstallApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to uninstall the app ${args.options.id} from site ${args.options.siteUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/uninstall`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    }
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    uninstallApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield uninstallApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to uninstall the app ${args.options.id} from site ${args.options.siteUrl}?`
+                });
+                if (result.continue) {
+                    yield uninstallApp();
+                }
+            }
+        });
     }
 }
 _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initTelemetry = function _SpoAppUninstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             confirm: (!(!args.options.confirm)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppUninstallCommand_initOptions = function _SpoAppUninstallCommand_initOptions() {
@@ -83,23 +85,23 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '--confirm'
     });
 }, _SpoAppUninstallCommand_initValidators = function _SpoAppUninstallCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+        if (args.options.appCatalogScope) {
+            const testScope = args.options.appCatalogScope.toLowerCase();
             if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `Scope must be either 'tenant' or 'sitecollection' if specified`;
+                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 SpoAppUninstallCommand();