@pnp/cli-microsoft365 6.0.0-beta.09b5216 → 6.0.0-beta.f73c4f8

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 (44) hide show
  1. package/dist/Command.js +22 -0
  2. package/dist/m365/planner/commands/bucket/bucket-add.js +17 -9
  3. package/dist/m365/planner/commands/bucket/bucket-get.js +19 -11
  4. package/dist/m365/planner/commands/bucket/bucket-list.js +17 -9
  5. package/dist/m365/planner/commands/bucket/bucket-remove.js +19 -11
  6. package/dist/m365/planner/commands/bucket/bucket-set.js +19 -11
  7. package/dist/m365/planner/commands/plan/plan-get.js +1 -1
  8. package/dist/m365/planner/commands/plan/plan-remove.js +1 -1
  9. package/dist/m365/planner/commands/task/task-add.js +16 -16
  10. package/dist/m365/planner/commands/task/task-get.js +14 -9
  11. package/dist/m365/planner/commands/task/task-list.js +19 -11
  12. package/dist/m365/planner/commands/task/task-reference-add.js +1 -7
  13. package/dist/m365/planner/commands/task/task-reference-remove.js +11 -14
  14. package/dist/m365/planner/commands/task/task-remove.js +4 -19
  15. package/dist/m365/planner/commands/task/task-set.js +17 -23
  16. package/dist/m365/search/commands/externalconnection/externalconnection-get.js +69 -0
  17. package/dist/m365/search/commands.js +1 -0
  18. package/dist/m365/spfx/commands/project/project-upgrade/rules/FN015008_FILE_eslintrc_js.js +7 -0
  19. package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.0.js +6 -4
  20. package/dist/m365/spo/base-permissions.js +9 -0
  21. package/dist/m365/spo/commands/hubsite/hubsite-get.js +62 -12
  22. package/dist/m365/spo/commands/roledefinition/RoleDefinition.js +3 -0
  23. package/dist/m365/spo/commands/roledefinition/RoleType.js +16 -0
  24. package/dist/m365/spo/commands/roledefinition/roledefinition-get.js +59 -0
  25. package/dist/m365/spo/commands.js +1 -0
  26. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js +1 -9
  27. package/dist/utils/accessToken.js +18 -0
  28. package/dist/utils/planner.js +6 -6
  29. package/dist/utils/validation.js +5 -1
  30. package/docs/docs/cmd/aad/user/user-get.md +12 -0
  31. package/docs/docs/cmd/planner/bucket/bucket-add.md +9 -6
  32. package/docs/docs/cmd/planner/bucket/bucket-get.md +10 -7
  33. package/docs/docs/cmd/planner/bucket/bucket-list.md +8 -5
  34. package/docs/docs/cmd/planner/bucket/bucket-remove.md +8 -5
  35. package/docs/docs/cmd/planner/bucket/bucket-set.md +9 -6
  36. package/docs/docs/cmd/planner/plan/plan-remove.md +1 -1
  37. package/docs/docs/cmd/planner/task/task-add.md +11 -8
  38. package/docs/docs/cmd/planner/task/task-get.md +11 -8
  39. package/docs/docs/cmd/planner/task/task-list.md +9 -6
  40. package/docs/docs/cmd/planner/task/task-set.md +9 -6
  41. package/docs/docs/cmd/search/externalconnection/externalconnection-get.md +33 -0
  42. package/docs/docs/cmd/spo/hubsite/hubsite-get.md +19 -8
  43. package/docs/docs/cmd/spo/roledefinition/roledefinition-get.md +27 -0
  44. package/package.json +1 -1
@@ -46,13 +46,7 @@ class PlannerTaskReferenceAddCommand extends GraphCommand_1.default {
46
46
  };
47
47
  return request_1.default
48
48
  .get(requestOptions)
49
- .then((response) => {
50
- const etag = response ? response['@odata.etag'] : undefined;
51
- if (!etag) {
52
- return Promise.reject(`Error fetching task details`);
53
- }
54
- return Promise.resolve(etag);
55
- });
49
+ .then((response) => response['@odata.etag']);
56
50
  }
