@pnp/cli-microsoft365 10.0.0-beta.48e9f7d → 10.0.0-beta.558f289

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

@@ -78,15 +78,15 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
                 const updateChildContentTypes = args.options.listTitle || args.options.listId || args.options.listUrl ? false : args.options.updateChildContentTypes === true;
                 if (this.debug) {
                     const additionalLog = args.options.listTitle ? `; ListTitle='${args.options.listTitle}'` : args.options.listId ? `; ListId='${args.options.listId}'` : args.options.listUrl ? `; ListUrl='${args.options.listUrl}'` : ` ; UpdateChildContentTypes='${updateChildContentTypes}`;
-                    await logger.logToStderr(`Remove FieldLink from ContentType. FieldLinkId='${args.options.fieldLinkId}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
+                    await logger.logToStderr(`Remove FieldLink from ContentType. Id='${args.options.id}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
                     await logger.logToStderr(`Execute ProcessQuery.`);
                 }
                 let requestBody = '';
                 if (listId) {
-                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><Method Name="DeleteObject" Id="21" ObjectPathId="19" /><Method Name="Update" Id="22" ObjectPathId="15"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="17" ParentId="15" Name="FieldLinks" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.fieldLinkId)}}</Parameter></Parameters></Method><Identity Id="15" Name="09eec89e-709b-0000-558c-c222dcaf9162|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
+                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="18" ObjectPathId="17" /><ObjectPath Id="20" ObjectPathId="19" /><Method Name="DeleteObject" Id="21" ObjectPathId="19" /><Method Name="Update" Id="22" ObjectPathId="15"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="17" ParentId="15" Name="FieldLinks" /><Method Id="19" ParentId="17" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="15" Name="09eec89e-709b-0000-558c-c222dcaf9162|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:list:${listId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
                 }
                 else {
-                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.fieldLinkId)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
+                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName=".NET Library" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="77" ObjectPathId="76" /><ObjectPath Id="79" ObjectPathId="78" /><Method Name="DeleteObject" Id="80" ObjectPathId="78" /><Method Name="Update" Id="81" ObjectPathId="24"><Parameters><Parameter Type="Boolean">${updateChildContentTypes}</Parameter></Parameters></Method></Actions><ObjectPaths><Property Id="76" ParentId="24" Name="FieldLinks" /><Method Id="78" ParentId="76" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method><Identity Id="24" Name="6b3ec69e-00a7-0000-55a3-61f8d779d2b3|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting.escapeXml(args.options.contentTypeId)}" /></ObjectPaths></Request>`;
                 }
                 requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -110,7 +110,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
             await removeFieldLink();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.fieldLinkId} from content type ${args.options.contentTypeId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.id} from content type ${args.options.contentTypeId}?` });
             if (result) {
                 await removeFieldLink();
             }
