@pnp/cli-microsoft365 10.0.0-beta.7dfc31a → 10.0.0-beta.a868b81

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (48) hide show
  1. package/allCommands.json +1 -1
  2. package/allCommandsFull.json +1 -1
  3. package/dist/Auth.js +11 -12
  4. package/dist/cli/cli.js +14 -0
  5. package/dist/config.js +60 -5
  6. package/dist/m365/base/PowerAutomateCommand.js +1 -1
  7. package/dist/m365/base/SpoCommand.js +1 -1
  8. package/dist/m365/cli/commands/cli-consent.js +2 -2
  9. package/dist/m365/cli/commands/cli-doctor.js +2 -2
  10. package/dist/m365/cli/commands/cli-reconsent.js +2 -3
  11. package/dist/m365/cli/commands/config/config-set.js +12 -4
  12. package/dist/m365/commands/login.js +28 -9
  13. package/dist/m365/commands/setup.js +256 -33
  14. package/dist/m365/commands/setupPresets.js +2 -4
  15. package/dist/m365/connection/commands/connection-list.js +4 -4
  16. package/dist/m365/entra/commands/app/app-add.js +52 -288
  17. package/dist/m365/flow/commands/environment/environment-get.js +1 -1
  18. package/dist/m365/flow/commands/environment/environment-list.js +1 -1
  19. package/dist/m365/flow/commands/flow-disable.js +1 -1
  20. package/dist/m365/flow/commands/flow-enable.js +1 -1
  21. package/dist/m365/flow/commands/flow-export.js +17 -16
  22. package/dist/m365/flow/commands/flow-get.js +1 -1
  23. package/dist/m365/flow/commands/flow-list.js +1 -1
  24. package/dist/m365/flow/commands/flow-remove.js +1 -1
  25. package/dist/m365/flow/commands/owner/owner-ensure.js +1 -1
  26. package/dist/m365/flow/commands/owner/owner-list.js +1 -1
  27. package/dist/m365/flow/commands/owner/owner-remove.js +1 -1
  28. package/dist/m365/flow/commands/run/run-cancel.js +1 -1
  29. package/dist/m365/flow/commands/run/run-get.js +1 -1
  30. package/dist/m365/flow/commands/run/run-list.js +1 -1
  31. package/dist/m365/flow/commands/run/run-resubmit.js +2 -2
  32. package/dist/m365/spo/commands/contenttype/contenttype-field-remove.js +8 -8
  33. package/dist/m365/spo/commands/contenttype/contenttype-field-set.js +2 -2
  34. package/dist/m365/spo/commands/file/file-roleassignment-add.js +17 -54
  35. package/dist/m365/spo/commands/file/file-roleassignment-remove.js +13 -40
  36. package/dist/m365/spo/commands/file/file-roleinheritance-break.js +5 -13
  37. package/dist/m365/spo/commands/file/file-roleinheritance-reset.js +5 -13
  38. package/dist/m365/spo/commands/list/list-get.js +17 -4
  39. package/dist/m365/spo/commands/page/page-section-add.js +185 -34
  40. package/dist/settingsNames.js +6 -1
  41. package/dist/utils/entraApp.js +283 -0
  42. package/dist/utils/spo.js +30 -7
  43. package/docs/docs/_clisettings.mdx +6 -1
  44. package/docs/docs/cmd/setup.mdx +17 -6
  45. package/docs/docs/cmd/spo/contenttype/contenttype-field-remove.mdx +7 -7
  46. package/docs/docs/cmd/spo/contenttype/contenttype-field-set.mdx +2 -2
  47. package/docs/docs/cmd/spo/page/page-section-add.mdx +57 -2
  48. package/package.json +1 -1
@@ -78,15 +78,15 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
78
78
  const updateChildContentTypes = args.options.listTitle || args.options.listId || args.options.listUrl ? false : args.options.updateChildContentTypes === true;
79
79
  if (this.debug) {
80
80
  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}`;
81
- await logger.logToStderr(`Remove FieldLink from ContentType. FieldLinkId='${args.options.fieldLinkId}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
81
+ await logger.logToStderr(`Remove FieldLink from ContentType. Id='${args.options.id}' ; ContentTypeId='${args.options.contentTypeId}' ${additionalLog}`);
82
82
  await logger.logToStderr(`Execute ProcessQuery.`);
83
83
  }
84
84
  let requestBody = '';
85
85
  if (listId) {
86
- 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>`;
86
+ 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>`;
87
87
  }
