@pnp/cli-microsoft365 7.0.0-beta.a9cf617 → 7.0.0-beta.b7ec1d3

package/dist/m365/spo/commands/list/list-roleassignment-add.js

@@ -15,16 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const SpoUserGetCommand = require("../user/user-get");
-const SpoGroupGetCommand = require("../group/group-get");
-const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+const spo_1 = require("../../../../utils/spo");
 class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_ADD;
@@ -57,13 +54,15 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                     const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options, logger);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    const user = yield spo_1.spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
+                    args.options.principalId = user.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    const group = yield spo_1.spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    args.options.principalId = group.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
@@ -89,50 +88,13 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return request_1.default.post(requestOptions);
         });
     }
-    getRoleDefinitionId(options) {
+    getRoleDefinitionId(options, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!options.roleDefinitionName) {
                 return options.roleDefinitionId;
             }
-            const roleDefinitionListCommandOptions = {
-                webUrl: options.webUrl,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) });
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return roleDefinitionId;
-        });
-    }
-    getGroupPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const groupGetCommandOptions = {
-                webUrl: options.webUrl,
-                name: options.groupName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
-            const getGroupOutput = JSON.parse(output.stdout);
-            return getGroupOutput.Id;
-        });
-    }
-    getUserPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userGetCommandOptions = {
-                webUrl: options.webUrl,
-                email: options.upn,
-                id: undefined,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.Id;
+            const roleDefinition = yield spo_1.spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+            return roleDefinition.Id;
         });
     }
 }

package/dist/m365/spo/commands/list/list-roleassignment-remove.js