@@ -160,9 +160,9 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '-i, --contentTypeId <contentTypeId>'
+        option: '--contentTypeId <contentTypeId>'
     }, {
-        option: '--fieldLinkId <fieldLinkId>'
+        option: '-i, --id <id>'
     }, {
         option: '-c, --updateChildContentTypes'
     }, {
@@ -170,8 +170,8 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
     });
 }, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.fieldLinkId)) {
-            return `${args.options.fieldLinkId} is not a valid GUID`;
+        if (!validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;

package/dist/m365/spo/commands/contenttype/contenttype-field-set.js

@@ -262,9 +262,9 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-c, --contentTypeId <contentTypeId>'
+        option: '--contentTypeId <contentTypeId>'
     }, {
-        option: '--id <id>'
+        option: '-i, --id <id>'
     }, {
         option: '-r, --required [required]',
         autocomplete: ['true', 'false']

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

@@ -26,14 +26,7 @@ class SpoFeatureListCommand extends SpoCommand {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         try {
             const features = await odata.getAllItems(`${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`);
-            if (features && features.length > 0) {
-                await logger.log(features);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No activated Features found');
-                }
-            }
+            await logger.log(features);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/file/file-copy.js

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets, _SpoFileCopyCommand_initTypes;
 import request from '../../../../request.js';
-import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
+import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -27,6 +27,9 @@ class SpoFileCopyCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTypes).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['targetUrl', 'sourceUrl'];
+    }
     async commandAction(logger, args) {
         try {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
@@ -40,11 +43,12 @@ class SpoFileCopyCommand extends SpoCommand {
             if (newName && !newName.includes('.')) {
                 newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+            const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
                 ignoreVersionHistory: !!args.options.ignoreVersionHistory,
-                newName: newName
+                newName: newName,
+                operation: 'copy'
             });
             if (args.options.skipWait) {
                 return;
@@ -93,13 +97,13 @@ class SpoFileCopyCommand extends SpoCommand {
     getNameConflictBehaviorValue(nameConflictBehavior) {
         switch (nameConflictBehavior?.toLowerCase()) {
             case 'fail':
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
             case 'replace':
-                return CreateCopyJobsNameConflictBehavior.Replace;
+                return CreateFileCopyJobsNameConflictBehavior.Replace;
             case 'rename':
-                return CreateCopyJobsNameConflictBehavior.Rename;
+                return CreateFileCopyJobsNameConflictBehavior.Rename;
             default:
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
         }
     }
     getAbsoluteUrl(webUrl, url) {

package/dist/m365/spo/commands/file/file-move.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets, _SpoFileMoveCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,41 +32,46 @@ class SpoFileMoveCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = await this.getSourcePath(logger, args.options);
+            const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
+            const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
             if (this.verbose) {
-                await logger.logToStderr(`Moving file ${sourcePath} to ${args.options.targetUrl}...`);
+                await logger.logToStderr(`Moving file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
             }
-            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
-            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                absoluteTargetPath += args.options.newName;
+            let newName = args.options.newName;
+            // Add original file extension if not provided
+            if (newName && !newName.includes('.')) {
+                newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            else {
-                // Keep the original file name
-                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                bypassSharedLock: !!args.options.bypassSharedLock,
+                includeItemPermissions: !!args.options.includeItemPermissions,
+                newName: newName,
+                operation: 'move'
+            });
+            if (args.options.skipWait) {
+                return;
             }
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the move job to complete...');
+            }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
+            if (this.verbose) {
+                await logger.logToStderr('Getting information about the destination file...');
+            }
+            // Get destination file data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFileByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFileById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: absoluteSourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: absoluteTargetPath
-                    },
-                    overwrite: args.options.nameConflictBehavior === 'replace',
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
-                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -79,17 +85,30 @@ class SpoFileMoveCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        return file.DecodedUrl;
+    }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
+            case 'replace':
+                return CreateFileCopyJobsNameConflictBehavior.Replace;
+            case 'rename':
+                return CreateFileCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
+        }
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
@@ -99,8 +118,9 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
             nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            retainEditorAndModified: !!args.options.retainEditorAndModified,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            includeItemPermissions: !!args.options.includeItemPermissions,
+            bypassSharedLock: !!args.options.bypassSharedLock,
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_initOptions() {
@@ -118,9 +138,11 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--retainEditorAndModified'
+        option: '--includeItemPermissions'
     }, {
         option: '--bypassSharedLock'
+    }, {
+        option: '--skipWait'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -140,7 +162,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileMoveCommand_initTypes = function _SpoFileMoveCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('retainEditorAndModified', 'bypassSharedLock');
+    this.types.boolean.push('includeItemPermissions', 'bypassSharedLock', 'skipWait');
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -59,6 +59,9 @@ class SpoFileRemoveCommand extends SpoCommand {
                 },
                 responseType: 'json'
             };
+            if (args.options.bypassSharedLock) {
+                requestOptions.headers.Prefer = 'bypass-shared-lock';
+            }
             try {
                 await request.post(requestOptions);
             }
@@ -83,6 +86,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             url: typeof args.options.url !== 'undefined',
             recycle: !!args.options.recycle,
+            bypassSharedLock: !!args.options.bypassSharedLock,
             force: !!args.options.force
         });
     });
@@ -95,6 +99,8 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
         option: '--url [url]'
     }, {
         option: '--recycle'
+    }, {
+        option: '--bypassSharedLock'
     }, {
         option: '-f, --force'
     });
@@ -114,7 +120,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     this.optionSets.push({ options: ['id', 'url'] });
 }, _SpoFileRemoveCommand_initTypes = function _SpoFileRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'id', 'url');
-    this.types.boolean.push('recycle', 'force');
+    this.types.boolean.push('recycle', 'bypassSharedLock', 'force');
 };
 export default new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map

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

@@ -4,17 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoFileRoleAssignmentAddCommand_instances, _SpoFileRoleAssignmentAddCommand_initTelemetry, _SpoFileRoleAssignmentAddCommand_initOptions, _SpoFileRoleAssignmentAddCommand_initValidators, _SpoFileRoleAssignmentAddCommand_initOptionSets, _SpoFileRoleAssignmentAddCommand_initTypes;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoRoleDefinitionListCommand from '../roledefinition/roledefinition-list.js';
-import spoUserGetCommand from '../user/user-get.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleAssignmentAddCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEASSIGNMENT_ADD;
@@ -36,14 +32,14 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
             await logger.logToStderr(`Adding role assignment to file in site at ${args.options.webUrl}...`);
         }
         try {
-            const fileUrl = await this.getFileURL(args);
-            const roleDefinitionId = await this.getRoleDefinitionId(args.options);
+            const fileUrl = await this.getFileURL(args, logger);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
             if (args.options.upn) {
-                const upnPrincipalId = await this.getUserPrincipalId(args.options);
+                const upnPrincipalId = await this.getUserPrincipalId(args.options, logger);
                 await this.addRoleAssignment(fileUrl, args.options.webUrl, upnPrincipalId, roleDefinitionId);
             }
             else if (args.options.groupName) {
-                const groupPrincipalId = await this.getGroupPrincipalId(args.options);
+                const groupPrincipalId = await this.getGroupPrincipalId(args.options, logger);
                 await this.addRoleAssignment(fileUrl, args.options.webUrl, groupPrincipalId, roleDefinitionId);
             }
             else {
@@ -66,60 +62,27 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
         };
         return request.post(requestOptions);
     }
-    async getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options, logger) {
         if (!options.roleDefinitionName) {
             return options.roleDefinitionId;
         }
-        const roleDefinitionListCommandOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
-        const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-        const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-        return roleDefinitionId;
+        const roleDefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+        return roleDefinition.Id;
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
 }
 _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignmentAddCommand_initTelemetry = function _SpoFileRoleAssignmentAddCommand_initTelemetry() {

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

@@ -7,13 +7,11 @@ var _SpoFileRoleAssignmentRemoveCommand_instances, _SpoFileRoleAssignmentRemoveC
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoUserGetCommand from '../user/user-get.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEASSIGNMENT_REMOVE;
@@ -36,13 +34,13 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
                 await logger.logToStderr(`Removing role assignment for ${args.options.groupName || args.options.upn} from file ${args.options.fileUrl || args.options.fileId}`);
             }
             try {
-                const fileURL = await this.getFileURL(args);
+                const fileURL = await this.getFileURL(args, logger);
                 let principalId;
                 if (args.options.groupName) {
-                    principalId = await this.getGroupPrincipalId(args.options);
+                    principalId = await this.getGroupPrincipalId(args.options, logger);
                 }
                 else if (args.options.upn) {
-                    principalId = await this.getUserPrincipalId(args.options);
+                    principalId = await this.getUserPrincipalId(args.options, logger);
                 }
                 else {
                     principalId = args.options.principalId;
@@ -71,45 +69,20 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
             }
         }
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
 }
 _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssignmentRemoveCommand_initTelemetry = function _SpoFileRoleAssignmentRemoveCommand_initTelemetry() {

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

@@ -7,11 +7,11 @@ var _SpoFileRoleInheritanceBreakCommand_instances, _SpoFileRoleInheritanceBreakC
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEINHERITANCE_BREAK;
@@ -34,7 +34,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
                 await logger.logToStderr(`Breaking role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
             }
             try {
-                const fileURL = await this.getFileURL(args);
+                const fileURL = await this.getFileURL(args, logger);
                 const keepExistingPermissions = !args.options.clearExistingPermissions;
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
@@ -59,20 +59,12 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
             }
         }
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
 }
 _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInheritanceBreakCommand_initTelemetry = function _SpoFileRoleInheritanceBreakCommand_initTelemetry() {

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

@@ -7,11 +7,11 @@ var _SpoFileRoleInheritanceResetCommand_instances, _SpoFileRoleInheritanceResetC
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from './file-get.js';
 class SpoFileRoleInheritanceResetCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEINHERITANCE_RESET;
@@ -34,7 +34,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
                 await logger.logToStderr(`Resetting role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
             }
             try {
-                const fileURL = await this.getFileURL(args);
+                const fileURL = await this.getFileURL(args, logger);
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
                     headers: {
@@ -58,20 +58,12 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
             }
         }
     }
-    async getFileURL(args) {
+    async getFileURL(args, logger) {
         if (args.options.fileUrl) {
             return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
         }
-        const options = {
-            webUrl: args.options.webUrl,
-            id: args.options.fileId,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
-        const getFileOutput = JSON.parse(output.stdout);
-        return getFileOutput.ServerRelativeUrl;
+        const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
+        return file.ServerRelativeUrl;
     }
 }
 _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInheritanceResetCommand_initTelemetry = function _SpoFileRoleInheritanceResetCommand_initTelemetry() {