@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.3261c97

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAppRetractCommand_initOptions, _SpoAppRetractCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,87 +21,86 @@ const utils_1 = require("../../../../utils");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    constructor() {
+        super();
+        _SpoAppRetractCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppRetractCommand_instances, "m", _SpoAppRetractCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppRetractCommand_instances, "m", _SpoAppRetractCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppRetractCommand_instances, "m", _SpoAppRetractCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_RETRACT;
     }
     get description() {
         return 'Retracts the specified app from the specified app catalog';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appCatalogUrl = (!(!args.options.appCatalogUrl)).toString();
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        telemetryProps.scope = args.options.scope || 'tenant';
-        return telemetryProps;
-    }
-    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 utils_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('${encodeURIComponent(args.options.id)}')/retract`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        }
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    retractApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-u, --appCatalogUrl [appCatalogUrl]'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['tenant', 'sitecollection']
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield retractApp();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            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();
+                }
+            }
+        });
     }
-    validate(args) {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+}
+_SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelemetry = function _SpoAppRetractCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
+            confirm: (!(!args.options.confirm)).toString(),
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
+        });
+    });
+}, _SpoAppRetractCommand_initOptions = function _SpoAppRetractCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-u, --appCatalogUrl [appCatalogUrl]'
+    }, {
+        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.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)) {
@@ -96,7 +110,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoAppRetractCommand();
 //# sourceMappingURL=app-retract.js.map

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

@@ -1,75 +1,87 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoAppTeamsPackageDownloadCommand_instances, _SpoAppTeamsPackageDownloadCommand_initTelemetry, _SpoAppTeamsPackageDownloadCommand_initOptions, _SpoAppTeamsPackageDownloadCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const urlUtil_1 = require("../../../../utils/urlUtil");
 const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
+    constructor() {
+        super();
+        _SpoAppTeamsPackageDownloadCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppTeamsPackageDownloadCommand_instances, "m", _SpoAppTeamsPackageDownloadCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppTeamsPackageDownloadCommand_instances, "m", _SpoAppTeamsPackageDownloadCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppTeamsPackageDownloadCommand_instances, "m", _SpoAppTeamsPackageDownloadCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_TEAMSPACKAGE_DOWNLOAD;
     }
     get description() {
         return 'Downloads Teams app package for an SPFx solution deployed to tenant app catalog';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.appCatalogUrl = typeof args.options.appCatalogUrl !== 'undefined';
-        telemetryProps.appItemUniqueId = typeof args.options.appItemUniqueId !== 'undefined';
-        telemetryProps.appItemId = typeof args.options.appItemId !== 'undefined';
-        telemetryProps.appName = typeof args.options.appName !== 'undefined';
-        telemetryProps.fileName = typeof args.options.fileName !== 'undefined';
-        return telemetryProps;
-    }
-    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) {
@@ -136,18 +148,21 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
             this.appCatalogUrl = appCatalogUrl;
         });
     }
-    options() {
-        const options = [
-            { option: '--appItemId [appItemId]' },
-            { option: '--appItemUniqueId [appItemUniqueId]' },
-            { option: '--appName [appName]' },
-            { option: '--fileName [fileName]' },
-            { option: '-u, --appCatalogUrl [appCatalogUrl]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoAppTeamsPackageDownloadCommand_instances = new WeakSet(), _SpoAppTeamsPackageDownloadCommand_initTelemetry = function _SpoAppTeamsPackageDownloadCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined',
+            appItemUniqueId: typeof args.options.appItemUniqueId !== 'undefined',
+            appItemId: typeof args.options.appItemId !== 'undefined',
+            appName: typeof args.options.appName !== 'undefined',
+            fileName: typeof args.options.fileName !== 'undefined'
+        });
+    });
+}, _SpoAppTeamsPackageDownloadCommand_initOptions = function _SpoAppTeamsPackageDownloadCommand_initOptions() {
+    this.options.unshift({ option: '--appItemId [appItemId]' }, { option: '--appItemUniqueId [appItemUniqueId]' }, { option: '--appName [appName]' }, { option: '--fileName [fileName]' }, { option: '-u, --appCatalogUrl [appCatalogUrl]' });
+}, _SpoAppTeamsPackageDownloadCommand_initValidators = function _SpoAppTeamsPackageDownloadCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!args.options.appItemUniqueId &&
             !args.options.appItemId &&
             !args.options.appName) {
@@ -174,7 +189,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
             return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoAppTeamsPackageDownloadCommand();
 //# sourceMappingURL=app-teamspackage-download.js.map

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoAppUninstallCommand_instances, _SpoAppUninstallCommand_initTelemetry, _SpoAppUninstallCommand_initOptions, _SpoAppUninstallCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,84 +21,87 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoAppUninstallCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoAppUninstallCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoAppUninstallCommand_instances, "m", _SpoAppUninstallCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoAppUninstallCommand_instances, "m", _SpoAppUninstallCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoAppUninstallCommand_instances, "m", _SpoAppUninstallCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.APP_UNINSTALL;
     }
     get description() {
         return 'Uninstalls an app from the site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        telemetryProps.scope = args.options.scope || 'tenant';
-        return telemetryProps;
-    }
-    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('${encodeURIComponent(args.options.id)}')/uninstall`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    }
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    uninstallApp();
+                catch (err) {
+                    this.handleRejectedODataPromise(err);
                 }
             });
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-s, --siteUrl <siteUrl>'
-            },
-            {
-                option: '--scope [scope]',
-                autocomplete: ['tenant', 'sitecollection']
-            },
-            {
-                option: '--confirm'
+            if (args.options.confirm) {
+                yield uninstallApp();
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            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();
+                }
+            }
+        });
     }
-    validate(args) {
-        if (args.options.scope) {
-            const testScope = args.options.scope.toLowerCase();
+}
+_SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initTelemetry = function _SpoAppUninstallCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString(),
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
+        });
+    });
+}, _SpoAppUninstallCommand_initOptions = function _SpoAppUninstallCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-s, --siteUrl <siteUrl>'
+    }, {
+        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.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)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
-    }
-}
+    }));
+};
 module.exports = new SpoAppUninstallCommand();
 //# sourceMappingURL=app-uninstall.js.map