57
51
  options() {
58
52
  const options = [
@@ -74,21 +74,18 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
74
74
  let url = options.url;
75
75
  return request_1.default
76
76
  .get(requestOptions)
77
- .then((response) => {
78
- const etag = response ? response['@odata.etag'] : undefined;
79
- if (!etag) {
80
- return Promise.reject(`Error fetching task details`);
81
- }
77
+ .then((taskDetails) => {
82
78
  if (options.alias) {
83
- const alias = options.alias;
84
79
  const urls = [];
85
- Object.entries(response.references).forEach((ref) => {
86
- var _a;
87
- if (((_a = ref[1].alias) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === alias.toLocaleLowerCase()) {
88
- urls.push(decodeURIComponent(ref[0]));
89
- }
90
- });
91
- if (!urls.length) {
80
+ if (taskDetails.references) {
81
+ Object.entries(taskDetails.references).forEach((ref) => {
82
+ var _a;
83
+ if (((_a = ref[1].alias) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === options.alias.toLocaleLowerCase()) {
84
+ urls.push(decodeURIComponent(ref[0]));
85
+ }
86
+ });
87
+ }
88
+ if (urls.length === 0) {
92
89
  return Promise.reject(`The specified reference with alias ${options.alias} does not exist`);
93
90
  }
94
91
  if (urls.length > 1) {
@@ -96,7 +93,7 @@ class PlannerTaskReferenceRemoveCommand extends GraphCommand_1.default {
96
93
  }
97
94
  url = urls[0];
98
95
  }
99
- return Promise.resolve({ etag, url });
96
+ return Promise.resolve({ etag: taskDetails['@odata.etag'], url });
100
97
  });
101
98
  }
102
99
  options() {
@@ -114,7 +114,7 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
114
114
  }
115
115
  return this
116
116
  .getGroupId(options)
117
- .then(groupId => planner_1.planner.getPlanByName(planTitle, groupId))
117
+ .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
118
118
  .then(plan => plan.id);
119
119
  }
120
120
  getGroupId(options) {
@@ -122,24 +122,9 @@ class PlannerTaskRemoveCommand extends GraphCommand_1.default {
122
122
  if (ownerGroupId) {
123
123
  return Promise.resolve(ownerGroupId);
124
124
  }
125
- const requestOptions = {
126
- url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(ownerGroupName)}'`,
127
- headers: {
128
- accept: 'application/json;odata.metadata=none'
129
- },
130
- responseType: 'json'
131
- };
132
- return request_1.default
133
- .get(requestOptions)
134
- .then(response => {
135
- if (response.value.length === 0) {
136
- return Promise.reject(`The specified owner group ${ownerGroupName} does not exist`);
137
- }
138
- if (response.value.length > 1) {
139
- return Promise.reject(`Multiple owner groups with name ${ownerGroupName} found: ${response.value.map(x => x.id)}`);
140
- }
141
- return Promise.resolve(response.value[0].id);
142
- });
125
+ return utils_1.aadGroup
126
+ .getGroupByDisplayName(ownerGroupName)
127
+ .then(group => group.id);
143
128
  }
144
129
  options() {
145
130
  const options = [
@@ -24,6 +24,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
24
24
  telemetryProps.title = typeof args.options.title !== 'undefined';
25
25
  telemetryProps.planId = typeof args.options.planId !== 'undefined';
26
26
  telemetryProps.planName = typeof args.options.planName !== 'undefined';
27
+ telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
27
28
  telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
28
29
  telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
29
30
  telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
@@ -41,6 +42,10 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
41
42
  return telemetryProps;
42
43
  }
43
44
  commandAction(logger, args, cb) {
45
+ if (args.options.planName) {
46
+ args.options.planTitle = args.options.planName;
47
+ this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
48
+ }
44
49
  if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
45
50
  this.handleError('This command does not support application permissions.', logger, cb);
46
51
  return;
@@ -112,13 +117,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
112
117
  };
113
118
  return request_1.default
114
119
  .get(requestOptions)
115
- .then((response) => {
116
- const etag = response ? response['@odata.etag'] : undefined;
117
- if (!etag) {
118
- return Promise.reject(`Error fetching task details`);
119
- }
120
- return Promise.resolve(etag);
121
- });
120
+ .then((response) => response['@odata.etag']);
122
121
  }
123
122
  getTaskEtag(taskId) {
124
123
  const requestOptions = {
@@ -130,13 +129,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
130
129
  };
131
130
  return request_1.default
132
131
  .get(requestOptions)
133
- .then((response) => {
134
- const etag = response ? response['@odata.etag'] : undefined;
135
- if (!etag) {
136
- return Promise.reject(`Error fetching task`);
137
- }
138
- return Promise.resolve(etag);
139
- });
132
+ .then((response) => response['@odata.etag']);
140
133
  }
141
134
  generateAppliedCategories(options) {
142
135
  if (!options.appliedCategories) {
@@ -226,7 +219,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
226
219
  }
227
220
  return this
228
221
  .getGroupId(options)
229
- .then((groupId) => planner_1.planner.getPlanByName(options.planName, groupId))
222
+ .then((groupId) => planner_1.planner.getPlanByTitle(options.planTitle, groupId))
230
223
  .then(plan => plan.id);
231
224
  }
232
225
  getGroupId(options) {
@@ -277,6 +270,7 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
277
270
  { option: '-t, --title [title]' },
278
271
  { option: '--planId [planId]' },
279
272
  { option: '--planName [planName]' },
273
+ { option: '--planTitle [planTitle]' },
280
274
  { option: '--ownerGroupId [ownerGroupId]' },
281
275
  { option: '--ownerGroupName [ownerGroupName]' },
282
276
  { option: '--bucketId [bucketId]' },
@@ -299,17 +293,17 @@ class PlannerTaskSetCommand extends GraphCommand_1.default {
299
293
  if (args.options.bucketId && args.options.bucketName) {
300
294
  return 'Specify either bucketId or bucketName but not both';
301
295
  }
302
- if (args.options.bucketName && !args.options.planId && !args.options.planName) {
303
- return 'Specify either planId or planName when using bucketName';
296
+ if (args.options.bucketName && !args.options.planId && !args.options.planName && !args.options.planTitle) {
297
+ return 'Specify either planId or planTitle when using bucketName';
304
298
  }
305
- if (args.options.bucketName && args.options.planId && args.options.planName) {
306
- return 'Specify either planId or planName when using bucketName but not both';
299
+ if (args.options.bucketName && args.options.planId && (args.options.planName || args.options.planTitle)) {
300
+ return 'Specify either planId or planTitle when using bucketName but not both';
307
301
  }
308
- if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
309
- return 'Specify either ownerGroupId or ownerGroupName when using planName';
302
+ if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
303
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
310
304
  }
311
- if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
312
- return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
305
+ if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
306
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
313
307
  }
314
308
  if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
315
309
  return `${args.options.ownerGroupId} is not a valid GUID`;
@@ -0,0 +1,69 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const GraphCommand_1 = require("../../../base/GraphCommand");
5
+ const commands_1 = require("../../commands");
6
+ class SearchExternalConnectionGetCommand extends GraphCommand_1.default {
7
+ get name() {
8
+ return commands_1.default.EXTERNALCONNECTION_GET;
9
+ }
10
+ get description() {
11
+ return 'Get a specific external connection for use in Microsoft Search';
12
+ }
13
+ getTelemetryProperties(args) {
14
+ const telemetryProps = super.getTelemetryProperties(args);
15
+ telemetryProps.id = typeof args.options.id !== 'undefined';
16
+ telemetryProps.name = typeof args.options.name !== 'undefined';
17
+ return telemetryProps;
18
+ }
19
+ commandAction(logger, args, cb) {
20
+ let url = `${this.resource}/v1.0/external/connections`;
21
+ if (args.options.id) {
22
+ url += `/${encodeURIComponent(args.options.id)}`;
23
+ }
24
+ else {
25
+ url += `?$filter=name eq '${encodeURIComponent(args.options.name)}'`;
26
+ }
27
+ const requestOptions = {
28
+ url: url,
29
+ headers: {
30
+ accept: 'application/json;odata.metadata=none'
31
+ },
32
+ responseType: 'json'
33
+ };
34
+ request_1.default
35
+ .get(requestOptions)
36
+ .then((res) => {
37
+ if (args.options.name) {
38
+ if (res.value.length === 0) {
39
+ return Promise.reject(`External connection with name '${args.options.name}' not found`);
40
+ }
41
+ res = res.value[0];
42
+ }
43
+ return Promise.resolve(res);
44
+ })
45
+ .then(res => {
46
+ logger.log(res);
47
+ cb();
48
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
49
+ }
50
+ optionSets() {
51
+ return [
52
+ ['id', 'name']
53
+ ];
54
+ }
55
+ options() {
56
+ const options = [
57
+ {
58
+ option: '-i, --id [id]'
59
+ },
60
+ {
61
+ option: '-n, --name [name]'
62
+ }
63
+ ];
64
+ const parentOptions = super.options();
65
+ return options.concat(parentOptions);
66
+ }
67
+ }
68
+ module.exports = new SearchExternalConnectionGetCommand();
69
+ //# sourceMappingURL=externalconnection-get.js.map
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const prefix = 'search';
4
4
  exports.default = {
5
5
  EXTERNALCONNECTION_ADD: `${prefix} externalconnection add`,
6
+ EXTERNALCONNECTION_GET: `${prefix} externalconnection get`,
6
7
  EXTERNALCONNECTION_LIST: `${prefix} externalconnection list`
7
8
  };
8
9
  //# sourceMappingURL=commands.js.map
@@ -1,6 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.FN015008_FILE_eslintrc_js = void 0;
4
+ const utils_1 = require("../../../../../../utils");
4
5
  const FileAddRemoveRule_1 = require("./FileAddRemoveRule");
5
6
  class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
6
7
  constructor(add, contents) {
@@ -9,6 +10,12 @@ class FN015008_FILE_eslintrc_js extends FileAddRemoveRule_1.FileAddRemoveRule {
9
10
  get id() {
10
11
  return 'FN015008';
11
12
  }
13
+ visit(project, notifications) {
14
+ if (utils_1.spfx.isReactProject(project)) {
15
+ this.contents = this.contents.replace('@microsoft/eslint-config-spfx/lib/profiles/default', '@microsoft/eslint-config-spfx/lib/profiles/react');
16
+ }
17
+ super.visit(project, notifications);
18
+ }
12
19
  }
13
20
  exports.FN015008_FILE_eslintrc_js = FN015008_FILE_eslintrc_js;
14
21
  //# sourceMappingURL=FN015008_FILE_eslintrc_js.js.map
@@ -27,6 +27,7 @@ const FN002007_DEVDEP_ajv_1 = require("./rules/FN002007_DEVDEP_ajv");
27
27
  const FN002009_DEVDEP_microsoft_sp_tslint_rules_1 = require("./rules/FN002009_DEVDEP_microsoft_sp_tslint_rules");
28
28
  const FN002013_DEVDEP_types_webpack_env_1 = require("./rules/FN002013_DEVDEP_types_webpack_env");
29
29
  const FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1 = require("./rules/FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9");
30
+ const FN002019_DEVDEP_spfx_fast_serve_helpers_1 = require("./rules/FN002019_DEVDEP_spfx_fast_serve_helpers");
30
31
  const FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1 = require("./rules/FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5");
31
32
  const FN002021_DEVDEP_rushstack_eslint_config_1 = require("./rules/FN002021_DEVDEP_rushstack_eslint_config");
32
33
  const FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1 = require("./rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx");
@@ -67,6 +68,7 @@ module.exports = [
67
68
  new FN002009_DEVDEP_microsoft_sp_tslint_rules_1.FN002009_DEVDEP_microsoft_sp_tslint_rules('', false),
68
69
  new FN002013_DEVDEP_types_webpack_env_1.FN002013_DEVDEP_types_webpack_env('1.15.2'),
69
70
  new FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9_1.FN002018_DEVDEP_microsoft_rush_stack_compiler_3_9('', false),
71
+ new FN002019_DEVDEP_spfx_fast_serve_helpers_1.FN002019_DEVDEP_spfx_fast_serve_helpers('1.15.2'),
70
72
  new FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5_1.FN002020_DEVDEP_microsoft_rush_stack_compiler_4_5('0.2.2'),
71
73
  new FN002021_DEVDEP_rushstack_eslint_config_1.FN002021_DEVDEP_rushstack_eslint_config('2.5.1'),
72
74
  new FN002022_DEVDEP_microsoft_eslint_plugin_spfx_1.FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.15.0'),
@@ -78,10 +80,10 @@ module.exports = [
78
80
  new FN012017_TSC_extends_1.FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-4.5/includes/tsconfig-web.json'),
79
81
  new FN015003_FILE_tslint_json_1.FN015003_FILE_tslint_json(false, ''),
80
82
  new FN015008_FILE_eslintrc_js_1.FN015008_FILE_eslintrc_js(true, `require('@rushstack/eslint-config/patch/modern-module-resolution');
81
- module.exports = {
82
- extends: ['@microsoft/eslint-config-spfx/lib/profiles/react'],
83
- parserOptions: { tsconfigRootDir: __dirname }
84
- };`),
83
+ module.exports = {
84
+ extends: ['@microsoft/eslint-config-spfx/lib/profiles/default'],
85
+ parserOptions: { tsconfigRootDir: __dirname }
86
+ };`),
85
87
  new FN023002_GITIGNORE_heft_1.FN023002_GITIGNORE_heft()
86
88
  ];
87
89
  //# sourceMappingURL=upgrade-1.15.0.js.map
@@ -22,6 +22,15 @@ class BasePermissions {
22
22
  set low(value) {
23
23
  this._low = value;
24
24
  }
25
+ parse() {
26
+ const result = [];
27
+ for (const permissionKind in PermissionKind) {
28
+ if (this.has(PermissionKind[permissionKind])) {
29
+ result.push(permissionKind);
30
+ }
31
+ }
32
+ return result;
33
+ }
25
34
  has(perm) {
26
35
  let hasPermission = false;
27
36
  if (perm === PermissionKind.FullMask) {
@@ -11,37 +11,87 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
11
11
  get description() {
12
12
  return 'Gets information about the specified hub site';
13
13
  }
14
+ getTelemetryProperties(args) {
15
+ const telemetryProps = super.getTelemetryProperties(args);
16
+ telemetryProps.id = typeof args.options.id !== 'undefined';
17
+ telemetryProps.title = typeof args.options.title !== 'undefined';
18
+ telemetryProps.url = typeof args.options.url !== 'undefined';
19
+ return telemetryProps;
20
+ }
14
21
  commandAction(logger, args, cb) {
15
22
  utils_1.spo
16
23
  .getSpoUrl(logger, this.debug)
17
24
  .then((spoUrl) => {
18
- const requestOptions = {
19
- url: `${spoUrl}/_api/hubsites/getbyid('${encodeURIComponent(args.options.id)}')`,
20
- headers: {
21
- accept: 'application/json;odata=nometadata'
22
- },
23
- responseType: 'json'
24
- };
25
- return request_1.default.get(requestOptions);
25
+ if (args.options.id) {
26
+ return this.getHubSiteById(spoUrl, args.options);
27
+ }
28
+ else {
29
+ return this.getHubSite(spoUrl, args.options);
30
+ }
26
31
  })
27
32
  .then((res) => {
28
33
  logger.log(res);
29
34
  cb();
30
35
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
31
36
  }
37
+ getHubSiteById(spoUrl, options) {
38
+ const requestOptions = {
39
+ url: `${spoUrl}/_api/hubsites/getbyid('${options.id}')`,
40
+ headers: {
41
+ accept: 'application/json;odata=nometadata'
42
+ },
43
+ responseType: 'json'
44
+ };
45
+ return request_1.default.get(requestOptions);
46
+ }
47
+ getHubSite(spoUrl, options) {
48
+ const requestOptions = {
49
+ url: `${spoUrl}/_api/hubsites`,
50
+ headers: {
51
+ accept: 'application/json;odata=nometadata'
52
+ },
53
+ responseType: 'json'
54
+ };
55
+ return request_1.default
56
+ .get(requestOptions)
57
+ .then((response) => {
58
+ let hubSites = response.value;
59
+ if (options.title) {
60
+ hubSites = hubSites.filter(site => site.Title.toLocaleLowerCase() === options.title.toLocaleLowerCase());
61
+ }
62
+ else if (options.url) {
63
+ hubSites = hubSites.filter(site => site.SiteUrl.toLocaleLowerCase() === options.url.toLocaleLowerCase());
64
+ }
65
+ if (hubSites.length === 0) {
66
+ return Promise.reject(`The specified hub site ${options.title || options.url} does not exist`);
67
+ }
68
+ if (hubSites.length > 1) {
69
+ return Promise.reject(`Multiple hub sites with ${options.title || options.url} found. Please disambiguate: ${hubSites.map(site => site.SiteUrl).join(', ')}`);
70
+ }
71
+ return hubSites[0];
72
+ });
73
+ }
32
74
  options() {
33
75
  const options = [
34
- {
35
- option: '-i, --id <id>'
36
- }
76
+ { option: '-i, --id [id]' },
77
+ { option: '-t, --title [title]' },
78
+ { option: '-u, --url [url]' }
37
79
  ];
38
80
  const parentOptions = super.options();
39
81
  return options.concat(parentOptions);
40
82
  }
83
+ optionSets() {
84
+ return [
85
+ ['id', 'title', 'url']
86
+ ];
87
+ }
41
88
  validate(args) {
42
- if (!utils_1.validation.isValidGuid(args.options.id)) {
89
+ if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
43
90
  return `${args.options.id} is not a valid GUID`;
44
91
  }
92
+ if (args.options.url) {
93
+ return utils_1.validation.isValidSharePointUrl(args.options.url);
94
+ }
45
95
  return true;
46
96
  }
47
97
  }
@@ -0,0 +1,3 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ //# sourceMappingURL=RoleDefinition.js.map
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.RoleType = void 0;
4
+ var RoleType;
5
+ (function (RoleType) {
6
+ RoleType[RoleType["None"] = 0] = "None";
7
+ RoleType[RoleType["Guest"] = 1] = "Guest";
8
+ RoleType[RoleType["Reader"] = 2] = "Reader";
9
+ RoleType[RoleType["Contributor"] = 3] = "Contributor";
10
+ RoleType[RoleType["WebDesigner"] = 4] = "WebDesigner";
11
+ RoleType[RoleType["Administrator"] = 5] = "Administrator";
12
+ RoleType[RoleType["Editor"] = 6] = "Editor";
13
+ RoleType[RoleType["Reviewer"] = 7] = "Reviewer";
14
+ RoleType[RoleType["System"] = 8] = "System";
15
+ })(RoleType = exports.RoleType || (exports.RoleType = {}));
16
+ //# sourceMappingURL=RoleType.js.map
@@ -0,0 +1,59 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const utils_1 = require("../../../../utils");
5
+ const SpoCommand_1 = require("../../../base/SpoCommand");
6
+ const base_permissions_1 = require("../../base-permissions");
7
+ const commands_1 = require("../../commands");
8
+ const RoleType_1 = require("./RoleType");
9
+ class SpoRoleDefinitionGetCommand extends SpoCommand_1.default {
10
+ get name() {
11
+ return commands_1.default.ROLEDEFINITION_GET;
12
+ }
13
+ get description() {
14
+ return 'Gets specified role definition from web by id';
15
+ }
16
+ commandAction(logger, args, cb) {
17
+ if (this.verbose) {
18
+ logger.logToStderr(`Getting role definition from ${args.options.webUrl}...`);
19
+ }
20
+ const requestOptions = {
21
+ url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
22
+ headers: {
23
+ 'accept': 'application/json;odata=nometadata'
24
+ },
25
+ responseType: 'json'
26
+ };
27
+ request_1.default
28
+ .get(requestOptions)
29
+ .then((response) => {
30
+ const permissions = new base_permissions_1.BasePermissions();
31
+ permissions.high = response.BasePermissions.High;
32
+ permissions.low = response.BasePermissions.Low;
33
+ response.BasePermissionsValue = permissions.parse();
34
+ response.RoleTypeKindValue = RoleType_1.RoleType[response.RoleTypeKind];
35
+ logger.log(response);
36
+ cb();
37
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
38
+ }
39
+ options() {
40
+ const options = [
41
+ {
42
+ option: '-u, --webUrl <webUrl>'
43
+ },
44
+ {
45
+ option: '-i, --id <id>'
46
+ }
47
+ ];
48
+ const parentOptions = super.options();
49
+ return options.concat(parentOptions);
50
+ }
51
+ validate(args) {
52
+ if (isNaN(args.options.id)) {
53
+ return `${args.options.id} is not a number`;
54
+ }
55
+ return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
56
+ }
57
+ }
58
+ module.exports = new SpoRoleDefinitionGetCommand();
59
+ //# sourceMappingURL=roledefinition-get.js.map
@@ -167,6 +167,7 @@ exports.default = {
167
167
  REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
168
168
  REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
169
169
  REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
170
+ ROLEDEFINITION_GET: `${prefix} roledefinition get`,
170
171
  ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
171
172
  ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
172
173
  SEARCH: `${prefix} search`,
@@ -34,15 +34,7 @@ class TenantServiceAnnouncementHealthGetCommand extends GraphCommand_1.default {
34
34
  },
35
35
  responseType: 'json'
36
36
  };
37
- return request_1.default
38
- .get(requestOptions)
39
- .then(response => {
40
- const serviceHealth = response;
41
- if (!serviceHealth) {
42
- return Promise.reject(`Error fetching service health`);
43
- }
44
- return Promise.resolve(serviceHealth);
45
- });
37
+ return request_1.default.get(requestOptions);
46
38
  }
47
39
  options() {
48
40
  const options = [
@@ -57,6 +57,24 @@ exports.accessToken = {
57
57
  catch (_a) {
58
58
  }
59
59
  return userName;
60
+ },
61
+ getUserIdFromAccessToken(accessToken) {
62
+ let userId = '';
63
+ if (!accessToken || accessToken.length === 0) {
64
+ return userId;
65
+ }
66
+ const chunks = accessToken.split('.');
67
+ if (chunks.length !== 3) {
68
+ return userId;
69
+ }
70
+ const tokenString = Buffer.from(chunks[1], 'base64').toString();
71
+ try {
72
+ const token = JSON.parse(tokenString);
73
+ userId = token.oid;
74
+ }
75
+ catch (_a) {
76
+ }
77
+ return userId;
60
78
  }
61
79
  };
62
80
  //# sourceMappingURL=accessToken.js.map
@@ -45,19 +45,19 @@ exports.planner = {
45
45
  return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups/${groupId}/planner/plans`, 'none');
46
46
  },
47
47
  /**
48
- * Get Planner plan by name in a specific group.
49
- * @param name Name of the Planner plan. Case insensitive.
48
+ * Get Planner plan by title in a specific group.
49
+ * @param title Title of the Planner plan. Case insensitive.
50
50
  * @param groupId Owner group ID .
51
51
  */
52
- getPlanByName(name, groupId) {
52
+ getPlanByTitle(title, groupId) {
53
53
  return __awaiter(this, void 0, void 0, function* () {
54
54
  const plans = yield this.getPlansByGroupId(groupId);
55
- const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === name.toLowerCase());
55
+ const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === title.toLowerCase());
56
56
  if (!filteredPlans.length) {
57
- throw Error(`The specified plan '${name}' does not exist.`);
57
+ throw Error(`The specified plan '${title}' does not exist.`);
58
58
  }
59
59
  if (filteredPlans.length > 1) {
60
- throw Error(`Multiple plans with name '${name}' found: ${filteredPlans.map(x => x.id)}.`);
60
+ throw Error(`Multiple plans with title '${title}' found: ${filteredPlans.map(x => x.id)}.`);
61
61
  }
62
62
  return filteredPlans[0];
63
63
  });
@@ -6,8 +6,12 @@ exports.validation = {
6
6
  return guids.every(guid => this.isValidGuid(guid));
7
7
  },
8
8
  isValidGuid(guid) {
9
+ if (!guid) {
10
+ return false;
11
+ }
9
12
  const guidRegEx = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
10
- return guidRegEx.test(guid);
13
+ // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
14
+ return guidRegEx.test(guid) || guid.toLocaleLowerCase().trim() === "@meid";
11
15
  },
12
16
  isValidTeamsChannelId(guid) {
13
17
  const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);
@@ -56,6 +56,18 @@ For the user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_ retrieve the user na
56
56
  m365 aad user get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --properties "userPrincipalName,mail,displayName"
57
57
  ```
58
58
 
59
+ Get information about the currently logged user using the Id token
60
+
61
+ ```sh
62
+ m365 aad user get --id "@meId"
63
+ ```
64
+
65
+ Get information about the currently logged in user using the UserName token
66
+
67
+ ```sh
68
+ m365 aad user get --userName "@meUserName"
69
+ ```
70
+
59
71
  ## More information
60
72
 
61
73
  - Microsoft Graph User properties: [https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/resources/user#properties](https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/resources/user#properties)