@pnp/cli-microsoft365 6.10.0-beta.bd0bd83 → 7.0.0-beta.00a5490

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -44,7 +44,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Restores version ${args.options.label} of the file ${args.options.fileUrl || args.options.fileId} at site ${args.options.webUrl}...`);
             }
             try {
-                if (args.options.confirm) {
+                if (args.options.force) {
                     yield this.restoreVersion(args);
                 }
                 else {
@@ -90,7 +90,7 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
         Object.assign(this.telemetryProperties, {
             fileUrl: args.options.fileUrl,
             fileId: args.options.fileId,
-            confirm: (!!args.options.confirm).toString()
+            force: (!!args.options.force).toString()
         });
     });
 }, _SpoFileVersionRestoreCommand_initOptions = function _SpoFileVersionRestoreCommand_initOptions() {
@@ -103,7 +103,7 @@ _SpoFileVersionRestoreCommand_instances = new WeakSet(), _SpoFileVersionRestoreC
     }, {
         option: '-i, --fileId [fileId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFileVersionRestoreCommand_initValidators = function _SpoFileVersionRestoreCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -99,7 +99,7 @@ _SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemet
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url [url]'
+        option: '--url [url]'
     }, {
         option: '-i, --id [id]'
     }, {

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

@@ -132,7 +132,7 @@ _SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelem
     }, {
         option: '-p, --parentFolderUrl <parentFolderUrl>'
     }, {
-        option: '-f, --fields [fields]'
+        option: '--fields [fields]'
     }, {
         option: '--filter [filter]'
     }, {

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

@@ -38,7 +38,7 @@ class SpoFolderRemoveCommand 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.removeFolder(logger, args.options);
             }
             else {
@@ -87,18 +87,18 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             recycle: (!(!args.options.recycle)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url <url>'
+        option: '--url <url>'
     }, {
         option: '--recycle'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRemoveCommand_initValidators = function _SpoFolderRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/folder/folder-rename.js

@@ -75,7 +75,7 @@ _SpoFolderRenameCommand_instances = new WeakSet(), _SpoFolderRenameCommand_initO
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --url <url>'
+        option: '--url <url>'
     }, {
         option: '-n, --name <name>'
     });

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

@@ -41,7 +41,7 @@ class SpoFolderRetentionLabelRemoveCommand 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.removeFolderRetentionLabel(logger, args);
             }
             else {
@@ -66,7 +66,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
                         webUrl: args.options.webUrl,
                         listId: folderProperties.ListItemAllFields.ParentList.Id,
                         listItemId: folderProperties.ListItemAllFields.Id,
-                        confirm: true,
+                        force: true,
                         output: 'json',
                         debug: this.debug,
                         verbose: this.verbose
@@ -80,7 +80,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
                     const options = {
                         webUrl: args.options.webUrl,
                         listUrl: folderProperties.ServerRelativeUrl,
-                        confirm: true,
+                        force: true,
                         output: 'json',
                         debug: this.debug,
                         verbose: this.verbose
@@ -125,7 +125,7 @@ _SpoFolderRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFolderReten
         Object.assign(this.telemetryProperties, {
             folderUrl: typeof args.options.folderUrl !== 'undefined',
             folderId: typeof args.options.folderId !== 'undefined',
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRetentionLabelRemoveCommand_initOptions = function _SpoFolderRetentionLabelRemoveCommand_initOptions() {
@@ -136,7 +136,7 @@ _SpoFolderRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoFolderReten
     }, {
         option: '-i, --folderId [folderId]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRetentionLabelRemoveCommand_initValidators = function _SpoFolderRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -170,7 +170,7 @@ _SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssi
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '--folderUrl <folderUrl>'
     }, {
         option: '--principalId [principalId]'
     }, {

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

@@ -63,7 +63,7 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeRoleAssignment();
             }
             else {
@@ -129,14 +129,14 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
             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()
         });
     });
 }, _SpoFolderRoleAssignmentRemoveCommand_initOptions = function _SpoFolderRoleAssignmentRemoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '--folderUrl <folderUrl>'
     }, {
         option: '--principalId [principalId]'
     }, {
@@ -144,7 +144,7 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
     }, {
         option: '--groupName [groupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRoleAssignmentRemoveCommand_initValidators = function _SpoFolderRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -63,7 +63,7 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield breakFolderRoleInheritance();
             }
             else {
@@ -84,18 +84,18 @@ _SpoFolderRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFolderRoleI
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             clearExistingPermissions: !!args.options.clearExistingPermissions,
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRoleInheritanceBreakCommand_initOptions = function _SpoFolderRoleInheritanceBreakCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '--folderUrl <folderUrl>'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRoleInheritanceBreakCommand_initValidators = function _SpoFolderRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -62,7 +62,7 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield resetFolderRoleInheritance();
             }
             else {
@@ -82,16 +82,16 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
 _SpoFolderRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFolderRoleInheritanceResetCommand_initTelemetry = function _SpoFolderRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: !!args.options.confirm
+            force: !!args.options.force
         });
     });
 }, _SpoFolderRoleInheritanceResetCommand_initOptions = function _SpoFolderRoleInheritanceResetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '--folderUrl <folderUrl>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoFolderRoleInheritanceResetCommand_initValidators = function _SpoFolderRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -59,7 +59,7 @@ class SpoGroupMemberRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.confirm) {
+            if (args.options.force) {
                 if (this.debug) {
                     logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
                 }
@@ -153,7 +153,7 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
             userId: (!(!args.options.userId)).toString(),
             aadGroupId: (!(!args.options.groupId)).toString(),
             aadGroupName: (!(!args.options.groupName)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoGroupMemberRemoveCommand_initOptions = function _SpoGroupMemberRemoveCommand_initOptions() {
@@ -174,7 +174,7 @@ _SpoGroupMemberRemoveCommand_instances = new WeakSet(), _SpoGroupMemberRemoveCom
     }, {
         option: '--aadGroupName [aadGroupName]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoGroupMemberRemoveCommand_initValidators = function _SpoGroupMemberRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -74,7 +74,7 @@ class SpoGroupRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeGroup();
             }
             else {
@@ -96,7 +96,7 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
             name: (!(!args.options.name)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoGroupRemoveCommand_initOptions = function _SpoGroupRemoveCommand_initOptions() {
@@ -107,7 +107,7 @@ _SpoGroupRemoveCommand_instances = new WeakSet(), _SpoGroupRemoveCommand_initTel
     }, {
         option: '--name [name]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoGroupRemoveCommand_initValidators = function _SpoGroupRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -61,7 +61,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeHomeSite();
             }
             else {
@@ -81,12 +81,12 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
 _SpoHomeSiteRemoveCommand_instances = new WeakSet(), _SpoHomeSiteRemoveCommand_initTelemetry = function _SpoHomeSiteRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoHomeSiteRemoveCommand_initOptions = function _SpoHomeSiteRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new SpoHomeSiteRemoveCommand();

package/dist/m365/spo/commands/hubsite/hubsite-data-get.js

@@ -73,7 +73,7 @@ _SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_i
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --forceRefresh'
+        option: '--forceRefresh'
     });
 }, _SpoHubSiteDataGetCommand_initValidators = function _SpoHubSiteDataGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

package/dist/m365/spo/commands/hubsite/hubsite-disconnect.js

@@ -62,7 +62,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield disconnectHubSite();
             }
             else {
@@ -127,7 +127,7 @@ _SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCom
     }, {
         option: '-u, --url [url]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoHubSiteDisconnectCommand_initOptionSets = function _SpoHubSiteDisconnectCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'title', 'url'] });

package/dist/m365/spo/commands/hubsite/hubsite-rights-revoke.js

@@ -68,7 +68,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield revokeRights();
             }
             else {
@@ -88,7 +88,7 @@ class SpoHubSiteRightsRevokeCommand extends SpoCommand_1.default {
 _SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevokeCommand_initTelemetry = function _SpoHubSiteRightsRevokeCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoHubSiteRightsRevokeCommand_initOptions = function _SpoHubSiteRightsRevokeCommand_initOptions() {
@@ -97,7 +97,7 @@ _SpoHubSiteRightsRevokeCommand_instances = new WeakSet(), _SpoHubSiteRightsRevok
     }, {
         option: '-p, --principals <principals>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoHubSiteRightsRevokeCommand_initValidators = function _SpoHubSiteRightsRevokeCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.hubSiteUrl); }));

package/dist/m365/spo/commands/hubsite/hubsite-unregister.js

@@ -57,7 +57,7 @@ class SpoHubSiteUnregisterCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield unregisterHubSite();
             }
             else {
@@ -77,14 +77,14 @@ class SpoHubSiteUnregisterCommand extends SpoCommand_1.default {
 _SpoHubSiteUnregisterCommand_instances = new WeakSet(), _SpoHubSiteUnregisterCommand_initTelemetry = function _SpoHubSiteUnregisterCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: args.options.confirm || false
+            force: args.options.force || false
         });
     });
 }, _SpoHubSiteUnregisterCommand_initOptions = function _SpoHubSiteUnregisterCommand_initOptions() {
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoHubSiteUnregisterCommand_initValidators = function _SpoHubSiteUnregisterCommand_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/knowledgehub/knowledgehub-remove.js

@@ -62,7 +62,7 @@ class SpoKnowledgehubRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 if (this.debug) {
                     logger.logToStderr('Confirmation bypassed by entering confirm option. Removing Knowledge Hub Site setting...');
                 }
@@ -85,12 +85,12 @@ class SpoKnowledgehubRemoveCommand extends SpoCommand_1.default {
 _SpoKnowledgehubRemoveCommand_instances = new WeakSet(), _SpoKnowledgehubRemoveCommand_initTelemetry = function _SpoKnowledgehubRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoKnowledgehubRemoveCommand_initOptions = function _SpoKnowledgehubRemoveCommand_initOptions() {
     this.options.unshift({
-        option: '--confirm'
+        option: '-f, --force'
     });
 };
 module.exports = new SpoKnowledgehubRemoveCommand();

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

@@ -72,7 +72,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeContentTypeFromList();
             }
             else {
@@ -95,7 +95,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
             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()
         });
     });
 }, _SpoListContentTypeRemoveCommand_initOptions = function _SpoListContentTypeRemoveCommand_initOptions() {
@@ -110,7 +110,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
     }, {
         option: '-i, --id <id>'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListContentTypeRemoveCommand_initValidators = function _SpoListContentTypeRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -85,7 +85,7 @@ _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions =
     }, {
         option: '-p, --properties [properties]'
     }, {
-        option: '-f, --filter [filter]'
+        option: '--filter [filter]'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));

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

@@ -66,7 +66,7 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
                     this.handleRejectedODataJsonPromise(err);
                 }
             });
-            if (args.options.confirm) {
+            if (args.options.force) {
                 yield removeList();
             }
             else {
@@ -88,7 +88,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
             title: (!(!args.options.title)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            force: (!(!args.options.force)).toString()
         });
     });
 }, _SpoListRemoveCommand_initOptions = function _SpoListRemoveCommand_initOptions() {
@@ -99,7 +99,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListRemoveCommand_initValidators = function _SpoListRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -39,7 +39,7 @@ class SpoListRetentionLabelRemoveCommand 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.removeListRetentionLabel(logger, args);
             }
             else {
@@ -117,7 +117,7 @@ _SpoListRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListRetention
             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
         });
     });
 }, _SpoListRetentionLabelRemoveCommand_initOptions = function _SpoListRetentionLabelRemoveCommand_initOptions() {
@@ -130,7 +130,7 @@ _SpoListRetentionLabelRemoveCommand_instances = new WeakSet(), _SpoListRetention
     }, {
         option: '-l, --listUrl [listUrl]'
     }, {
-        option: '--confirm'
+        option: '-f, --force'
     });
 }, _SpoListRetentionLabelRemoveCommand_initValidators = function _SpoListRetentionLabelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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* () {