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

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 (76) hide show
  1. package/dist/Auth.js +2 -2
  2. package/dist/Command.js +22 -0
  3. package/dist/m365/aad/commands/app/app-remove.js +0 -4
  4. package/dist/m365/aad/commands/app/app-role-remove.js +0 -4
  5. package/dist/m365/aad/commands.js +0 -2
  6. package/dist/m365/base/PowerAppsCommand.js +10 -0
  7. package/dist/m365/pa/commands/app/app-get.js +3 -5
  8. package/dist/m365/pa/commands/app/app-list.js +10 -9
  9. package/dist/m365/pa/commands/app/app-remove.js +3 -3
  10. package/dist/m365/pa/commands/connector/connector-export.js +3 -3
  11. package/dist/m365/pa/commands/connector/connector-list.js +10 -9
  12. package/dist/m365/pa/commands/environment/environment-get.js +3 -3
  13. package/dist/m365/pa/commands/environment/environment-list.js +4 -4
  14. package/dist/m365/planner/commands/bucket/bucket-add.js +17 -9
  15. package/dist/m365/planner/commands/bucket/bucket-get.js +19 -11
  16. package/dist/m365/planner/commands/bucket/bucket-list.js +17 -9
  17. package/dist/m365/planner/commands/bucket/bucket-remove.js +19 -11
  18. package/dist/m365/planner/commands/bucket/bucket-set.js +19 -11
  19. package/dist/m365/planner/commands/plan/plan-add.js +98 -5
  20. package/dist/m365/planner/commands/plan/plan-get.js +1 -1
  21. package/dist/m365/planner/commands/plan/plan-remove.js +1 -1
  22. package/dist/m365/planner/commands/task/task-add.js +16 -16
  23. package/dist/m365/planner/commands/task/task-get.js +14 -9
  24. package/dist/m365/planner/commands/task/task-list.js +19 -11
  25. package/dist/m365/planner/commands/task/task-reference-add.js +1 -7
  26. package/dist/m365/planner/commands/task/task-reference-remove.js +11 -14
  27. package/dist/m365/planner/commands/task/task-remove.js +4 -19
  28. package/dist/m365/planner/commands/task/task-set.js +17 -23
  29. package/dist/m365/search/commands/externalconnection/externalconnection-get.js +69 -0
  30. package/dist/m365/search/commands.js +1 -0
  31. package/dist/m365/spfx/commands/project/project-upgrade/rules/FN015008_FILE_eslintrc_js.js +7 -0
  32. package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.0.js +6 -4
  33. package/dist/m365/spo/base-permissions.js +9 -0
  34. package/dist/m365/spo/commands/field/field-set.js +16 -9
  35. package/dist/m365/spo/commands/group/group-add.js +96 -0
  36. package/dist/m365/spo/commands/group/group-set.js +167 -0
  37. package/dist/m365/spo/commands/hubsite/hubsite-get.js +99 -13
  38. package/dist/m365/spo/commands/listitem/listitem-get.js +9 -9
  39. package/dist/m365/spo/commands/listitem/listitem-list.js +9 -26
  40. package/dist/m365/spo/commands/roledefinition/RoleDefinition.js +3 -0
  41. package/dist/m365/spo/commands/roledefinition/RoleType.js +16 -0
  42. package/dist/m365/spo/commands/roledefinition/roledefinition-get.js +59 -0
  43. package/dist/m365/spo/commands.js +3 -0
  44. package/dist/m365/teams/commands/team/team-archive.js +51 -15
  45. package/dist/m365/teams/commands/team/team-remove.js +47 -11
  46. package/dist/m365/teams/commands/team/team-unarchive.js +48 -12
  47. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js +1 -9
  48. package/dist/utils/accessToken.js +18 -0
  49. package/dist/utils/planner.js +6 -6
  50. package/dist/utils/validation.js +5 -1
  51. package/docs/docs/cmd/aad/app/app-remove.md +0 -6
  52. package/docs/docs/cmd/aad/app/app-role-remove.md +0 -6
  53. package/docs/docs/cmd/aad/user/user-get.md +12 -0
  54. package/docs/docs/cmd/planner/bucket/bucket-add.md +9 -6
  55. package/docs/docs/cmd/planner/bucket/bucket-get.md +10 -7
  56. package/docs/docs/cmd/planner/bucket/bucket-list.md +8 -5
  57. package/docs/docs/cmd/planner/bucket/bucket-remove.md +8 -5
  58. package/docs/docs/cmd/planner/bucket/bucket-set.md +9 -6
  59. package/docs/docs/cmd/planner/plan/plan-add.md +18 -2
  60. package/docs/docs/cmd/planner/plan/plan-remove.md +1 -1
  61. package/docs/docs/cmd/planner/task/task-add.md +11 -8
  62. package/docs/docs/cmd/planner/task/task-get.md +17 -8
  63. package/docs/docs/cmd/planner/task/task-list.md +9 -6
  64. package/docs/docs/cmd/planner/task/task-set.md +9 -6
  65. package/docs/docs/cmd/search/externalconnection/externalconnection-get.md +33 -0
  66. package/docs/docs/cmd/spo/field/field-set.md +7 -4
  67. package/docs/docs/cmd/spo/group/group-add.md +51 -0
  68. package/docs/docs/cmd/spo/group/group-set.md +69 -0
  69. package/docs/docs/cmd/spo/hubsite/hubsite-get.md +39 -7
  70. package/docs/docs/cmd/spo/listitem/listitem-get.md +11 -2
  71. package/docs/docs/cmd/spo/listitem/listitem-list.md +8 -6
  72. package/docs/docs/cmd/spo/roledefinition/roledefinition-get.md +27 -0
  73. package/docs/docs/cmd/teams/team/team-archive.md +20 -5
  74. package/docs/docs/cmd/teams/team/team-remove.md +19 -5
  75. package/docs/docs/cmd/teams/team/team-unarchive.md +18 -4
  76. package/package.json +1 -1
