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

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 (126) hide show
  1. package/allCommands.json +1 -1
  2. package/allCommandsFull.json +1 -1
  3. package/dist/Auth.js +14 -13
  4. package/dist/Command.js +4 -1
  5. package/dist/cli/cli.js +14 -0
  6. package/dist/config.js +60 -5
  7. package/dist/m365/base/PowerAutomateCommand.js +1 -1
  8. package/dist/m365/base/SpoCommand.js +1 -1
  9. package/dist/m365/cli/commands/cli-consent.js +2 -2
  10. package/dist/m365/cli/commands/cli-doctor.js +2 -2
  11. package/dist/m365/cli/commands/cli-reconsent.js +2 -3
  12. package/dist/m365/cli/commands/config/config-set.js +12 -4
  13. package/dist/m365/commands/login.js +28 -9
  14. package/dist/m365/commands/setup.js +256 -33
  15. package/dist/m365/commands/setupPresets.js +2 -4
  16. package/dist/m365/connection/commands/connection-list.js +4 -4
  17. package/dist/m365/entra/commands/app/app-add.js +52 -288
  18. package/dist/m365/file/commands/file-move.js +135 -0
  19. package/dist/m365/file/commands.js +2 -1
  20. package/dist/m365/flow/commands/environment/environment-get.js +1 -1
  21. package/dist/m365/flow/commands/environment/environment-list.js +1 -1
  22. package/dist/m365/flow/commands/flow-disable.js +1 -1
  23. package/dist/m365/flow/commands/flow-enable.js +1 -1
  24. package/dist/m365/flow/commands/flow-export.js +17 -16
  25. package/dist/m365/flow/commands/flow-get.js +1 -1
  26. package/dist/m365/flow/commands/flow-list.js +1 -1
  27. package/dist/m365/flow/commands/flow-remove.js +1 -1
  28. package/dist/m365/flow/commands/owner/owner-ensure.js +1 -1
  29. package/dist/m365/flow/commands/owner/owner-list.js +1 -1
  30. package/dist/m365/flow/commands/owner/owner-remove.js +1 -1
  31. package/dist/m365/flow/commands/recyclebinitem/recyclebinitem-list.js +47 -0
  32. package/dist/m365/flow/commands/recyclebinitem/recyclebinitem-restore.js +48 -0
  33. package/dist/m365/flow/commands/run/run-cancel.js +1 -1
  34. package/dist/m365/flow/commands/run/run-get.js +1 -1
  35. package/dist/m365/flow/commands/run/run-list.js +1 -1
  36. package/dist/m365/flow/commands/run/run-resubmit.js +2 -2
  37. package/dist/m365/flow/commands.js +2 -0
  38. package/dist/m365/spfx/commands/project/project-doctor/doctor-1.20.0-rc.1.js +25 -0
  39. package/dist/m365/spfx/commands/project/project-doctor.js +2 -1
  40. package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.20.0-rc.1.js +57 -0
  41. package/dist/m365/spfx/commands/project/project-upgrade.js +16 -13
  42. package/dist/m365/spfx/commands/spfx-doctor.js +15 -0
  43. package/dist/m365/spo/commands/contenttype/contenttype-field-remove.js +8 -8
  44. package/dist/m365/spo/commands/contenttype/contenttype-field-set.js +2 -2
  45. package/dist/m365/spo/commands/file/file-roleassignment-add.js +17 -54
  46. package/dist/m365/spo/commands/file/file-roleassignment-remove.js +13 -40
  47. package/dist/m365/spo/commands/file/file-roleinheritance-break.js +5 -13
  48. package/dist/m365/spo/commands/file/file-roleinheritance-reset.js +5 -13
  49. package/dist/m365/spo/commands/folder/folder-sharinglink-add.js +143 -0
  50. package/dist/m365/spo/commands/folder/folder-sharinglink-clear.js +111 -0
  51. package/dist/m365/spo/commands/folder/folder-sharinglink-remove.js +95 -0
  52. package/dist/m365/spo/commands/list/list-get.js +17 -4
  53. package/dist/m365/spo/commands/page/page-section-add.js +185 -34
  54. package/dist/m365/spo/commands/site/SiteAdmin.js +2 -0
  55. package/dist/m365/spo/commands/site/site-admin-add.js +252 -0
  56. package/dist/m365/spo/commands/site/site-admin-list.js +2 -27
  57. package/dist/m365/spo/commands/site/site-admin-remove.js +193 -0
  58. package/dist/m365/spo/commands/sitescript/sitescript-get.js +3 -2
  59. package/dist/m365/spo/commands/user/user-get.js +67 -9
  60. package/dist/m365/spo/commands.js +5 -0
  61. package/dist/m365/spp/commands/contentcenter/contentcenter-list.js +56 -0
  62. package/dist/m365/spp/commands.js +5 -0
  63. package/dist/m365/teams/MeetingTranscript.js +2 -0
  64. package/dist/m365/teams/commands/meeting/meeting-transcript-get.js +152 -0
  65. package/dist/m365/teams/commands.js +1 -0
  66. package/dist/settingsNames.js +6 -1
  67. package/dist/utils/driveUtil.js +51 -0
  68. package/dist/utils/entraApp.js +283 -0
  69. package/dist/utils/spo.js +75 -7
  70. package/dist/utils/zod.js +1 -1
  71. package/docs/docs/_clisettings.mdx +6 -1
  72. package/docs/docs/cmd/entra/m365group/m365group-report-activitystorage.mdx +2 -2
  73. package/docs/docs/cmd/file/file-move.mdx +79 -0
  74. package/docs/docs/cmd/flow/recyclebinitem/recyclebinitem-list.mdx +132 -0
  75. package/docs/docs/cmd/flow/recyclebinitem/recyclebinitem-restore.mdx +55 -0
  76. package/docs/docs/cmd/setup.mdx +17 -6
  77. package/docs/docs/cmd/spo/cdn/cdn-get.mdx +1 -1
  78. package/docs/docs/cmd/spo/cdn/cdn-origin-add.mdx +1 -1
  79. package/docs/docs/cmd/spo/cdn/cdn-origin-list.mdx +1 -1
  80. package/docs/docs/cmd/spo/cdn/cdn-origin-remove.mdx +1 -1
  81. package/docs/docs/cmd/spo/cdn/cdn-policy-list.mdx +1 -1
  82. package/docs/docs/cmd/spo/cdn/cdn-policy-set.mdx +1 -1
  83. package/docs/docs/cmd/spo/contenttype/contenttype-field-remove.mdx +7 -7
  84. package/docs/docs/cmd/spo/contenttype/contenttype-field-set.mdx +2 -2
  85. package/docs/docs/cmd/spo/externaluser/externaluser-list.mdx +1 -1
  86. package/docs/docs/cmd/spo/folder/folder-sharinglink-add.mdx +125 -0
  87. package/docs/docs/cmd/spo/folder/folder-sharinglink-clear.mdx +50 -0
  88. package/docs/docs/cmd/spo/folder/folder-sharinglink-remove.mdx +50 -0
  89. package/docs/docs/cmd/spo/hidedefaultthemes/hidedefaultthemes-get.mdx +1 -1
  90. package/docs/docs/cmd/spo/hidedefaultthemes/hidedefaultthemes-set.mdx +1 -1
  91. package/docs/docs/cmd/spo/homesite/homesite-remove.mdx +1 -1
  92. package/docs/docs/cmd/spo/knowledgehub/knowledgehub-get.mdx +1 -1
  93. package/docs/docs/cmd/spo/knowledgehub/knowledgehub-remove.mdx +1 -1
  94. package/docs/docs/cmd/spo/knowledgehub/knowledgehub-set.mdx +1 -1
  95. package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-add.mdx +1 -1
  96. package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-list.mdx +1 -1
  97. package/docs/docs/cmd/spo/orgassetslibrary/orgassetslibrary-remove.mdx +1 -1
  98. package/docs/docs/cmd/spo/orgnewssite/orgnewssite-list.mdx +1 -1
  99. package/docs/docs/cmd/spo/orgnewssite/orgnewssite-remove.mdx +1 -1
  100. package/docs/docs/cmd/spo/orgnewssite/orgnewssite-set.mdx +1 -1
  101. package/docs/docs/cmd/spo/page/page-section-add.mdx +57 -2
  102. package/docs/docs/cmd/spo/site/site-admin-add.mdx +67 -0
  103. package/docs/docs/cmd/spo/site/site-admin-remove.mdx +67 -0
  104. package/docs/docs/cmd/spo/site/site-appcatalog-add.mdx +1 -1
  105. package/docs/docs/cmd/spo/site/site-appcatalog-remove.mdx +1 -1
  106. package/docs/docs/cmd/spo/site/site-commsite-enable.mdx +1 -1
  107. package/docs/docs/cmd/spo/site/site-list.mdx +6 -4
  108. package/docs/docs/cmd/spo/site/site-set.mdx +1 -1
  109. package/docs/docs/cmd/spo/sitescript/sitescript-get.mdx +14 -1
  110. package/docs/docs/cmd/spo/storageentity/storageentity-remove.mdx +1 -1
  111. package/docs/docs/cmd/spo/storageentity/storageentity-set.mdx +1 -1
  112. package/docs/docs/cmd/spo/tenant/tenant-appcatalog-add.mdx +1 -1
  113. package/docs/docs/cmd/spo/tenant/tenant-appcatalogurl-get.mdx +1 -1
  114. package/docs/docs/cmd/spo/tenant/tenant-recyclebinitem-list.mdx +1 -1
  115. package/docs/docs/cmd/spo/tenant/tenant-recyclebinitem-remove.mdx +1 -1
  116. package/docs/docs/cmd/spo/tenant/tenant-settings-list.mdx +1 -1
  117. package/docs/docs/cmd/spo/theme/theme-apply.mdx +1 -1
  118. package/docs/docs/cmd/spo/theme/theme-get.mdx +1 -1
  119. package/docs/docs/cmd/spo/theme/theme-list.mdx +1 -1
  120. package/docs/docs/cmd/spo/theme/theme-remove.mdx +1 -1
  121. package/docs/docs/cmd/spo/theme/theme-set.mdx +1 -1
  122. package/docs/docs/cmd/spo/user/user-get.mdx +35 -9
  123. package/docs/docs/cmd/spp/contentcenter/contentcenter-list.mdx +287 -0
  124. package/docs/docs/cmd/teams/meeting/meeting-transcript-get.mdx +132 -0
  125. package/npm-shrinkwrap.json +203 -375
  126. package/package.json +16 -17
