@pnp/cli-microsoft365 9.1.0-beta.4ee36d4 → 9.1.0-beta.8c76288

package/dist/m365/base/PowerAutomateCommand.js

@@ -2,7 +2,7 @@ import auth, { CloudType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
 import { accessToken } from '../../utils/accessToken.js';
 export default class PowerAutomateCommand extends Command {
-    get resource() {
+    static get resource() {
         return 'https://api.flow.microsoft.com';
     }
     async initAction(args, logger) {

package/dist/m365/flow/commands/environment/environment-get.js

@@ -28,7 +28,7 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? ''}...`);
         }
-        let requestUrl = `${this.resource}/providers/Microsoft.ProcessSimple/environments/`;
+        let requestUrl = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/`;
         if (args.options.name) {
             requestUrl += `${formatting.encodeQueryParameter(args.options.name)}`;
         }

package/dist/m365/flow/commands/environment/environment-list.js

@@ -16,7 +16,7 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Retrieving list of Microsoft Flow environments...`);
         }
         try {
-            const res = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
+            const res = await odata.getAllItems(`${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
             if (res.length > 0) {
                 if (args.options.output !== 'json') {
                     res.forEach(e => {

package/dist/m365/flow/commands/flow-disable.js

@@ -26,7 +26,7 @@ class FlowDisableCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/stop?api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/stop?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands/flow-enable.js

@@ -26,7 +26,7 @@ class FlowEnableCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/start?api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/start?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands/flow-export.js

@@ -11,6 +11,7 @@ import { formatting } from '../../../utils/formatting.js';
 import { validation } from '../../../utils/validation.js';
 import PowerPlatformCommand from '../../base/PowerPlatformCommand.js';
 import commands from '../commands.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 class FlowExportCommand extends PowerPlatformCommand {
     get name() {
         return commands.EXPORT;
@@ -27,15 +28,15 @@ class FlowExportCommand extends PowerPlatformCommand {
     }
     async commandAction(logger, args) {
         let filenameFromApi = '';
-        const formatArgument = args.options.format ? args.options.format.toLowerCase() : '';
+        const formatArgument = args.options.format?.toLowerCase() || '';
         if (this.verbose) {
             await logger.logToStderr(`Retrieving package resources for Microsoft Flow ${args.options.name}...`);
         }
         try {
             let res;
             if (formatArgument === 'json') {
-                if (this.debug) {
-                    await logger.logToStderr('format = json, skipping listing package resources step');
+                if (this.verbose) {
+                    await logger.logToStderr('format = json, skipping listing package resources step.');
                 }
             }
             else {
@@ -61,7 +62,7 @@ class FlowExportCommand extends PowerPlatformCommand {
             }
             let requestOptions = {
                 url: formatArgument === 'json' ?
-                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
+                    `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`
                     : `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
@@ -76,17 +77,17 @@ class FlowExportCommand extends PowerPlatformCommand {
                         ? res.resources[key].suggestedCreationType = 'Update'
                         : res.resources[key].suggestedCreationType = 'Existing';
                 });
-                requestOptions['data'] = {
-                    "includedResourceIds": [
+                requestOptions.data = {
+                    includedResourceIds: [
                         `/providers/Microsoft.Flow/flows/${args.options.name}`
                     ],
-                    "details": {
-                        "displayName": args.options.packageDisplayName,
-                        "description": args.options.packageDescription,
-                        "creator": args.options.packageCreatedBy,
-                        "sourceEnvironment": args.options.packageSourceEnvironment
+                    details: {
+                        displayName: args.options.packageDisplayName,
+                        description: args.options.packageDescription,
+                        creator: args.options.packageCreatedBy,
+                        sourceEnvironment: args.options.packageSourceEnvironment
                     },
-                    "resources": res.resources
+                    resources: res.resources
                 };
             }
             res = formatArgument === 'json' ? await request.get(requestOptions) : await request.post(requestOptions);
@@ -99,13 +100,13 @@ class FlowExportCommand extends PowerPlatformCommand {
             // Replace all illegal characters from the file name
             const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
             filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
-            if (this.debug) {
-                await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}`);
+            if (this.verbose) {
+                await logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}.`);
                 await logger.logToStderr('');
             }
             requestOptions = {
                 url: formatArgument === 'json' ?
-                    `https://management.azure.com/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
+                    `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}/exportToARMTemplate?api-version=2016-11-01`
                     : downloadFileUrl,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
                 // to utf8 and binary data is corrupt
@@ -124,7 +125,7 @@ class FlowExportCommand extends PowerPlatformCommand {
             fs.writeFileSync(path, file, 'binary');
             if (!args.options.path || this.verbose) {
                 if (this.verbose) {
-                    await logger.logToStderr(`File saved to path '${path}'`);
+                    await logger.logToStderr(`File saved to path '${path}'.`);
                 }
                 else {
                     await logger.log(path);

package/dist/m365/flow/commands/flow-get.js

@@ -29,7 +29,7 @@ class FlowGetCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -67,7 +67,7 @@ class FlowListCommand extends PowerAutomateCommand {
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        const baseEndpoint = `${this.resource}/providers/Microsoft.ProcessSimple`;
+        const baseEndpoint = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple`;
         const environmentSegment = `/environments/${formatting.encodeQueryParameter(environmentName)}`;
         const adminSegment = `/scopes/admin${environmentSegment}/v2`;
         const flowsEndpoint = '/flows?api-version=2016-11-01';

package/dist/m365/flow/commands/flow-remove.js

@@ -30,7 +30,7 @@ class FlowRemoveCommand extends PowerAutomateCommand {
         }
         const removeFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -52,7 +52,7 @@ class FlowOwnerEnsureCommand extends PowerAutomateCommand {
                 type = 'Group';
             }
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/flow/commands/owner/owner-list.js

@@ -32,7 +32,7 @@ class FlowOwnerListCommand extends PowerAutomateCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
             }
-            const response = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
+            const response = await odata.getAllItems(`${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
             if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(response);
             }

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -47,7 +47,7 @@ class FlowOwnerRemoveCommand extends PowerAutomateCommand {
                     idToRemove = await entraGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                    url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },

package/dist/m365/flow/commands/run/run-cancel.js

@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends PowerAutomateCommand {
         }
         const cancelFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
+                url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/flow/commands/run/run-get.js

@@ -35,7 +35,7 @@ class FlowRunGetCommand extends PowerAutomateCommand {
         }
         const actionsParameter = args.options.withActions ? '$expand=properties%2Factions&' : '';
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?${actionsParameter}api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands/run/run-list.js

@@ -32,7 +32,7 @@ class FlowRunListCommand extends PowerAutomateCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
         }
-        let url = `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+        let url = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
         const filters = this.getFilters(args.options);
         if (filters.length > 0) {
             url += `&$filter=${filters.join(' and ')}`;

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -36,7 +36,7 @@ class FlowRunResubmitCommand extends PowerAutomateCommand {
                     await logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                 }
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
+                    url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -60,7 +60,7 @@ class FlowRunResubmitCommand extends PowerAutomateCommand {
     }
     async getTriggerName(environment, flow) {
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
+            url: `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

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

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

@@ -22,6 +22,7 @@ class SpoListGetCommand extends SpoCommand {
     constructor() {
         super();
         _SpoListGetCommand_instances.add(this);
+        this.supportedBaseTemplates = [101, 109, 110, 111, 113, 114, 115, 116, 117, 119, 121, 122, 123, 126, 130, 175];
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initValidators).call(this);
@@ -50,11 +51,8 @@ class SpoListGetCommand extends SpoCommand {
         if (fieldsProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
         }
-        if (queryParams.length === 0) {
-            queryParams.push(`$expand=VersionPolicies`);
-        }
         const requestOptions = {
-            url: `${requestUrl}?${queryParams.join('&')}`,
+            url: `${requestUrl}${queryParams.length > 0 ? `?${queryParams.join('&')}` : ''}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -67,6 +65,9 @@ class SpoListGetCommand extends SpoCommand {
                     r.Member.PrincipalTypeString = ListPrincipalType[r.Member.PrincipalType];
                 });
             }
+            if (this.supportedBaseTemplates.some(template => template === listInstance.BaseTemplate)) {
+                await this.retrieveVersionPolicies(requestUrl, listInstance);
+            }
             if (listInstance.VersionPolicies) {
                 listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
             }
@@ -96,6 +97,18 @@ class SpoListGetCommand extends SpoCommand {
             expandProperties: [...new Set(expandProperties)]
         };
     }
+    async retrieveVersionPolicies(requestUrl, listInstance) {
+        const requestOptions = {
+            url: `${requestUrl}?$select=VersionPolicies&$expand=VersionPolicies`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const { VersionPolicies } = await request.get(requestOptions);
+        listInstance.VersionPolicies = VersionPolicies;
+        listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
+    }
 }
 _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
     this.telemetry.push((args) => {