@@ -13,10 +13,8 @@ class SpoListItemListCommand extends SpoCommand_1.default {
13
13
  }
14
14
  getTelemetryProperties(args) {
15
15
  const telemetryProps = super.getTelemetryProperties(args);
16
- telemetryProps.id = typeof args.options.id !== 'undefined';
17
16
  telemetryProps.listId = typeof args.options.listId !== 'undefined';
18
17
  telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
19
- telemetryProps.title = typeof args.options.title !== 'undefined';
20
18
  telemetryProps.fields = typeof args.options.fields !== 'undefined';
21
19
  telemetryProps.filter = typeof args.options.filter !== 'undefined';
22
20
  telemetryProps.pageNumber = typeof args.options.pageNumber !== 'undefined';
@@ -25,17 +23,14 @@ class SpoListItemListCommand extends SpoCommand_1.default {
25
23
  return telemetryProps;
26
24
  }
27
25
  commandAction(logger, args, cb) {
28
- if (args.options.id) {
29
- this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
30
- }
31
- if (args.options.title) {
32
- this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
33
- }
34
- const listIdArgument = args.options.listId || args.options.id || '';
35
- const listTitleArgument = args.options.listTitle || args.options.title || '';
26
+ const listIdArgument = args.options.listId || '';
27
+ const listTitleArgument = args.options.listTitle || '';
36
28
  let formDigestValue = '';
37
29
  const fieldsArray = args.options.fields ? args.options.fields.split(",")
38
30
  : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
31
+ const fieldsWithSlash = fieldsArray.filter(item => item.includes('/'));
32
+ const fieldsToExpand = fieldsWithSlash.map(e => e.split('/')[0]);
33
+ const expandFieldsArray = fieldsToExpand.filter((item, pos) => fieldsToExpand.indexOf(item) === pos);
39
34
  const listRestUrl = listIdArgument ?
40
35
  `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
41
36
  : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
@@ -75,8 +70,9 @@ class SpoListItemListCommand extends SpoCommand_1.default {
75
70
  const skipToken = (args.options.pageNumber && Number(args.options.pageNumber) > 0 && skipTokenId > 0) ? `$skiptoken=Paged=TRUE%26p_ID=${res.value[res.value.length - 1].Id}` : ``;
76
71
  const rowLimit = args.options.pageSize ? `$top=${args.options.pageSize}` : ``;
77
72
  const filter = args.options.filter ? `$filter=${encodeURIComponent(args.options.filter)}` : ``;
73
+ const fieldExpand = expandFieldsArray.length > 0 ? `&$expand=${expandFieldsArray.join(",")}` : ``;
78
74
  const fieldSelect = fieldsArray.length > 0 ?
79
- `?$select=${encodeURIComponent(fieldsArray.join(","))}&${rowLimit}&${skipToken}&${filter}` :
75
+ `?$select=${encodeURIComponent(fieldsArray.join(","))}${fieldExpand}&${rowLimit}&${skipToken}&${filter}` :
80
76
  `?${rowLimit}&${skipToken}&${filter}`;
81
77
  const requestBody = args.options.camlQuery ?
82
78
  {
@@ -107,12 +103,6 @@ class SpoListItemListCommand extends SpoCommand_1.default {
107
103
  {
108
104
  option: '-u, --webUrl <webUrl>'
109
105
  },
110
- {
111
- option: '--id [id]'
112
- },
113
- {
114
- option: '--title [title]'
115
- },
116
106
  {
117
107
  option: '-i, --listId [listId]'
118
108
  },
@@ -157,14 +147,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
157
147
  if (isValidSharePointUrl !== true) {
158
148
  return isValidSharePointUrl;
159
149
  }
160
- if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
150
+ if (!args.options.listId && !args.options.listTitle) {
161
151
  return `Specify listId or listTitle`;
162
152
  }
163
- if (args.options.id && args.options.title) {
164
- return `Specify list id or title but not both`;
165
- }
166
- // Check if only one of the 4 options is specified
167
- if ([args.options.id, args.options.title, args.options.listId, args.options.listTitle].filter(o => o).length > 1) {
153
+ if (args.options.listId && args.options.listTitle) {
168
154
  return 'Specify listId or listTitle but not both';
169
155
  }
170
156
  if (args.options.camlQuery && args.options.fields) {
@@ -188,9 +174,6 @@ class SpoListItemListCommand extends SpoCommand_1.default {
188
174
  if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
189
175
  return `${args.options.listId} is not a valid GUID`;
190
176
  }
191
- if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
192
- return `${args.options.id} in option id is not a valid GUID`;
193
- }
194
177
  return true;
195
178
  }
196
179
  }
@@ -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
@@ -63,9 +63,11 @@ exports.default = {
63
63
  FOLDER_REMOVE: `${prefix} folder remove`,
64
64
  FOLDER_RENAME: `${prefix} folder rename`,
65
65
  GET: `${prefix} get`,
66
+ GROUP_ADD: `${prefix} group add`,
66
67
  GROUP_GET: `${prefix} group get`,
67
68
  GROUP_LIST: `${prefix} group list`,
68
69
  GROUP_REMOVE: `${prefix} group remove`,
70
+ GROUP_SET: `${prefix} group set`,
69
71
  GROUP_USER_ADD: `${prefix} group user add`,
70
72
  GROUP_USER_LIST: `${prefix} group user list`,
71
73
  GROUP_USER_REMOVE: `${prefix} group user remove`,
@@ -167,6 +169,7 @@ exports.default = {
167
169
  REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
168
170
  REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
169
171
  REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
172
+ ROLEDEFINITION_GET: `${prefix} roledefinition get`,
170
173
  ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
171
174
  ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
172
175
  SEARCH: `${prefix} search`,
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const request_1 = require("../../../../request");
4
4
  const utils_1 = require("../../../../utils");
5
+ const aadGroup_1 = require("../../../../utils/aadGroup");
5
6
  const GraphCommand_1 = require("../../../base/GraphCommand");
6
7
  const commands_1 = require("../../commands");
7
8
  class TeamsTeamArchiveCommand extends GraphCommand_1.default {
@@ -16,27 +17,53 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
16
17
  telemetryProps.shouldSetSpoSiteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
17
18
  return telemetryProps;
18
19
  }
20
+ getTeamId(args) {
21
+ if (args.options.id) {
22
+ return Promise.resolve(args.options.id);
23
+ }
24
+ return aadGroup_1.aadGroup
25
+ .getGroupByDisplayName(args.options.name)
26
+ .then(group => {
27
+ if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
28
+ return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
29
+ }
30
+ return group.id;
31
+ });
32
+ }
19
33
  commandAction(logger, args, cb) {
34
+ if (args.options.teamId) {
35
+ args.options.id = args.options.teamId;
36
+ this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
37
+ }
20
38
  const siteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
21
- const requestOptions = {
22
- url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/archive`,
23
- headers: {
24
- 'content-type': 'application/json;odata=nometadata',
25
- 'accept': 'application/json;odata.metadata=none'
26
- },
27
- responseType: 'json',
28
- data: {
29
- shouldSetSpoSiteReadOnlyForMembers: siteReadOnlyForMembers
30
- }
31
- };
32
- request_1.default
33
- .post(requestOptions)
39
+ this
40
+ .getTeamId(args)
41
+ .then((teamId) => {
42
+ const requestOptions = {
43
+ url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/archive`,
44
+ headers: {
45
+ 'content-type': 'application/json;odata=nometadata',
46
+ 'accept': 'application/json;odata.metadata=none'
47
+ },
48
+ responseType: 'json',
49
+ data: {
50
+ shouldSetSpoSiteReadOnlyForMembers: siteReadOnlyForMembers
51
+ }
52
+ };
53
+ return request_1.default.post(requestOptions);
54
+ })
34
55
  .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
35
56
  }
36
57
  options() {
37
58
  const options = [
38
59
  {
39
- option: '-i, --teamId <teamId>'
60
+ option: '-i, --id [id]'
61
+ },
62
+ {
63
+ option: '-n, --name [name]'
64
+ },
65
+ {
66
+ option: '--teamId [teamId]'
40
67
  },
41
68
  {
42
69
  option: '--shouldSetSpoSiteReadOnlyForMembers'
@@ -46,9 +73,18 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
46
73
  return options.concat(parentOptions);
47
74
  }
48
75
  validate(args) {
49
- if (!utils_1.validation.isValidGuid(args.options.teamId)) {
76
+ if (!args.options.id && !args.options.name && !args.options.teamId) {
77
+ return 'Specify either id or name';
78
+ }
79
+ if (args.options.name && (args.options.id || args.options.teamId)) {
80
+ return 'Specify either id or name but not both';
81
+ }
82
+ if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
50
83
  return `${args.options.teamId} is not a valid GUID`;
51
84
  }
85
+ if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
86
+ return `${args.options.id} is not a valid GUID`;
87
+ }
52
88
  return true;
53
89
  }
54
90
  }
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const cli_1 = require("../../../../cli");
4
4
  const request_1 = require("../../../../request");
5
5
  const utils_1 = require("../../../../utils");
6
+ const aadGroup_1 = require("../../../../utils/aadGroup");
6
7
  const GraphCommand_1 = require("../../../base/GraphCommand");
7
8
  const commands_1 = require("../../commands");
8
9
  class TeamsTeamRemoveCommand extends GraphCommand_1.default {
@@ -17,17 +18,37 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
17
18
  telemetryProps.confirm = (!(!args.options.confirm)).toString();
18
19
  return telemetryProps;
19
20
  }
21
+ getTeamId(args) {
22
+ if (args.options.id) {
23
+ return Promise.resolve(args.options.id);
24
+ }
25
+ return aadGroup_1.aadGroup
26
+ .getGroupByDisplayName(args.options.name)
27
+ .then(group => {
28
+ if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
29
+ return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
30
+ }
31
+ return group.id;
32
+ });
33
+ }
20
34
  commandAction(logger, args, cb) {
35
+ if (args.options.teamId) {
36
+ args.options.id = args.options.teamId;
37
+ this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
38
+ }
21
39
  const removeTeam = () => {
22
- const requestOptions = {
23
- url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.teamId)}`,
24
- headers: {
25
- accept: 'application/json;odata.metadata=none'
26
- },
27
- responseType: 'json'
28
- };
29
- request_1.default
30
- .delete(requestOptions)
40
+ this
41
+ .getTeamId(args)
42
+ .then((teamId) => {
43
+ const requestOptions = {
44
+ url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
45
+ headers: {
46
+ accept: 'application/json;odata.metadata=none'
47
+ },
48
+ responseType: 'json'
49
+ };
50
+ return request_1.default.delete(requestOptions);
51
+ })
31
52
  .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
32
53
  };
33
54
  if (args.options.confirm) {
@@ -52,7 +73,13 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
52
73
  options() {
53
74
  const options = [
54
75
  {
55
- option: '-i, --teamId <teamId>'
76
+ option: '-i, --id [id]'
77
+ },
78
+ {
79
+ option: '-n, --name [name]'
80
+ },
81
+ {
82
+ option: '--teamId [teamId]'
56
83
  },
57
84
  {
58
85
  option: '--confirm'
@@ -62,9 +89,18 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
62
89
  return options.concat(parentOptions);
63
90
  }
64
91
  validate(args) {
65
- if (!utils_1.validation.isValidGuid(args.options.teamId)) {
92
+ if (!args.options.id && !args.options.name && !args.options.teamId) {
93
+ return 'Specify either id or name';
94
+ }
95
+ if (args.options.name && (args.options.id || args.options.teamId)) {
96
+ return 'Specify either id or name but not both';
97
+ }
98
+ if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
66
99
  return `${args.options.teamId} is not a valid GUID`;
67
100
  }
101
+ if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
102
+ return `${args.options.id} is not a valid GUID`;
103
+ }
68
104
  return true;
69
105
  }
70
106
  }
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const request_1 = require("../../../../request");
4
4
  const utils_1 = require("../../../../utils");
5
+ const aadGroup_1 = require("../../../../utils/aadGroup");
5
6
  const GraphCommand_1 = require("../../../base/GraphCommand");
6
7
  const commands_1 = require("../../commands");
7
8
  class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
@@ -11,33 +12,68 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
11
12
  get description() {
12
13
  return 'Restores an archived Microsoft Teams team';
13
14
  }
15
+ getTeamId(args) {
16
+ if (args.options.id) {
17
+ return Promise.resolve(args.options.id);
18
+ }
19
+ return aadGroup_1.aadGroup
20
+ .getGroupByDisplayName(args.options.name)
21
+ .then(group => {
22
+ if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
23
+ return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
24
+ }
25
+ return group.id;
26
+ });
27
+ }
14
28
  commandAction(logger, args, cb) {
29
+ if (args.options.teamId) {
30
+ args.options.id = args.options.teamId;
31
+ this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
32
+ }
15
33
  const endpoint = `${this.resource}/v1.0`;
16
- const requestOptions = {
17
- url: `${endpoint}/teams/${encodeURIComponent(args.options.teamId)}/unarchive`,
18
- headers: {
19
- 'content-type': 'application/json;odata=nometadata',
20
- 'accept': 'application/json;odata.metadata=none'
21
- },
22
- responseType: 'json'
23
- };
24
- request_1.default
25
- .post(requestOptions)
34
+ this
35
+ .getTeamId(args)
36
+ .then((teamId) => {
37
+ const requestOptions = {
38
+ url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
39
+ headers: {
40
+ 'content-type': 'application/json;odata=nometadata',
41
+ 'accept': 'application/json;odata.metadata=none'
42
+ },
43
+ responseType: 'json'
44
+ };
45
+ return request_1.default.post(requestOptions);
46
+ })
26
47
  .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
27
48
  }
28
49
  options() {
29
50
  const options = [
30
51
  {
31
- option: '-i, --teamId <teamId>'
52
+ option: '-i, --id [id]'
53
+ },
54
+ {
55
+ option: '-n, --name [name]'
56
+ },
57
+ {
58
+ option: '--teamId [teamId]'
32
59
  }
33
60
  ];
34
61
  const parentOptions = super.options();
35
62
  return options.concat(parentOptions);
36
63
  }
37
64
  validate(args) {
38
- if (!utils_1.validation.isValidGuid(args.options.teamId)) {
65
+ if (!args.options.id && !args.options.name && !args.options.teamId) {
66
+ return 'Specify either id or name';
67
+ }
68
+ if (args.options.name && (args.options.id || args.options.teamId)) {
69
+ return 'Specify either id or name but not both';
70
+ }
71
+ if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
39
72
  return `${args.options.teamId} is not a valid GUID`;
40
73
  }
74
+ if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
75
+ return `${args.options.id} is not a valid GUID`;
76
+ }
41
77
  return true;
42
78
  }
43
79
  }
