@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.80d195f

package/dist/m365/search/commands/externalconnection/externalconnection-remove.js

@@ -0,0 +1,101 @@
+"use strict";
+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 _SearchExternalConnectionRemoveCommand_instances, _SearchExternalConnectionRemoveCommand_initTelemetry, _SearchExternalConnectionRemoveCommand_initOptions, _SearchExternalConnectionRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class SearchExternalConnectionRemoveCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _SearchExternalConnectionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionRemoveCommand_instances, "m", _SearchExternalConnectionRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.EXTERNALCONNECTION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific External Connection from Microsoft Search';
+    }
+    getExternalConnectionId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections?$filter=name eq '${encodeURIComponent(args.options.name)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].id);
+            }
+            if (res.value.length === 0) {
+                return Promise.reject(`The specified connection does not exist in Microsoft Search`);
+            }
+            return Promise.reject(`Multiple external connections with name ${args.options.name} found. Please disambiguate (IDs): ${res.value.map(x => x.id).join(', ')}`);
+        });
+    }
+    commandAction(logger, args, cb) {
+        const removeExternalConnection = () => {
+            this
+                .getExternalConnectionId(args)
+                .then((externalConnectionId) => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/external/connections/${encodeURIComponent(externalConnectionId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default
+                    .delete(requestOptions);
+            })
+                .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        };
+        if (args.options.confirm) {
+            removeExternalConnection();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the external connection '${args.options.id || args.options.name}'?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeExternalConnection();
+                }
+            });
+        }
+    }
+}
+_SearchExternalConnectionRemoveCommand_instances = new WeakSet(), _SearchExternalConnectionRemoveCommand_initTelemetry = function _SearchExternalConnectionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SearchExternalConnectionRemoveCommand_initOptions = function _SearchExternalConnectionRemoveCommand_initOptions() {
+    this.options.unshift({ option: '--id [id]' }, { option: '--name [name]' }, { option: '--confirm' });
+}, _SearchExternalConnectionRemoveCommand_initOptionSets = function _SearchExternalConnectionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
+module.exports = new SearchExternalConnectionRemoveCommand();
+//# sourceMappingURL=externalconnection-remove.js.map

package/dist/m365/search/commands.js

@@ -4,6 +4,7 @@ const prefix = 'search';
 exports.default = {
     EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`,
     EXTERNALCONNECTION_GET: `${prefix} externalconnection get`,
-    EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`
+    EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`,
+    EXTERNALCONNECTION_REMOVE: `${prefix} externalconnection remove`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spfx/commands/package/package-generate.js

@@ -131,7 +131,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
             if (this.debug) {
                 logger.log('Writing archive...');
             }
-            this.archive.writeZip(`${args.options.packageName}.sppkg`);
+            this.archive.writeZip(`${args.options.name}.sppkg`);
         }
         catch (err) {
             error = err.message;
@@ -189,7 +189,7 @@ _SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateComma
         });
     });
 }, _SpfxPackageGenerateCommand_initOptions = function _SpfxPackageGenerateCommand_initOptions() {
-    this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --packageName <packageName>' }, { option: '--html <html>' }, {
+    this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --name <name>' }, { option: '--html <html>' }, {
         option: '--enableForTeams [enableForTeams]',
         autocomplete: SpfxPackageGenerateCommand.enableForTeamsOptions
     }, { option: '--exposePageContextGlobally' }, { option: '--exposeTeamsContextGlobally' }, { option: '--allowTenantWideDeployment' }, { option: '--developerName [developerName]' }, { option: '--developerPrivacyUrl [developerPrivacyUrl]' }, { option: '--developerTermsOfUseUrl [developerTermsOfUseUrl]' }, { option: '--developerWebsiteUrl [developerWebsiteUrl]' }, { option: '--developerMpnId [developerMpnId]' });

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -414,6 +414,21 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.15.2': {
+                gulp: {
+                    range: '^4',
+                    fix: 'npm i -g gulp@4'
+                },
+                node: {
+                    range: '^12.13 || ^14.15 || ^16.13',
+                    fix: 'Install Node.js v12.13, v14.15, v16.13 or higher'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -6,7 +6,7 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
         return new Promise((resolve, reject) => {
-            if (args.options.scope === 'sitecollection') {
+            if (args.options.appCatalogScope === 'sitecollection') {
                 return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
             }
             if (args.options.appCatalogUrl) {

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

@@ -36,7 +36,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Adds an app to the specified SharePoint Online app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const overwrite = args.options.overwrite || false;
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -75,7 +75,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             overwrite: (!(!args.options.overwrite)).toString(),
-            scope: args.options.scope || 'tenant',
+            appCatalogScope: args.options.appCatalogScope || 'tenant',
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
         });
     });
@@ -83,7 +83,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     this.options.unshift({
         option: '-p, --filePath <filePath>'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
@@ -93,13 +93,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_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`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);

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