@@ -73,7 +73,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeRoleAssignment();
             }
             else {
@@ -142,7 +142,7 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListRoleAssignmentRemoveCommand_initOptions = function _SpoListRoleAssignmentRemoveCommand_initOptions() {
@@ -161,7 +161,7 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListRoleAssignmentRemoveCommand_initValidators = function _SpoListRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/list/list-roleinheritance-break.js

@@ -75,7 +75,7 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield breakListRoleInheritance();
             }
             else {
@@ -99,7 +99,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListRoleInheritanceBreakCommand_initOptions = function _SpoListRoleInheritanceBreakCommand_initOptions() {
@@ -114,7 +114,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListRoleInheritanceBreakCommand_initValidators = function _SpoListRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/list/list-roleinheritance-reset.js

@@ -71,7 +71,7 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield resetListRoleInheritance();
             }
             else {
@@ -94,7 +94,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListRoleInheritanceResetCommand_initOptions = function _SpoListRoleInheritanceResetCommand_initOptions() {
@@ -107,7 +107,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListRoleInheritanceResetCommand_initValidators = function _SpoListRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -67,9 +67,6 @@ class SpoListSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.schemaXml) {
-                this.warn(logger, `Option 'schemaXml' is deprecated.`);
-            }
             if (this.verbose) {
                 logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
             }
@@ -116,9 +113,6 @@ class SpoListSetCommand extends SpoCommand_1.default {
         if (options.templateFeatureId) {
             requestBody.TemplateFeatureId = options.templateFeatureId;
         }
-        if (options.schemaXml) {
-            requestBody.SchemaXml = options.schemaXml.replace('\\', '\\\\').replace('"', '\\"');
-        }
         if (options.allowDeletion !== undefined) {
             requestBody.AllowDeletion = options.allowDeletion;
         }
@@ -307,7 +301,6 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
             'newTitle',
             'description',
             'templateFeatureId',
-            'schemaXml',
             'defaultContentApprovalWorkflowId',
             'defaultDisplayFormUrl',
             'defaultEditFormUrl',
@@ -506,8 +499,6 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     }, {
         option: '--restrictUserUpdates [restrictUserUpdates]',
         autocomplete: ['true', 'false']
-    }, {
-        option: '--schemaXml [schemaXml]'
     }, {
         option: '--sendToLocationName [sendToLocationName]'
     }, {

package/dist/m365/spo/commands/list/list-view-field-remove.js

@@ -75,7 +75,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeFieldFromView();
             }
             else {
@@ -116,7 +116,7 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
             viewTitle: typeof args.options.viewTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListViewFieldRemoveCommand_initOptions = function _SpoListViewFieldRemoveCommand_initOptions() {
@@ -137,7 +137,7 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
     }, {
         option: '--title [title]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListViewFieldRemoveCommand_initValidators = function _SpoListViewFieldRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -73,7 +73,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeViewFromList();
             }
             else {
@@ -98,7 +98,7 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
             listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListViewRemoveCommand_initOptions = function _SpoListViewRemoveCommand_initOptions() {
@@ -115,7 +115,7 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
     }, {
         option: '--title [title]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListViewRemoveCommand_initValidators = function _SpoListViewRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/list/list-webhook-remove.js

@@ -71,7 +71,7 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeWebhook();
             }
             else {
@@ -95,7 +95,7 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoListWebhookRemoveCommand_initOptions = function _SpoListWebhookRemoveCommand_initOptions() {
@@ -110,7 +110,7 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
     }, {
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListWebhookRemoveCommand_initValidators = function _SpoListWebhookRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -210,7 +210,7 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
     }, {
         option: '-c, --contentType [contentType]'
     }, {
-        option: '-f, --folder [folder]'
+        option: '--folder [folder]'
     });
 }, _SpoListItemAddCommand_initValidators = function _SpoListItemAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -53,7 +53,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                url: `${requestUrl}/items(${args.options.listItemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -89,7 +89,7 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--itemId <itemId>'
+        option: '--listItemId <listItemId>'
     }, {
         option: '--listId [listId]'
     }, {
@@ -106,8 +106,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (isNaN(parseInt(args.options.itemId))) {
-            return `${args.options.itemId} is not a number`;
+        if (isNaN(parseInt(args.options.listItemId))) {
+            return `${args.options.listItemId} is not a number`;
         }
         return true;
     }));

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

@@ -202,7 +202,7 @@ _SpoListItemListCommand_instances = new WeakSet(), _SpoListItemListCommand_initT
     }, {
         option: '-q, --camlQuery [camlQuery]'
     }, {
-        option: '-f, --fields [fields]'
+        option: '--fields [fields]'
     }, {
         option: '-l, --filter [filter]'
     });

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

@@ -76,7 +76,7 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeListItem();
             }
             else {
@@ -100,7 +100,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             recycle: !!args.options.recycle,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoListItemRemoveCommand_initOptions = function _SpoListItemRemoveCommand_initOptions() {
@@ -117,7 +117,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
     }, {
         option: '--recycle'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRemoveCommand_initValidators = function _SpoListItemRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/listitem/listitem-retentionlabel-remove.js

@@ -39,7 +39,7 @@ class SpoListItemRetentionLabelRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeListItemRetentionLabel(logger, args);
             }
             else {
@@ -103,7 +103,7 @@ _SpoListItemRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListItemR
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoListItemRetentionLabelRemoveCommand_initOptions = function _SpoListItemRetentionLabelRemoveCommand_initOptions() {
@@ -118,7 +118,7 @@ _SpoListItemRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListItemR
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRetentionLabelRemoveCommand_initValidators = function _SpoListItemRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/listitem/listitem-roleassignment-remove.js

@@ -41,7 +41,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeRoleAssignment(logger, args.options);
             }
             else {
@@ -145,7 +145,7 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListItemRoleAssignmentRemoveCommand_initOptions = function _SpoListItemRoleAssignmentRemoveCommand_initOptions() {
@@ -166,7 +166,7 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRoleAssignmentRemoveCommand_initValidators = function _SpoListItemRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-break.js

@@ -43,7 +43,7 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Breaking role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.breakListItemRoleInheritance(args.options);
             }
             else {
@@ -101,7 +101,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initOptions = function _SpoListItemRoleInheritanceBreakCommand_initOptions() {
@@ -118,7 +118,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initValidators = function _SpoListItemRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-reset.js

@@ -43,7 +43,7 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Restore role inheritance of list item in site at ${args.options.webUrl}...`);
             }
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.resetListItemRoleInheritance(args.options);
             }
             else {
@@ -96,7 +96,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListItemRoleInheritanceResetCommand_initOptions = function _SpoListItemRoleInheritanceResetCommand_initOptions() {
@@ -111,7 +111,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListItemRoleInheritanceResetCommand_initValidators = function _SpoListItemRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/navigation/navigation-node-remove.js

@@ -37,7 +37,7 @@ class SpoNavigationNodeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeNode(logger, args.options);
             }
             else {
@@ -80,7 +80,7 @@ _SpoNavigationNodeRemoveCommand_instances = new WeakSet(), _SpoNavigationNodeRem
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             location: args.options.location,
-            confirm: typeof args.options.confirm !== 'undefined'
+            force: typeof args.options.force !== 'undefined'
         });
     });
 }, _SpoNavigationNodeRemoveCommand_initOptions = function _SpoNavigationNodeRemoveCommand_initOptions() {
@@ -92,7 +92,7 @@ _SpoNavigationNodeRemoveCommand_instances = new WeakSet(), _SpoNavigationNodeRem
     }, {
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoNavigationNodeRemoveCommand_initValidators = function _SpoNavigationNodeRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -35,7 +35,7 @@ class SpoOrgAssetsLibraryRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeLibrary(logger, args.options.libraryUrl);
             }
             else {
@@ -83,7 +83,7 @@ _SpoOrgAssetsLibraryRemoveCommand_instances = new WeakSet(), _SpoOrgAssetsLibrar
     this.options.unshift({
         option: '--libraryUrl <libraryUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new SpoOrgAssetsLibraryRemoveCommand();

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

@@ -39,7 +39,7 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield this.removeOrgNewsSite(logger, args.options.url);
             }
             else {
@@ -83,14 +83,14 @@ class SpoOrgNewsSiteRemoveCommand extends SpoCommand_1.default {
 _SpoOrgNewsSiteRemoveCommand_instances = new WeakSet(), _SpoOrgNewsSiteRemoveCommand_initTelemetry = function _SpoOrgNewsSiteRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoOrgNewsSiteRemoveCommand_initOptions = function _SpoOrgNewsSiteRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoOrgNewsSiteRemoveCommand_initValidators = function _SpoOrgNewsSiteRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));

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

@@ -37,37 +37,8 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const removePage = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    requestDigest = reqDigest.FormDigestValue;
-                    if (!pageName.endsWith('.aspx')) {
-                        pageName += '.aspx';
-                    }
-                    if (this.verbose) {
-                        logger.logToStderr(`Removing page ${pageName}...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options
-                            .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
-                        headers: {
-                            'X-RequestDigest': requestDigest,
-                            'X-HTTP-Method': 'DELETE',
-                            'content-type': 'application/json;odata=nometadata',
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
-            if (args.options.confirm) {
-                yield removePage();
+            if (args.options.force) {
+                yield this.removePage(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -77,11 +48,42 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the page '${args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removePage();
+                    yield this.removePage(logger, args);
                 }
             }
         });
     }
+    removePage(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestDigest = '';
+                let pageName = args.options.name;
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                requestDigest = reqDigest.FormDigestValue;
+                if (!pageName.endsWith('.aspx')) {
+                    pageName += '.aspx';
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Removing page ${pageName}...`);
+                }
+                const requestOptions = {
+                    url: `${args.options
+                        .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                    headers: {
+                        'X-RequestDigest': requestDigest,
+                        'X-HTTP-Method': 'DELETE',
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({
@@ -89,7 +91,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptio
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoPageRemoveCommand_initValidators = function _SpoPageRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));