@@ -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);
@@ -8,12 +8,6 @@ Removes an Azure AD app registration
8
8
  m365 aad app remove [options]
9
9
  ```
10
10
 
11
- ## Alias
12
-
13
- ```sh
14
- m365 aad app delete [options]
15
- ```
16
-
17
11
  ## Options
18
12
 
19
13
  `--appId [appId]`
@@ -8,12 +8,6 @@ Removes role from the specified Azure AD app registration
8
8
  m365 aad app role remove [options]
9
9
  ```
10
10
 
11
- ## Alias
12
-
13
- ```sh
14
- m365 aad app role delete [options]
15
- ```
16
-
17
11
  ## Options
18
12
 
19
13
  `--appId [appId]`
@@ -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)
@@ -14,16 +14,19 @@ m365 planner bucket add [options]
14
14
  : Name of the bucket to add.
15
15
 
16
16
  `--planId [planId]`
17
- : Plan ID to which the bucket belongs. Specify either `planId` or `planName` but not both.
17
+ : ID of the plan to which the bucket belongs. Specify either `planId` or `planTitle` but not both.
18
+
19
+ `--planTitle [planTitle]`
20
+ : Title of the plan to which the bucket belongs. Specify either `planId` or `planTitle` but not both.
18
21
 
19
22
  `--planName [planName]`