88
88
  else {
89
- 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>`;
89
+ 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>`;
90
90
  }
91
91
  requestOptions = {
92
92
  url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -110,7 +110,7 @@ class SpoContentTypeFieldRemoveCommand extends SpoCommand {
110
110
  await removeFieldLink();
111
111
  }
112
112
  else {
113
- const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.fieldLinkId} from content type ${args.options.contentTypeId}?` });
113
+ const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the column ${args.options.id} from content type ${args.options.contentTypeId}?` });
114
114
  if (result) {
115
115
  await removeFieldLink();
116
116
  }
@@ -160,9 +160,9 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
160
160
  }, {
161
161
  option: '--listUrl [listUrl]'
162
162
  }, {
163
- option: '-i, --contentTypeId <contentTypeId>'
163
+ option: '--contentTypeId <contentTypeId>'
164
164
  }, {
165
- option: '--fieldLinkId <fieldLinkId>'
165
+ option: '-i, --id <id>'
166
166
  }, {
167
167
  option: '-c, --updateChildContentTypes'
168
168
  }, {
@@ -170,8 +170,8 @@ _SpoContentTypeFieldRemoveCommand_instances = new WeakSet(), _SpoContentTypeFiel
170
170
  });
171
171
  }, _SpoContentTypeFieldRemoveCommand_initValidators = function _SpoContentTypeFieldRemoveCommand_initValidators() {
172
172
  this.validators.push(async (args) => {
173
- if (!validation.isValidGuid(args.options.fieldLinkId)) {
174
- return `${args.options.fieldLinkId} is not a valid GUID`;
173
+ if (!validation.isValidGuid(args.options.id)) {
174
+ return `${args.options.id} is not a valid GUID`;
175
175
  }
176
176
  if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
177
177
  return `${args.options.listId} is not a valid GUID`;
@@ -262,9 +262,9 @@ _SpoContentTypeFieldSetCommand_instances = new WeakSet(), _SpoContentTypeFieldSe
262
262
  this.options.unshift({
263
263
  option: '-u, --webUrl <webUrl>'
264
264
  }, {
265
- option: '-c, --contentTypeId <contentTypeId>'
265
+ option: '--contentTypeId <contentTypeId>'
266
266
  }, {
267
- option: '--id <id>'
267
+ option: '-i, --id <id>'
268
268
  }, {
269
269
  option: '-r, --required [required]',
270
270
  autocomplete: ['true', 'false']
@@ -4,17 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
4
4
  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
5
5
  };
6
6
  var _SpoFileRoleAssignmentAddCommand_instances, _SpoFileRoleAssignmentAddCommand_initTelemetry, _SpoFileRoleAssignmentAddCommand_initOptions, _SpoFileRoleAssignmentAddCommand_initValidators, _SpoFileRoleAssignmentAddCommand_initOptionSets, _SpoFileRoleAssignmentAddCommand_initTypes;
7
- import { cli } from '../../../../cli/cli.js';
8
7
  import request from '../../../../request.js';
9
8
  import { formatting } from '../../../../utils/formatting.js';
9
+ import { spo } from '../../../../utils/spo.js';
10
10
  import { urlUtil } from '../../../../utils/urlUtil.js';
11
11
  import { validation } from '../../../../utils/validation.js';
12
12
  import SpoCommand from '../../../base/SpoCommand.js';
13
13
  import commands from '../../commands.js';
14
- import spoGroupGetCommand from '../group/group-get.js';
15
- import spoRoleDefinitionListCommand from '../roledefinition/roledefinition-list.js';
16
- import spoUserGetCommand from '../user/user-get.js';
17
- import spoFileGetCommand from './file-get.js';
18
14
  class SpoFileRoleAssignmentAddCommand extends SpoCommand {
19
15
  get name() {
20
16
  return commands.FILE_ROLEASSIGNMENT_ADD;
@@ -36,14 +32,14 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
36
32
  await logger.logToStderr(`Adding role assignment to file in site at ${args.options.webUrl}...`);
37
33
  }
38
34
  try {
39
- const fileUrl = await this.getFileURL(args);
40
- const roleDefinitionId = await this.getRoleDefinitionId(args.options);
35
+ const fileUrl = await this.getFileURL(args, logger);
36
+ const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
41
37
  if (args.options.upn) {
42
- const upnPrincipalId = await this.getUserPrincipalId(args.options);
38
+ const upnPrincipalId = await this.getUserPrincipalId(args.options, logger);
43
39
  await this.addRoleAssignment(fileUrl, args.options.webUrl, upnPrincipalId, roleDefinitionId);
44
40
  }
45
41
  else if (args.options.groupName) {
46
- const groupPrincipalId = await this.getGroupPrincipalId(args.options);
42
+ const groupPrincipalId = await this.getGroupPrincipalId(args.options, logger);
47
43
  await this.addRoleAssignment(fileUrl, args.options.webUrl, groupPrincipalId, roleDefinitionId);
48
44
  }
49
45
  else {
@@ -66,60 +62,27 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
66
62
  };
67
63
  return request.post(requestOptions);
68
64
  }
69
- async getRoleDefinitionId(options) {
65
+ async getRoleDefinitionId(options, logger) {
70
66
  if (!options.roleDefinitionName) {
71
67
  return options.roleDefinitionId;
72
68
  }
73
- const roleDefinitionListCommandOptions = {
74
- webUrl: options.webUrl,
75
- output: 'json',
76
- debug: this.debug,
77
- verbose: this.verbose
78
- };
79
- const output = await cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
80
- const getRoleDefinitionListOutput = JSON.parse(output.stdout);
81
- const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
82
- return roleDefinitionId;
69
+ const roleDefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
70
+ return roleDefinition.Id;
83
71
  }
84
- async getGroupPrincipalId(options) {
85
- const groupGetCommandOptions = {
86
- webUrl: options.webUrl,
87
- name: options.groupName,
88
- output: 'json',
89
- debug: this.debug,
90
- verbose: this.verbose
91
- };
92
- const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
93
- const getGroupOutput = JSON.parse(output.stdout);
94
- return getGroupOutput.Id;
72
+ async getGroupPrincipalId(options, logger) {
73
+ const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
74
+ return group.Id;
95
75
  }
96
- async getUserPrincipalId(options) {
97
- const userGetCommandOptions = {
98
- webUrl: options.webUrl,
99
- email: options.upn,
100
- id: undefined,
101
- output: 'json',
102
- debug: this.debug,
103
- verbose: this.verbose
104
- };
105
- const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
106
- const getUserOutput = JSON.parse(output.stdout);
107
- return getUserOutput.Id;
76
+ async getUserPrincipalId(options, logger) {
77
+ const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
78
+ return user.Id;
108
79
  }
109
- async getFileURL(args) {
80
+ async getFileURL(args, logger) {
110
81
  if (args.options.fileUrl) {
111
82
  return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
112
83
  }
113
- const options = {
114
- webUrl: args.options.webUrl,
115
- id: args.options.fileId,
116
- output: 'json',
117
- debug: this.debug,
118
- verbose: this.verbose
119
- };
120
- const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
121
- const getFileOutput = JSON.parse(output.stdout);
122
- return getFileOutput.ServerRelativeUrl;
84
+ const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
85
+ return file.ServerRelativeUrl;
123
86
  }
124
87
  }
125
88
  _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignmentAddCommand_initTelemetry = function _SpoFileRoleAssignmentAddCommand_initTelemetry() {
@@ -7,13 +7,11 @@ var _SpoFileRoleAssignmentRemoveCommand_instances, _SpoFileRoleAssignmentRemoveC
7
7
  import { cli } from '../../../../cli/cli.js';
8
8
  import request from '../../../../request.js';
9
9
  import { formatting } from '../../../../utils/formatting.js';
10
+ import { spo } from '../../../../utils/spo.js';
10
11
  import { urlUtil } from '../../../../utils/urlUtil.js';
11
12
  import { validation } from '../../../../utils/validation.js';
12
13
  import SpoCommand from '../../../base/SpoCommand.js';
13
14
  import commands from '../../commands.js';
14
- import spoGroupGetCommand from '../group/group-get.js';
15
- import spoUserGetCommand from '../user/user-get.js';
16
- import spoFileGetCommand from './file-get.js';
17
15
  class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
18
16
  get name() {
19
17
  return commands.FILE_ROLEASSIGNMENT_REMOVE;
@@ -36,13 +34,13 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
36
34
  await logger.logToStderr(`Removing role assignment for ${args.options.groupName || args.options.upn} from file ${args.options.fileUrl || args.options.fileId}`);
37
35
  }
38
36
  try {
39
- const fileURL = await this.getFileURL(args);
37
+ const fileURL = await this.getFileURL(args, logger);
40
38
  let principalId;
41
39
  if (args.options.groupName) {
42
- principalId = await this.getGroupPrincipalId(args.options);
40
+ principalId = await this.getGroupPrincipalId(args.options, logger);
43
41
  }
44
42
  else if (args.options.upn) {
45
- principalId = await this.getUserPrincipalId(args.options);
43
+ principalId = await this.getUserPrincipalId(args.options, logger);
46
44
  }
47
45
  else {
48
46
  principalId = args.options.principalId;
@@ -71,45 +69,20 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
71
69
  }
72
70
  }
73
71
  }
74
- async getFileURL(args) {
72
+ async getFileURL(args, logger) {
75
73
  if (args.options.fileUrl) {
76
74
  return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
77
75
  }
78
- const options = {
79
- webUrl: args.options.webUrl,
80
- id: args.options.fileId,
81
- output: 'json',
82
- debug: this.debug,
83
- verbose: this.verbose
84
- };
85
- const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
86
- const getFileOutput = JSON.parse(output.stdout);
87
- return getFileOutput.ServerRelativeUrl;
76
+ const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
77
+ return file.ServerRelativeUrl;
88
78
  }
89
- async getUserPrincipalId(options) {
90
- const userGetCommandOptions = {
91
- webUrl: options.webUrl,
92
- email: options.upn,
93
- id: undefined,
94
- output: 'json',
95
- debug: this.debug,
96
- verbose: this.verbose
97
- };
98
- const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
99
- const getUserOutput = JSON.parse(output.stdout);
100
- return getUserOutput.Id;
79
+ async getUserPrincipalId(options, logger) {
80
+ const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
81
+ return user.Id;
101
82
  }
102
- async getGroupPrincipalId(options) {
103
- const groupGetCommandOptions = {
104
- webUrl: options.webUrl,
105
- name: options.groupName,
106
- output: 'json',
107
- debug: this.debug,
108
- verbose: this.verbose
109
- };
110
- const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
111
- const getGroupOutput = JSON.parse(output.stdout);
112
- return getGroupOutput.Id;
83
+ async getGroupPrincipalId(options, logger) {
84
+ const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
85
+ return group.Id;
113
86
  }
114
87
  }
115
88
  _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssignmentRemoveCommand_initTelemetry = function _SpoFileRoleAssignmentRemoveCommand_initTelemetry() {
@@ -7,11 +7,11 @@ var _SpoFileRoleInheritanceBreakCommand_instances, _SpoFileRoleInheritanceBreakC
7
7
  import { cli } from '../../../../cli/cli.js';
8
8
  import request from '../../../../request.js';
9
9
  import { formatting } from '../../../../utils/formatting.js';
10
+ import { spo } from '../../../../utils/spo.js';
10
11
  import { urlUtil } from '../../../../utils/urlUtil.js';
11
12
  import { validation } from '../../../../utils/validation.js';
12
13
  import SpoCommand from '../../../base/SpoCommand.js';
13
14
  import commands from '../../commands.js';
14
- import spoFileGetCommand from './file-get.js';
15
15
  class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
16
16
  get name() {
17
17
  return commands.FILE_ROLEINHERITANCE_BREAK;
@@ -34,7 +34,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
34
34
  await logger.logToStderr(`Breaking role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
35
35
  }
36
36
  try {
37
- const fileURL = await this.getFileURL(args);
37
+ const fileURL = await this.getFileURL(args, logger);
38
38
  const keepExistingPermissions = !args.options.clearExistingPermissions;
39
39
  const requestOptions = {
40
40
  url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
@@ -59,20 +59,12 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
59
59
  }
60
60
  }
61
61
  }
62
- async getFileURL(args) {
62
+ async getFileURL(args, logger) {
63
63
  if (args.options.fileUrl) {
64
64
  return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
65
65
  }
66
- const options = {
67
- webUrl: args.options.webUrl,
68
- id: args.options.fileId,
69
- output: 'json',
70
- debug: this.debug,
71
- verbose: this.verbose
72
- };
73
- const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
74
- const getFileOutput = JSON.parse(output.stdout);
75
- return getFileOutput.ServerRelativeUrl;
66
+ const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
67
+ return file.ServerRelativeUrl;
76
68
  }
77
69
  }
78
70
  _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInheritanceBreakCommand_initTelemetry = function _SpoFileRoleInheritanceBreakCommand_initTelemetry() {
@@ -7,11 +7,11 @@ var _SpoFileRoleInheritanceResetCommand_instances, _SpoFileRoleInheritanceResetC
7
7
  import { cli } from '../../../../cli/cli.js';
8
8
  import request from '../../../../request.js';
9
9
  import { formatting } from '../../../../utils/formatting.js';
10
+ import { spo } from '../../../../utils/spo.js';
10
11
  import { urlUtil } from '../../../../utils/urlUtil.js';
11
12
  import { validation } from '../../../../utils/validation.js';
12
13
  import SpoCommand from '../../../base/SpoCommand.js';
13
14
  import commands from '../../commands.js';
14
- import spoFileGetCommand from './file-get.js';
15
15
  class SpoFileRoleInheritanceResetCommand extends SpoCommand {
16
16
  get name() {
17
17
  return commands.FILE_ROLEINHERITANCE_RESET;
@@ -34,7 +34,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
34
34
  await logger.logToStderr(`Resetting role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
35
35
  }
36
36
  try {
37
- const fileURL = await this.getFileURL(args);
37
+ const fileURL = await this.getFileURL(args, logger);
38
38
  const requestOptions = {
39
39
  url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
40
40
  headers: {
@@ -58,20 +58,12 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
58
58
  }
59
59
  }
60
60
  }
61
- async getFileURL(args) {
61
+ async getFileURL(args, logger) {
62
62
  if (args.options.fileUrl) {
63
63
  return urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
64
64
  }
65
- const options = {
66
- webUrl: args.options.webUrl,
67
- id: args.options.fileId,
68
- output: 'json',
69
- debug: this.debug,
70
- verbose: this.verbose
71
- };
72
- const output = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...options, _: [] } });
73
- const getFileOutput = JSON.parse(output.stdout);
74
- return getFileOutput.ServerRelativeUrl;
65
+ const file = await spo.getFileById(args.options.webUrl, args.options.fileId, logger, this.verbose);
66
+ return file.ServerRelativeUrl;
75
67
  }
76
68
  }
77
69
  _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInheritanceResetCommand_initTelemetry = function _SpoFileRoleInheritanceResetCommand_initTelemetry() {
@@ -22,6 +22,7 @@ class SpoListGetCommand extends SpoCommand {
22
22
  constructor() {
23
23
  super();
24
24
  _SpoListGetCommand_instances.add(this);
25
+ this.supportedBaseTemplates = [101, 109, 110, 111, 113, 114, 115, 116, 117, 119, 121, 122, 123, 126, 130, 175];
25
26
  __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initTelemetry).call(this);
26
27
  __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initOptions).call(this);
27
28
  __classPrivateFieldGet(this, _SpoListGetCommand_instances, "m", _SpoListGetCommand_initValidators).call(this);
@@ -50,11 +51,8 @@ class SpoListGetCommand extends SpoCommand {
50
51
  if (fieldsProperties.expandProperties.length > 0) {
51
52
  queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
52
53
  }
53
- if (queryParams.length === 0) {
54
- queryParams.push(`$expand=VersionPolicies`);
55
- }
56
54
  const requestOptions = {
57
- url: `${requestUrl}?${queryParams.join('&')}`,
55
+ url: `${requestUrl}${queryParams.length > 0 ? `?${queryParams.join('&')}` : ''}`,
58
56
  headers: {
59
57
  'accept': 'application/json;odata=nometadata'
60
58
  },
@@ -67,6 +65,9 @@ class SpoListGetCommand extends SpoCommand {
67
65
  r.Member.PrincipalTypeString = ListPrincipalType[r.Member.PrincipalType];
68
66
  });
69
67
  }
68
+ if (this.supportedBaseTemplates.some(template => template === listInstance.BaseTemplate)) {
69
+ await this.retrieveVersionPolicies(requestUrl, listInstance);
70
+ }
70
71
  if (listInstance.VersionPolicies) {
71
72
  listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
72
73
  }
@@ -96,6 +97,18 @@ class SpoListGetCommand extends SpoCommand {
96
97
  expandProperties: [...new Set(expandProperties)]
97
98
  };
98
99
  }
100
+ async retrieveVersionPolicies(requestUrl, listInstance) {
101
+ const requestOptions = {
102
+ url: `${requestUrl}?$select=VersionPolicies&$expand=VersionPolicies`,
103
+ headers: {
104
+ 'accept': 'application/json;odata=nometadata'
105
+ },
106
+ responseType: 'json'
107
+ };
108
+ const { VersionPolicies } = await request.get(requestOptions);
109
+ listInstance.VersionPolicies = VersionPolicies;
110
+ listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
111
+ }
99
112
  }
100
113
  _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
101
114
  this.telemetry.push((args) => {