@@ -35,7 +35,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     }
     commandAction(logger, args, cb) {
         let appId = '';
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogUrl = '';
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -90,7 +90,7 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
             name: (!(!args.options.name)).toString(),
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
             skipFeatureDeployment: args.options.skipFeatureDeployment || false,
-            scope: (!(!args.options.scope)).toString()
+            appCatalogScope: (!(!args.options.appCatalogScope)).toString()
         });
     });
 }, _SpoAppDeployCommand_initOptions = function _SpoAppDeployCommand_initOptions() {
@@ -103,19 +103,19 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
     }, {
         option: '--skipFeatureDeployment'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppDeployCommand_initValidators = function _SpoAppDeployCommand_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.id && !args.options.name) {

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

@@ -34,7 +34,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return 'Gets information about the specific app from the specified app catalog';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         utils_1.spo
             .getSpoUrl(logger, this.debug)
@@ -83,7 +83,7 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
             id: (!(!args.options.id)).toString(),
             name: (!(!args.options.name)).toString(),
             appCatalogUrl: (!(!args.options.appCatalogUrl)).toString(),
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppGetCommand_initOptions = function _SpoAppGetCommand_initOptions() {
@@ -94,19 +94,19 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
-        option: '-s, --scope [scope]',
+        option: '-s, --appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppGetCommand_initValidators = function _SpoAppGetCommand_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.id && !args.options.name) {

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

@@ -34,7 +34,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
         return 'Installs an app from the specified app catalog in the site';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        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}'...`);
         }
@@ -52,7 +52,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
 _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelemetry = function _SpoAppInstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppInstallCommand_initOptions = function _SpoAppInstallCommand_initOptions() {
@@ -61,15 +61,15 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppInstallCommand_initValidators = function _SpoAppInstallCommand_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)) {

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

@@ -37,7 +37,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return [`Title`, `ID`, `Deployed`, `AppCatalogVersion`];
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         let appCatalogSiteUrl = '';
         let spoUrl = '';
         utils_1.spo
@@ -77,12 +77,12 @@ _SpoAppListCommand_instances = new WeakSet(), _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,13 +90,13 @@ _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);

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

@@ -35,7 +35,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         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 scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const removeApp = () => {
             utils_1.spo
                 .getSpoUrl(logger, this.debug)
@@ -81,7 +81,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 +90,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,13 +98,13 @@ _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)) {

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

@@ -35,7 +35,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         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 scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         const retractApp = () => {
             utils_1.spo
                 .getSpoUrl(logger, this.debug)
@@ -81,7 +81,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,20 +90,20 @@ _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)) {

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

@@ -36,7 +36,7 @@ class SpoAppUninstallCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const uninstallApp = () => {
-            const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+            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}'...`);
             }
@@ -74,7 +74,7 @@ _SpoAppUninstallCommand_instances = new WeakSet(), _SpoAppUninstallCommand_initT
     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,17 +83,17 @@ _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)) {

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

@@ -34,7 +34,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
         return 'Upgrades app in the specified site';
     }
     commandAction(logger, args, cb) {
-        const scope = (args.options.scope) ? args.options.scope.toLowerCase() : 'tenant';
+        const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
         if (this.verbose) {
             logger.logToStderr(`Upgrading app '${args.options.id}' in site '${args.options.siteUrl}'...`);
         }
@@ -52,7 +52,7 @@ class SpoAppUpgradeCommand extends SpoCommand_1.default {
 _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelemetry = function _SpoAppUpgradeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            scope: args.options.scope || 'tenant'
+            appCatalogScope: args.options.appCatalogScope || 'tenant'
         });
     });
 }, _SpoAppUpgradeCommand_initOptions = function _SpoAppUpgradeCommand_initOptions() {
@@ -61,15 +61,15 @@ _SpoAppUpgradeCommand_instances = new WeakSet(), _SpoAppUpgradeCommand_initTelem
     }, {
         option: '-s, --siteUrl <siteUrl>'
     }, {
-        option: '--scope [scope]',
+        option: '--appCatalogScope [appCatalogScope]',
         autocomplete: ['tenant', 'sitecollection']
     });
 }, _SpoAppUpgradeCommand_initValidators = function _SpoAppUpgradeCommand_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)) {

package/dist/m365/spo/commands/apppage/apppage-set.js

@@ -41,7 +41,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
             },
             responseType: 'json',
             data: {
-                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.pageName}`,
+                serverRelativeUrl: `${utils_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
                 webPartDataAsJson: args.options.webPartData
             }
         };