20
- : Plan Name to which the bucket belongs. Specify either `planId` or `planName` but not both.
23
+ : (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
21
24
 
22
25
  `--ownerGroupId [ownerGroupId]`
23
- : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planName`.
26
+ : ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
24
27
 
25
28
  `--ownerGroupName [ownerGroupName]`
26
- : Name of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planName`.
29
+ : Name of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
27
30
 
28
31
  `--orderHint [orderHint]`
29
32
  : Hint used to order items of this type in a list view. The format is defined as outlined [here](https://docs.microsoft.com/en-us/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0).
@@ -38,8 +41,8 @@ Adds a Microsoft Planner bucket with the name _My Planner Bucket_ for plan with
38
41
  m365 planner bucket add --name "My Planner Bucket" --planId "xqQg5FS2LkCp935s-FIFm2QAFkHM" --orderHint " !"
39
42
  ```
40
43
 
41
- Adds a Microsoft Planner bucket with the name _My Planner Bucket_ for plan with the name _My Planner Plan_ owned by group _My Planner Group_
44
+ Adds a Microsoft Planner bucket with the name _My Planner Bucket_ for plan with the title _My Planner Plan_ owned by group _My Planner Group_
42
45
 
43
46
  ```sh
44
- m365 planner bucket add --name "My Planner Bucket" --planName "My Planner Plan" --ownerGroupName "My Planner Group"
47
+ m365 planner bucket add --name "My Planner Bucket" --planTitle "My Planner Plan" --ownerGroupName "My Planner Group"
45
48
  ```