@@ -9,10 +9,10 @@ import { v4 } from 'uuid';
9
9
  import auth from '../../../../Auth.js';
10
10
  import request from '../../../../request.js';
11
11
  import { accessToken } from '../../../../utils/accessToken.js';
12
- import { odata } from '../../../../utils/odata.js';
12
+ import { entraApp } from '../../../../utils/entraApp.js';
13
13
  import GraphCommand from '../../../base/GraphCommand.js';
14
- import commands from '../../commands.js';
15
14
  import aadCommands from '../../aadCommands.js';
15
+ import commands from '../../commands.js';
16
16
  class EntraAppAddCommand extends GraphCommand {
17
17
  get name() {
18
18
  return commands.APP_ADD;
@@ -27,7 +27,6 @@ class EntraAppAddCommand extends GraphCommand {
27
27
  super();
28
28
  _EntraAppAddCommand_instances.add(this);
29
29
  this.appName = '';
30
- this.appPermissions = [];
31
30
  __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initTelemetry).call(this);
32
31
  __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initOptions).call(this);
33
32
  __classPrivateFieldGet(this, _EntraAppAddCommand_instances, "m", _EntraAppAddCommand_initValidators).call(this);
@@ -35,16 +34,38 @@ class EntraAppAddCommand extends GraphCommand {
35
34
  }
36
35
  async commandAction(logger, args) {
37
36
  await this.showDeprecationWarning(logger, aadCommands.APP_ADD, commands.APP_ADD);
37
+ if (!args.options.name && this.manifest) {
38
+ args.options.name = this.manifest.name;
39
+ }
40
+ this.appName = args.options.name;
38
41
  try {
39
- const apis = await this.resolveApis(args, logger);
40
- let appInfo = await this.createAppRegistration(args, apis, logger);
42
+ const apis = await entraApp.resolveApis({
43
+ options: args.options,
44
+ manifest: this.manifest,
45
+ logger,
46
+ verbose: this.verbose,
47
+ debug: this.debug
48
+ });
49
+ let appInfo = await entraApp.createAppRegistration({
50
+ options: args.options,
51
+ apis,
52
+ logger,
53
+ verbose: this.verbose,
54
+ debug: this.debug
55
+ });
41
56
  // based on the assumption that we're adding Microsoft Entra app to the current
42
57
  // directory. If we in the future extend the command with allowing
43
58
  // users to create Microsoft Entra app in a different directory, we'll need to
44
59
  // adjust this
45
60
  appInfo.tenantId = accessToken.getTenantIdFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken);
46
61
  appInfo = await this.updateAppFromManifest(args, appInfo);
47
- appInfo = await this.grantAdminConsent(appInfo, args.options.grantAdminConsent, logger);
62
+ appInfo = await entraApp.grantAdminConsent({
63
+ appInfo,
64
+ appPermissions: entraApp.appPermissions,
65
+ adminConsent: args.options.grantAdminConsent,
66
+ logger,
67
+ debug: this.debug
68
+ });
48
69
  appInfo = await this.configureUri(args, appInfo, logger);
49
70
  appInfo = await this.configureSecret(args, appInfo, logger);
50
71
  const _appInfo = await this.saveAppInfo(args, appInfo, logger);
@@ -62,128 +83,45 @@ class EntraAppAddCommand extends GraphCommand {
62
83
  this.handleRejectedODataJsonPromise(err);
63
84
  }
64
85
  }
65
- async createAppRegistration(args, apis, logger) {
66
- const applicationInfo = {
67
- displayName: args.options.name,
68
- signInAudience: args.options.multitenant ? 'AzureADMultipleOrgs' : 'AzureADMyOrg'
69
- };
70
- if (!applicationInfo.displayName && this.manifest) {
71
- applicationInfo.displayName = this.manifest.name;
72
- }
73
- this.appName = applicationInfo.displayName;
74
- if (apis.length > 0) {
75
- applicationInfo.requiredResourceAccess = apis;
76
- }
77
- if (args.options.redirectUris) {
78
- applicationInfo[args.options.platform] = {
79
- redirectUris: args.options.redirectUris.split(',').map(u => u.trim())
80
- };
81
- }
82
- if (args.options.implicitFlow) {
83
- if (!applicationInfo.web) {
84
- applicationInfo.web = {};
85
- }
86
- applicationInfo.web.implicitGrantSettings = {
87
- enableAccessTokenIssuance: true,
88
- enableIdTokenIssuance: true
89
- };
90
- }
91
- if (args.options.certificateFile || args.options.certificateBase64Encoded) {
92
- const certificateBase64Encoded = await this.getCertificateBase64Encoded(args, logger);
93
- const newKeyCredential = {
94
- type: "AsymmetricX509Cert",
95
- usage: "Verify",
96
- displayName: args.options.certificateDisplayName,
97
- key: certificateBase64Encoded
98
- };
99
- applicationInfo.keyCredentials = [newKeyCredential];
100
- }
101
- if (args.options.allowPublicClientFlows) {
102
- applicationInfo.isFallbackPublicClient = true;
86
+ async configureSecret(args, appInfo, logger) {
87
+ if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
88
+ return appInfo;
103
89
  }
104
90
  if (this.verbose) {
105
- await logger.logToStderr(`Creating Microsoft Entra app registration...`);
106
- }
107
- const createApplicationRequestOptions = {
108
- url: `${this.resource}/v1.0/myorganization/applications`,
109
- headers: {
110
- accept: 'application/json;odata.metadata=none'
111
- },
112
- responseType: 'json',
113
- data: applicationInfo
114
- };
115
- return request.post(createApplicationRequestOptions);
116
- }
117
- async grantAdminConsent(appInfo, adminConsent, logger) {
118
- if (!adminConsent || this.appPermissions.length === 0) {
119
- return appInfo;
91
+ await logger.logToStderr(`Configure Microsoft Entra app secret...`);
120
92
  }
121
- const sp = await this.createServicePrincipal(appInfo.appId);
122
- if (this.debug) {
123
- await logger.logToStderr("Service principal created, returned object id: " + sp.id);
93
+ const secret = await this.createSecret({ appObjectId: appInfo.id });
94
+ if (!appInfo.secrets) {
95
+ appInfo.secrets = [];
124
96
  }
125
- const tasks = [];
126
- this.appPermissions.forEach(async (permission) => {
127
- if (permission.scope.length > 0) {
128
- tasks.push(this.grantOAuth2Permission(sp.id, permission.resourceId, permission.scope.join(' ')));
129
- if (this.debug) {
130
- await logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with delegated permissions: ${permission.scope.join(',')}`);
131
- }
132
- }
133
- permission.resourceAccess.filter(access => access.type === "Role").forEach(async (access) => {
134
- tasks.push(this.addRoleToServicePrincipal(sp.id, permission.resourceId, access.id));
135
- if (this.debug) {
136
- await logger.logToStderr(`Admin consent granted for following resource ${permission.resourceId}, with application permission: ${access.id}`);
137
- }
138
- });
139
- });
140
- await Promise.all(tasks);
97
+ appInfo.secrets.push(secret);
141
98
  return appInfo;
142
99
  }
143
- async addRoleToServicePrincipal(objectId, resourceId, appRoleId) {
100
+ async createSecret({ appObjectId, displayName = undefined, expirationDate = undefined }) {
101
+ let secretExpirationDate = expirationDate;
102
+ if (!secretExpirationDate) {
103
+ secretExpirationDate = new Date();
104
+ secretExpirationDate.setFullYear(secretExpirationDate.getFullYear() + 1);
105
+ }
106
+ const secretName = displayName ?? 'Default';
144
107
  const requestOptions = {
145
- url: `${this.resource}/v1.0/myorganization/servicePrincipals/${objectId}/appRoleAssignments`,
146
- headers: {
147
- 'Content-Type': 'application/json'
148
- },
149
- responseType: 'json',
150
- data: {
151
- appRoleId: appRoleId,
152
- principalId: objectId,
153
- resourceId: resourceId
154
- }
155
- };
156
- return request.post(requestOptions);
157
- }
158
- async grantOAuth2Permission(appId, resourceId, scopeName) {
159
- const grantAdminConsentApplicationRequestOptions = {
160
- url: `${this.resource}/v1.0/myorganization/oauth2PermissionGrants`,
108
+ url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}/addPassword`,
161
109
  headers: {
162
- accept: 'application/json;odata.metadata=none'
110
+ 'content-type': 'application/json'
163
111
  },
164
112
  responseType: 'json',
165
113
  data: {
166
- clientId: appId,
167
- consentType: "AllPrincipals",
168
- principalId: null,
169
- resourceId: resourceId,
170
- scope: scopeName
114
+ passwordCredential: {
115
+ displayName: secretName,
116
+ endDateTime: secretExpirationDate.toISOString()
117
+ }
171
118
  }
172
119
  };
173
- return request.post(grantAdminConsentApplicationRequestOptions);
174
- }
175
- async createServicePrincipal(appId) {
176
- const requestOptions = {
177
- url: `${this.resource}/v1.0/myorganization/servicePrincipals`,
178
- headers: {
179
- 'content-type': 'application/json'
180
- },
181
- data: {
182
- appId: appId
183
- },
184
- responseType: 'json'
120
+ const response = await request.post(requestOptions);
121
+ return {
122
+ displayName: secretName,
123
+ value: response.secretText
185
124
  };
186
- return request.post(requestOptions);
187
125
  }
188
126
  async updateAppFromManifest(args, appInfo) {
189
127
  if (!args.options.manifest) {
@@ -423,180 +361,6 @@ class EntraAppAddCommand extends GraphCommand {
423
361
  await request.patch(requestOptions);
424
362
  return appInfo;
425
363
  }
426
- async resolveApis(args, logger) {
427
- if (!args.options.apisDelegated && !args.options.apisApplication
428
- && (typeof this.manifest?.requiredResourceAccess === 'undefined' || this.manifest.requiredResourceAccess.length === 0)) {
429
- return [];
430
- }
431
- if (this.verbose) {
432
- await logger.logToStderr('Resolving requested APIs...');
433
- }
434
- const servicePrincipals = await odata.getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
435
- let resolvedApis = [];
436
- try {
437
- if (args.options.apisDelegated || args.options.apisApplication) {
438
- resolvedApis = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisDelegated, 'Scope', logger);
439
- if (this.verbose) {
440
- await logger.logToStderr(`Resolved delegated permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
441
- }
442
- const resolvedApplicationApis = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.apisApplication, 'Role', logger);
443
- if (this.verbose) {
444
- await logger.logToStderr(`Resolved application permissions: ${JSON.stringify(resolvedApplicationApis, null, 2)}`);
445
- }
446
- // merge resolved application APIs onto resolved delegated APIs
447
- resolvedApplicationApis.forEach(resolvedRequiredResource => {
448
- const requiredResource = resolvedApis.find(api => api.resourceAppId === resolvedRequiredResource.resourceAppId);
449
- if (requiredResource) {
450
- requiredResource.resourceAccess.push(...resolvedRequiredResource.resourceAccess);
451
- }
452
- else {
453
- resolvedApis.push(resolvedRequiredResource);
454
- }
455
- });
456
- }
457
- else {
458
- const manifestApis = this.manifest.requiredResourceAccess;
459
- manifestApis.forEach(manifestApi => {
460
- resolvedApis.push(manifestApi);
461
- const app = servicePrincipals.find(servicePrincipals => servicePrincipals.appId === manifestApi.resourceAppId);
462
- if (app) {
463
- manifestApi.resourceAccess.forEach((res => {
464
- const resourceAccessPermission = {
465
- id: res.id,
466
- type: res.type
467
- };
468
- const oAuthValue = app.oauth2PermissionScopes.find(scp => scp.id === res.id)?.value;
469
- this.updateAppPermissions(app.id, resourceAccessPermission, oAuthValue);
470
- }));
471
- }
472
- });
473
- }
474
- if (this.verbose) {
475
- await logger.logToStderr(`Merged delegated and application permissions: ${JSON.stringify(resolvedApis, null, 2)}`);
476
- await logger.logToStderr(`App role assignments: ${JSON.stringify(this.appPermissions.flatMap(permission => permission.resourceAccess.filter(access => access.type === "Role")), null, 2)}`);
477
- await logger.logToStderr(`OAuth2 permissions: ${JSON.stringify(this.appPermissions.flatMap(permission => permission.scope), null, 2)}`);
478
- }
479
- return resolvedApis;
480
- }
481
- catch (e) {
482
- throw e;
483
- }
484
- }
485
- async getRequiredResourceAccessForApis(servicePrincipals, apis, scopeType, logger) {
486
- if (!apis) {
487
- return [];
488
- }
489
- const resolvedApis = [];
490
- const requestedApis = apis.split(',').map(a => a.trim());
491
- for (const api of requestedApis) {
492
- const pos = api.lastIndexOf('/');
493
- const permissionName = api.substr(pos + 1);
494
- const servicePrincipalName = api.substr(0, pos);
495
- if (this.debug) {
496
- await logger.logToStderr(`Resolving ${api}...`);
497
- await logger.logToStderr(`Permission name: ${permissionName}`);
498
- await logger.logToStderr(`Service principal name: ${servicePrincipalName}`);
499
- }
500
- const servicePrincipal = servicePrincipals.find(sp => (sp.servicePrincipalNames.indexOf(servicePrincipalName) > -1 ||
501
- sp.servicePrincipalNames.indexOf(`${servicePrincipalName}/`) > -1));
502
- if (!servicePrincipal) {
503
- throw `Service principal ${servicePrincipalName} not found`;
504
- }
505
- const scopesOfType = scopeType === 'Scope' ? servicePrincipal.oauth2PermissionScopes : servicePrincipal.appRoles;
506
- const permission = scopesOfType.find(scope => scope.value === permissionName);
507
- if (!permission) {
508
- throw `Permission ${permissionName} for service principal ${servicePrincipalName} not found`;
509
- }
510
- let resolvedApi = resolvedApis.find(a => a.resourceAppId === servicePrincipal.appId);
511
- if (!resolvedApi) {
512
- resolvedApi = {
513
- resourceAppId: servicePrincipal.appId,
514
- resourceAccess: []
515
- };
516
- resolvedApis.push(resolvedApi);
517
- }
518
- const resourceAccessPermission = {
519
- id: permission.id,
520
- type: scopeType
521
- };
522
- resolvedApi.resourceAccess.push(resourceAccessPermission);
523
- this.updateAppPermissions(servicePrincipal.id, resourceAccessPermission, permission.value);
524
- }
525
- return resolvedApis;
526
- }
527
- updateAppPermissions(spId, resourceAccessPermission, oAuth2PermissionValue) {
528
- // During API resolution, we store globally both app role assignments and oauth2permissions
529
- // So that we'll be able to parse them during the admin consent process
530
- let existingPermission = this.appPermissions.find(oauth => oauth.resourceId === spId);
531
- if (!existingPermission) {
532
- existingPermission = {
533
- resourceId: spId,
534
- resourceAccess: [],
535
- scope: []
536
- };
537
- this.appPermissions.push(existingPermission);
538
- }
539
- if (resourceAccessPermission.type === 'Scope' && oAuth2PermissionValue && !existingPermission.scope.find(scp => scp === oAuth2PermissionValue)) {
540
- existingPermission.scope.push(oAuth2PermissionValue);
541
- }
542
- if (!existingPermission.resourceAccess.find(res => res.id === resourceAccessPermission.id)) {
543
- existingPermission.resourceAccess.push(resourceAccessPermission);
544
- }
545
- }
546
- async configureSecret(args, appInfo, logger) {
547
- if (!args.options.withSecret || (appInfo.secrets && appInfo.secrets.length > 0)) {
548
- return appInfo;
549
- }
550
- if (this.verbose) {
551
- await logger.logToStderr(`Configure Microsoft Entra app secret...`);
552
- }
553
- const secret = await this.createSecret({ appObjectId: appInfo.id });
554
- if (!appInfo.secrets) {
555
- appInfo.secrets = [];
556
- }
557
- appInfo.secrets.push(secret);
558
- return appInfo;
559
- }
560
- async createSecret({ appObjectId, displayName = undefined, expirationDate = undefined }) {
561
- let secretExpirationDate = expirationDate;
562
- if (!secretExpirationDate) {
563
- secretExpirationDate = new Date();
564
- secretExpirationDate.setFullYear(secretExpirationDate.getFullYear() + 1);
565
- }
566
- const secretName = displayName ?? 'Default';
567
- const requestOptions = {
568
- url: `${this.resource}/v1.0/myorganization/applications/${appObjectId}/addPassword`,
569
- headers: {
570
- 'content-type': 'application/json'
571
- },
572
- responseType: 'json',
573
- data: {
574
- passwordCredential: {
575
- displayName: secretName,
576
- endDateTime: secretExpirationDate.toISOString()
577
- }
578
- }
579
- };
580
- const response = await request.post(requestOptions);
581
- return {
582
- displayName: secretName,
583
- value: response.secretText
584
- };
585
- }
586
- async getCertificateBase64Encoded(args, logger) {
587
- if (args.options.certificateBase64Encoded) {
588
- return args.options.certificateBase64Encoded;
589
- }
590
- if (this.debug) {
591
- await logger.logToStderr(`Reading existing ${args.options.certificateFile}...`);
592
- }
593
- try {
594
- return fs.readFileSync(args.options.certificateFile, { encoding: 'base64' });
595
- }
596
- catch (e) {
597
- throw new Error(`Error reading certificate file: ${e}. Please add the certificate using base64 option '--certificateBase64Encoded'.`);
598
- }
599
- }
600
364
  async saveAppInfo(args, appInfo, logger) {
601
365
  if (!args.options.save) {
602
366
  return appInfo;
@@ -0,0 +1,135 @@
1
+ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
2
+ if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
3
+ if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
4
+ return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
5
+ };
6
+ var _FileMoveCommand_instances, _FileMoveCommand_initTelemetry, _FileMoveCommand_initOptions, _FileMoveCommand_initValidators;
7
+ import GraphCommand from '../../base/GraphCommand.js';
8
+ import { setTimeout } from 'timers/promises';
9
+ import commands from '../commands.js';
10
+ import request from '../../../request.js';
11
+ import { spo } from '../../../utils/spo.js';
12
+ import { urlUtil } from '../../../utils/urlUtil.js';
13
+ import { driveUtil } from '../../../utils/driveUtil.js';
14
+ import { validation } from '../../../utils/validation.js';
15
+ class FileMoveCommand extends GraphCommand {
16
+ get name() {
17
+ return commands.MOVE;
18
+ }
19
+ get description() {
20
+ return 'Moves a file to another location using the Microsoft Graph';
21
+ }
22
+ constructor() {
23
+ super();
24
+ _FileMoveCommand_instances.add(this);
25
+ this.pollingInterval = 10000;
26
+ this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
27
+ __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initTelemetry).call(this);
28
+ __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initOptions).call(this);
29
+ __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initValidators).call(this);
30
+ }
31
+ async commandAction(logger, args) {
32
+ try {
33
+ const { webUrl, sourceUrl, targetUrl, nameConflictBehavior, newName, verbose } = args.options;
34
+ const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
35
+ const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
36
+ const { driveId, itemId } = await this.getDriveIdAndItemId(webUrl, sourcePath, sourceUrl, logger, verbose);
37
+ const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
38
+ const targetFolderUrl = this.getAbsoluteUrl(targetSiteUrl, targetUrl);
39
+ const { driveId: targetDriveId, itemId: targetItemId } = await this.getDriveIdAndItemId(targetSiteUrl, targetFolderUrl, targetUrl, logger, verbose);
40
+ const requestOptions = this.getRequestOptions(driveId, itemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior);
41
+ if (verbose) {
42
+ await logger.logToStderr(`Moving file '${sourcePath}' to '${destinationPath}'...`);
43
+ }
44
+ if (driveId === targetDriveId) {
45
+ await request.patch(requestOptions);
46
+ }
47
+ else {
48
+ const response = await request.post(requestOptions);
49
+ await this.waitUntilCopyOperationCompleted(response.headers.location, logger);
50
+ const itemUrl = `${this.resource}/v1.0/drives/${driveId}/items/${itemId}`;
51
+ await request.delete({ url: itemUrl, headers: requestOptions.headers });
52
+ }
53
+ }
54
+ catch (err) {
55
+ this.handleRejectedODataJsonPromise(err);
56
+ }
57
+ }
58
+ getAbsoluteUrl(webUrl, url) {
59
+ return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
60
+ }
61
+ async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
62
+ const siteId = await spo.getSiteId(webUrl, logger, verbose);
63
+ const drive = await driveUtil.getDriveByUrl(siteId, new URL(folderUrl));
64
+ const itemId = await driveUtil.getDriveItemId(drive, new URL(folderUrl));
65
+ return { driveId: drive.id, itemId };
66
+ }
67
+ getRequestOptions(sourceDriveId, sourceItemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior) {
68
+ const apiUrl = sourceDriveId === targetDriveId
69
+ ? `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}`
70
+ : `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}/copy`;
71
+ const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
72
+ ? `@microsoft.graph.conflictBehavior=${nameConflictBehavior}`
73
+ : '';
74
+ const urlWithQuery = `${apiUrl}${queryParameters ? `?${queryParameters}` : ''}`;
75
+ const requestOptions = {
76
+ url: urlWithQuery,
77
+ headers: { accept: 'application/json;odata.metadata=none' },
78
+ responseType: 'json',
79
+ fullResponse: true,
80
+ data: { parentReference: { driveId: targetDriveId, id: targetItemId } }
81
+ };
82
+ if (newName) {
83
+ const sourceFileName = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
84
+ const sourceFileExtension = sourceFileName.includes('.') ? sourceFileName.substring(sourceFileName.lastIndexOf('.')) : '';
85
+ const newNameExtension = newName.includes('.') ? newName.substring(newName.lastIndexOf('.')) : '';
86
+ requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, "")}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
87
+ }
88
+ return requestOptions;
89
+ }
90
+ async waitUntilCopyOperationCompleted(monitorUrl, logger) {
91
+ const requestOptions = {
92
+ url: monitorUrl,
93
+ responseType: 'json'
94
+ };
95
+ const response = await request.get(requestOptions);
96
+ if (response.status === 'completed') {
97
+ if (this.verbose) {
98
+ await logger.logToStderr('Copy operation completed succesfully. Returning...');
99
+ }
100
+ return;
101
+ }
102
+ else if (response.status === 'failed') {
103
+ throw response.error.message;
104
+ }
105
+ else {
106
+ if (this.verbose) {
107
+ await logger.logToStderr(`Still copying. Retrying in ${this.pollingInterval / 1000} seconds...`);
108
+ }
109
+ await setTimeout(this.pollingInterval);
110
+ await this.waitUntilCopyOperationCompleted(monitorUrl, logger);
111
+ }
112
+ }
113
+ }
114
+ _FileMoveCommand_instances = new WeakSet(), _FileMoveCommand_initTelemetry = function _FileMoveCommand_initTelemetry() {
115
+ this.telemetry.push((args) => {
116
+ Object.assign(this.telemetryProperties, {
117
+ webUrl: typeof args.options.webUrl !== 'undefined',
118
+ sourceUrl: typeof args.options.sourceUrl !== 'undefined',
119
+ targetUrl: typeof args.options.targetUrl !== 'undefined',
120
+ newName: typeof args.options.newName !== 'undefined',
121
+ nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined'
122
+ });
123
+ });
124
+ }, _FileMoveCommand_initOptions = function _FileMoveCommand_initOptions() {
125
+ this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-s, --sourceUrl <sourceUrl>' }, { option: '-t, --targetUrl <targetUrl>' }, { option: '--newName [newName]' }, { option: '--nameConflictBehavior [nameConflictBehavior]', autocomplete: this.nameConflictBehaviorOptions });
126
+ }, _FileMoveCommand_initValidators = function _FileMoveCommand_initValidators() {
127
+ this.validators.push(async (args) => {
128
+ if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
129
+ return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
130
+ }
131
+ return validation.isValidSharePointUrl(args.options.webUrl);
132
+ });
133
+ };
134
+ export default new FileMoveCommand();
135
+ //# sourceMappingURL=file-move.js.map
@@ -3,6 +3,7 @@ export default {
3
3
  ADD: `${prefix} add`,
4
4
  CONVERT_PDF: `${prefix} convert pdf`,
5
5
  COPY: `${prefix} copy`,
6
- LIST: `${prefix} list`
6
+ LIST: `${prefix} list`,
7
+ MOVE: `${prefix} move`
7
8
  };
8
9
  //# sourceMappingURL=commands.js.map
@@ -28,7 +28,7 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
28
28
  if (this.verbose) {
29
29
  await logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name ?? ''}...`);
30
30
  }
31
- let requestUrl = `${this.resource}/providers/Microsoft.ProcessSimple/environments/`;
31
+ let requestUrl = `${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments/`;
32
32
  if (args.options.name) {
33
33
  requestUrl += `${formatting.encodeQueryParameter(args.options.name)}`;
34
34
  }
@@ -16,7 +16,7 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
16
16
  await logger.logToStderr(`Retrieving list of Microsoft Flow environments...`);
17
17
  }
18
18
  try {
19
- const res = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
19
+ const res = await odata.getAllItems(`${PowerAutomateCommand.resource}/providers/Microsoft.ProcessSimple/environments?api-version=2016-11-01`);
20
20
  if (res.length > 0) {
21
21
  if (args.options.output !== 'json') {
22
22
  res.forEach(e => {
@@ -26,7 +26,7 @@ class FlowDisableCommand extends PowerAutomateCommand {
26
26
  await logger.logToStderr(`Disables Microsoft Flow ${args.options.name}...`);
27
27
  }
28
28
  const requestOptions = {
29
- 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`,
29
+ 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`,
30
30
  headers: {
31
31
  accept: 'application/json'
32
32
  },
@@ -26,7 +26,7 @@ class FlowEnableCommand extends PowerAutomateCommand {
26
26
  await logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
27
27
  }
28
28
  const requestOptions = {
29
- 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`,
29
+ 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`,
30
30
  headers: {
31
31
  accept: 'application/json'
32
32
  },