@@ -54,7 +54,7 @@ _SpoAppPageSetCommand_instances = new WeakSet(), _SpoAppPageSetCommand_initOptio
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-n, --pageName <pageName>'
+        option: '-n, --name <name>'
     }, {
         option: '-d, --webPartData <webPartData>'
     });

package/dist/m365/spo/commands/cdn/cdn-policy-list.js

@@ -36,7 +36,7 @@ class SpoCdnPolicyListCommand extends SpoCommand_1.default {
         return 'Lists CDN policies settings for the current SharePoint Online tenant';
     }
     commandAction(logger, args, cb) {
-        const cdnTypeString = args.options.type || 'Public';
+        const cdnTypeString = args.options.cdnType || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         let spoAdminUrl = '';
         let tenantId = '';
@@ -90,20 +90,20 @@ class SpoCdnPolicyListCommand extends SpoCommand_1.default {
 _SpoCdnPolicyListCommand_instances = new WeakSet(), _SpoCdnPolicyListCommand_initTelemetry = function _SpoCdnPolicyListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
+            cdnType: args.options.cdnType || 'Public'
         });
     });
 }, _SpoCdnPolicyListCommand_initOptions = function _SpoCdnPolicyListCommand_initOptions() {
     this.options.unshift({
-        option: '-t, --type [type]',
+        option: '-t, --cdnType [cdnType]',
         autocomplete: ['Public', 'Private']
     });
 }, _SpoCdnPolicyListCommand_initValidators = function _SpoCdnPolicyListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
+        if (args.options.cdnType) {
+            if (args.options.cdnType !== 'Public' &&
+                args.options.cdnType !== 'Private') {
+                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
             }
         }
         return true;

package/dist/m365/spo/commands/cdn/cdn-policy-set.js

@@ -36,7 +36,7 @@ class SpoCdnPolicySetCommand extends SpoCommand_1.default {
         return 'Sets CDN policy value for the current SharePoint Online tenant';
     }
     commandAction(logger, args, cb) {
-        const cdnTypeString = args.options.type || 'Public';
+        const cdnTypeString = args.options.cdnType || 'Public';
         const cdnType = cdnTypeString === 'Private' ? 1 : 0;
         let spoAdminUrl = '';
         let tenantId = '';
@@ -86,13 +86,13 @@ class SpoCdnPolicySetCommand extends SpoCommand_1.default {
 _SpoCdnPolicySetCommand_instances = new WeakSet(), _SpoCdnPolicySetCommand_initTelemetry = function _SpoCdnPolicySetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public',
+            cdnType: args.options.cdnType || 'Public',
             policy: args.options.policy
         });
     });
 }, _SpoCdnPolicySetCommand_initOptions = function _SpoCdnPolicySetCommand_initOptions() {
     this.options.unshift({
-        option: '-t, --type [type]',
+        option: '-t, --cdnType [cdnType]',
         autocomplete: ['Public', 'Private']
     }, {
         option: '-p, --policy <policy>',
@@ -102,10 +102,10 @@ _SpoCdnPolicySetCommand_instances = new WeakSet(), _SpoCdnPolicySetCommand_initT
     });
 }, _SpoCdnPolicySetCommand_initValidators = function _SpoCdnPolicySetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
+        if (args.options.cdnType) {
+            if (args.options.cdnType !== 'Public' &&
+                args.options.cdnType !== 'Private') {
+                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
             }
         }
         if (!args.options.policy ||