@pnp/cli-microsoft365 4.3.0-beta.fd397f5 → 4.4.0-beta.23194d7

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 (53) hide show
  1. package/.devcontainer/devcontainer.json +9 -1
  2. package/README.md +1 -1
  3. package/dist/Utils.js +7 -0
  4. package/dist/appInsights.js +2 -1
  5. package/dist/cli/Cli.js +20 -3
  6. package/dist/m365/aad/commands/group/group-list.js +41 -0
  7. package/dist/m365/aad/commands/o365group/{Group.js → GroupExtended.js} +1 -1
  8. package/dist/m365/aad/commands/o365group/o365group-user-set.js +3 -3
  9. package/dist/m365/aad/commands/user/user-get.js +33 -6
  10. package/dist/m365/aad/commands/user/user-hibp.js +67 -0
  11. package/dist/m365/aad/commands/user/user-password-validate.js +42 -0
  12. package/dist/m365/aad/commands.js +3 -0
  13. package/dist/m365/app/commands/permission/permission-list.js +266 -0
  14. package/dist/m365/app/commands.js +7 -0
  15. package/dist/m365/base/AppCommand.js +76 -0
  16. package/dist/m365/cli/commands/config/config-set.js +4 -1
  17. package/dist/m365/pa/cds-project-mutator.js +1 -1
  18. package/dist/m365/pa/commands/app/app-list.js +28 -1
  19. package/dist/m365/planner/commands/task/task-add.js +288 -0
  20. package/dist/m365/planner/commands.js +1 -0
  21. package/dist/m365/spo/commands/group/group-user-add.js +64 -13
  22. package/dist/m365/spo/commands/site/site-ensure.js +1 -1
  23. package/dist/m365/spo/commands/site/site-recyclebinitem-list.js +76 -0
  24. package/dist/m365/spo/commands.js +1 -0
  25. package/dist/m365/teams/commands/app/app-list.js +9 -6
  26. package/dist/m365/teams/commands/chat/chat-list.js +43 -0
  27. package/dist/m365/teams/commands/chat/chat-member-list.js +42 -0
  28. package/dist/m365/teams/commands/chat/chat-message-list.js +60 -0
  29. package/dist/m365/teams/commands/message/message-get.js +1 -1
  30. package/dist/m365/teams/commands/tab/tab-get.js +9 -6
  31. package/dist/m365/teams/commands.js +3 -0
  32. package/dist/request.js +9 -4
  33. package/dist/settingsNames.js +6 -1
  34. package/docs/docs/cmd/_global.md +2 -2
  35. package/docs/docs/cmd/aad/group/group-list.md +21 -0
  36. package/docs/docs/cmd/aad/user/user-get.md +13 -4
  37. package/docs/docs/cmd/aad/user/user-hibp.md +46 -0
  38. package/docs/docs/cmd/aad/user/user-password-validate.md +29 -0
  39. package/docs/docs/cmd/app/permission/permission-list.md +36 -0
  40. package/docs/docs/cmd/pa/app/app-list.md +17 -1
  41. package/docs/docs/cmd/planner/task/task-add.md +78 -0
  42. package/docs/docs/cmd/spfx/project/project-externalize.md +1 -1
  43. package/docs/docs/cmd/spfx/project/project-rename.md +1 -1
  44. package/docs/docs/cmd/spfx/spfx-doctor.md +1 -1
  45. package/docs/docs/cmd/spo/group/group-user-add.md +24 -6
  46. package/docs/docs/cmd/spo/site/site-recyclebinitem-list.md +40 -0
  47. package/docs/docs/cmd/teams/chat/chat-list.md +30 -0
  48. package/docs/docs/cmd/teams/chat/chat-member-list.md +24 -0
  49. package/docs/docs/cmd/teams/chat/chat-message-list.md +24 -0
  50. package/docs/docs/cmd/teams/message/message-get.md +0 -3
  51. package/npm-shrinkwrap.json +697 -938
  52. package/package.json +26 -20
  53. package/dist/m365/aad/commands/o365group/GroupUser.js +0 -3
@@ -0,0 +1,7 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const prefix = 'app';
4
+ exports.default = {
5
+ PERMISSION_LIST: `${prefix} permission list`
6
+ };
7
+ //# sourceMappingURL=commands.js.map
@@ -0,0 +1,76 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const fs = require("fs");
4
+ const cli_1 = require("../../cli");
5
+ const Command_1 = require("../../Command");
6
+ const Utils_1 = require("../../Utils");
7
+ class AppCommand extends Command_1.default {
8
+ get resource() {
9
+ return 'https://graph.microsoft.com';
10
+ }
11
+ action(logger, args, cb) {
12
+ const m365rcJsonPath = '.m365rc.json';
13
+ if (!fs.existsSync(m365rcJsonPath)) {
14
+ return cb(new Command_1.CommandError(`Could not find file: ${m365rcJsonPath}`));
15
+ }
16
+ try {
17
+ const m365rcJsonContents = fs.readFileSync(m365rcJsonPath, 'utf8');
18
+ if (!m365rcJsonContents) {
19
+ return cb(new Command_1.CommandError(`File ${m365rcJsonPath} is empty`));
20
+ }
21
+ this.m365rcJson = JSON.parse(m365rcJsonContents);
22
+ }
23
+ catch (e) {
24
+ return cb(new Command_1.CommandError(`Could not parse file: ${m365rcJsonPath}`));
25
+ }
26
+ if (!this.m365rcJson.apps ||
27
+ this.m365rcJson.apps.length === 0) {
28
+ return cb(new Command_1.CommandError(`No Azure AD apps found in ${m365rcJsonPath}`));
29
+ }
30
+ if (args.options.appId) {
31
+ if (!this.m365rcJson.apps.some(app => app.appId === args.options.appId)) {
32
+ return cb(new Command_1.CommandError(`App ${args.options.appId} not found in ${m365rcJsonPath}`));
33
+ }
34
+ this.appId = args.options.appId;
35
+ return super.action(logger, args, cb);
36
+ }
37
+ if (this.m365rcJson.apps.length === 1) {
38
+ this.appId = this.m365rcJson.apps[0].appId;
39
+ return super.action(logger, args, cb);
40
+ }
41
+ if (this.m365rcJson.apps.length > 1) {
42
+ cli_1.Cli.prompt({
43
+ message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
44
+ type: 'list',
45
+ choices: this.m365rcJson.apps.map((app, i) => {
46
+ return {
47
+ name: `${app.name} (${app.appId})`,
48
+ value: i
49
+ };
50
+ }),
51
+ default: 0,
52
+ name: 'appIdIndex'
53
+ }, (result) => {
54
+ this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
55
+ super.action(logger, args, cb);
56
+ });
57
+ }
58
+ }
59
+ options() {
60
+ const options = [
61
+ {
62
+ option: '--appId [appId]'
63
+ }
64
+ ];
65
+ const parentOptions = super.options();
66
+ return options.concat(parentOptions);
67
+ }
68
+ validate(args) {
69
+ if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
70
+ return `${args.options.appId} is not a valid GUID`;
71
+ }
72
+ return true;
73
+ }
74
+ }
75
+ exports.default = AppCommand;
76
+ //# sourceMappingURL=AppCommand.js.map
@@ -21,6 +21,9 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
21
21
  switch (args.options.key) {
22
22
  case settingsNames_1.settingsNames.showHelpOnFailure:
23
23
  case settingsNames_1.settingsNames.printErrorsAsPlainText:
24
+ case settingsNames_1.settingsNames.csvHeader:
25
+ case settingsNames_1.settingsNames.csvQuoted:
26
+ case settingsNames_1.settingsNames.csvQuotedEmpty:
24
27
  value = args.options.value === 'true';
25
28
  break;
26
29
  default:
@@ -47,7 +50,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
47
50
  if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
48
51
  return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
49
52
  }
50
- const allowedOutputs = ['text', 'json'];
53
+ const allowedOutputs = ['text', 'json', 'csv'];
51
54
  if (args.options.key === settingsNames_1.settingsNames.output &&
52
55
  allowedOutputs.indexOf(args.options.value) === -1) {
53
56
  return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedOutputs.join(', ')}`;
@@ -1,7 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const path = require("path");
4
- const xmldom_1 = require("xmldom");
4
+ const xmldom_1 = require("@xmldom/xmldom");
5
5
  /*
6
6
  * Logic extracted from bolt.module.solution.dll
7
7
  * Version: 0.4.3
@@ -12,8 +12,14 @@ class PaAppListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
12
12
  defaultProperties() {
13
13
  return ['name', 'displayName'];
14
14
  }
15
+ getTelemetryProperties(args) {
16
+ const telemetryProps = super.getTelemetryProperties(args);
17
+ telemetryProps.asAdmin = args.options.asAdmin === true;
18
+ telemetryProps.environment = typeof args.options.environment !== 'undefined';
19
+ return telemetryProps;
20
+ }
15
21
  commandAction(logger, args, cb) {
16
- const url = `${this.resource}providers/Microsoft.PowerApps/apps?api-version=2017-08-01`;
22
+ const url = `${this.resource}providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
17
23
  this
18
24
  .getAllItems(url, logger, true)
19
25
  .then(() => {
@@ -31,6 +37,27 @@ class PaAppListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
31
37
  cb();
32
38
  }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
33
39
  }
40
+ options() {
41
+ const options = [
42
+ {
43
+ option: '-e, --environment [environment]'
44
+ },
45
+ {
46
+ option: '--asAdmin'
47
+ }
48
+ ];
49
+ const parentOptions = super.options();
50
+ return options.concat(parentOptions);
51
+ }
52
+ validate(args) {
53
+ if (args.options.asAdmin && !args.options.environment) {
54
+ return 'When specifying the asAdmin option the environment option is required as well';
55
+ }
56
+ if (args.options.environment && !args.options.asAdmin) {
57
+ return 'When specifying the environment option the asAdmin option is required as well';
58
+ }
59
+ return true;
60
+ }
34
61
  }
35
62
  module.exports = new PaAppListCommand();
36
63
  //# sourceMappingURL=app-list.js.map
@@ -0,0 +1,288 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const Utils_1 = require("../../../../Utils");
5
+ const GraphCommand_1 = require("../../../base/GraphCommand");
6
+ const commands_1 = require("../../commands");
7
+ class PlannerTaskAddCommand extends GraphCommand_1.default {
8
+ get name() {
9
+ return commands_1.default.TASK_ADD;
10
+ }
11
+ get description() {
12
+ return 'Adds a new Microsoft Planner Task';
13
+ }
14
+ getTelemetryProperties(args) {
15
+ const telemetryProps = super.getTelemetryProperties(args);
16
+ telemetryProps.planId = typeof args.options.planId !== 'undefined';
17
+ telemetryProps.planName = typeof args.options.planName !== 'undefined';
18
+ telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
19
+ telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
20
+ telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
21
+ telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
22
+ telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
23
+ telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
24
+ telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
25
+ telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
26
+ telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
27
+ telemetryProps.description = typeof args.options.description !== 'undefined';
28
+ telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
29
+ return telemetryProps;
30
+ }
31
+ commandAction(logger, args, cb) {
32
+ this
33
+ .getPlanId(args)
34
+ .then(planId => {
35
+ this.planId = planId;
36
+ return this.getBucketId(args, planId);
37
+ })
38
+ .then(bucketId => {
39
+ this.bucketId = bucketId;
40
+ return this.generateUserAssignments(args);
41
+ })
42
+ .then(assignments => {
43
+ const requestOptions = {
44
+ url: `${this.resource}/v1.0/planner/tasks`,
45
+ headers: {
46
+ 'accept': 'application/json;odata.metadata=none'
47
+ },
48
+ responseType: 'json',
49
+ data: {
50
+ planId: this.planId,
51
+ bucketId: this.bucketId,
52
+ title: args.options.title,
53
+ startDateTime: args.options.startDateTime,
54
+ dueDateTime: args.options.dueDateTime,
55
+ percentComplete: args.options.percentComplete,
56
+ assignments: assignments,
57
+ orderHint: args.options.orderHint
58
+ }
59
+ };
60
+ return request_1.default.post(requestOptions);
61
+ })
62
+ .then(newTask => this.updateTaskDetails(args.options, newTask))
63
+ .then((res) => {
64
+ logger.log(res);
65
+ cb();
66
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
67
+ }
68
+ getTaskDetailsEtag(taskId) {
69
+ const requestOptions = {
70
+ url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
71
+ headers: {
72
+ accept: 'application/json'
73
+ },
74
+ responseType: 'json'
75
+ };
76
+ return request_1.default
77
+ .get(requestOptions)
78
+ .then((response) => {
79
+ const etag = response ? response['@odata.etag'] : undefined;
80
+ if (!etag) {
81
+ return Promise.reject(`Error fetching task details`);
82
+ }
83
+ return Promise.resolve(etag);
84
+ });
85
+ }
86
+ updateTaskDetails(options, newTask) {
87
+ const taskId = newTask.id;
88
+ if (!options.description) {
89
+ return Promise.resolve(newTask);
90
+ }
91
+ return this
92
+ .getTaskDetailsEtag(taskId)
93
+ .then(etag => {
94
+ const requestOptionsTaskDetails = {
95
+ url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
96
+ headers: {
97
+ 'accept': 'application/json;odata.metadata=none',
98
+ 'If-Match': etag,
99
+ 'Prefer': 'return=representation'
100
+ },
101
+ responseType: 'json',
102
+ data: {
103
+ description: options.description
104
+ }
105
+ };
106
+ return request_1.default.patch(requestOptionsTaskDetails);
107
+ })
108
+ .then(taskDetails => {
109
+ return Object.assign(Object.assign({}, newTask), taskDetails);
110
+ });
111
+ }
112
+ generateUserAssignments(args) {
113
+ const assignments = {};
114
+ if (!args.options.assignedToUserIds && !args.options.assignedToUserNames) {
115
+ return Promise.resolve(assignments);
116
+ }
117
+ return this
118
+ .getUserIds(args.options)
119
+ .then((userIds) => {
120
+ userIds.map(x => assignments[x] = {
121
+ '@odata.type': '#microsoft.graph.plannerAssignment',
122
+ orderHint: ' !'
123
+ });
124
+ return Promise.resolve(assignments);
125
+ });
126
+ }
127
+ getBucketId(args, planId) {
128
+ if (args.options.bucketId) {
129
+ return Promise.resolve(args.options.bucketId);
130
+ }
131
+ const requestOptions = {
132
+ url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
133
+ headers: {
134
+ accept: 'application/json;odata.metadata=none'
135
+ },
136
+ responseType: 'json'
137
+ };
138
+ return request_1.default
139
+ .get(requestOptions)
140
+ .then((response) => {
141
+ const bucket = response.value.find(val => val.name === args.options.bucketName);
142
+ if (!bucket) {
143
+ return Promise.reject(`The specified bucket does not exist`);
144
+ }
145
+ return Promise.resolve(bucket.id);
146
+ });
147
+ }
148
+ getPlanId(args) {
149
+ if (args.options.planId) {
150
+ return Promise.resolve(args.options.planId);
151
+ }
152
+ return this
153
+ .getGroupId(args)
154
+ .then((groupId) => {
155
+ const requestOptions = {
156
+ url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
157
+ headers: {
158
+ accept: 'application/json;odata.metadata=none'
159
+ },
160
+ responseType: 'json'
161
+ };
162
+ return request_1.default.get(requestOptions);
163
+ }).then((response) => {
164
+ const plan = response.value.find(val => val.title === args.options.planName);
165
+ if (!plan) {
166
+ return Promise.reject(`The specified plan does not exist`);
167
+ }
168
+ return Promise.resolve(plan.id);
169
+ });
170
+ }
171
+ getGroupId(args) {
172
+ if (args.options.ownerGroupId) {
173
+ return Promise.resolve(args.options.ownerGroupId);
174
+ }
175
+ const requestOptions = {
176
+ url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
177
+ headers: {
178
+ accept: 'application/json;odata.metadata=none'
179
+ },
180
+ responseType: 'json'
181
+ };
182
+ return request_1.default
183
+ .get(requestOptions)
184
+ .then(response => {
185
+ const group = response.value[0];
186
+ if (!group) {
187
+ return Promise.reject(`The specified owner group does not exist`);
188
+ }
189
+ return Promise.resolve(group.id);
190
+ });
191
+ }
192
+ getUserIds(options) {
193
+ if (options.assignedToUserIds) {
194
+ return Promise.resolve(options.assignedToUserIds.split(','));
195
+ }
196
+ // Hitting this section means assignedToUserNames won't be undefined
197
+ const userNames = options.assignedToUserNames;
198
+ const userArr = userNames.split(',').map(o => o.trim());
199
+ let userIds = [];
200
+ const promises = userArr.map(user => {
201
+ const requestOptions = {
202
+ url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
203
+ headers: {
204
+ 'content-type': 'application/json'
205
+ },
206
+ responseType: 'json'
207
+ };
208
+ return request_1.default.get(requestOptions);
209
+ });
210
+ return Promise
211
+ .all(promises)
212
+ .then((usersRes) => {
213
+ let userUpns = [];
214
+ userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
215
+ userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
216
+ // Find the members where no graph response was found
217
+ const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
218
+ if (invalidUsers && invalidUsers.length > 0) {
219
+ return Promise.reject(`Cannot proceed with planner task creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
220
+ }
221
+ return Promise.resolve(userIds);
222
+ });
223
+ }
224
+ options() {
225
+ const options = [
226
+ { option: '-t, --title <title>' },
227
+ { option: '--planId [planId]' },
228
+ { option: '--planName [planName]' },
229
+ { option: '--ownerGroupId [ownerGroupId]' },
230
+ { option: '--ownerGroupName [ownerGroupName]' },
231
+ { option: '--bucketId [bucketId]' },
232
+ { option: '--bucketName [bucketName]' },
233
+ { option: '--startDateTime [startDateTime]' },
234
+ { option: '--dueDateTime [dueDateTime]' },
235
+ { option: '--percentComplete [percentComplete]' },
236
+ { option: '--assignedToUserIds [assignedToUserIds]' },
237
+ { option: '--assignedToUserNames [assignedToUserNames]' },
238
+ { option: '--description [description]' },
239
+ { option: '--orderHint [orderHint]' }
240
+ ];
241
+ const parentOptions = super.options();
242
+ return options.concat(parentOptions);
243
+ }
244
+ validate(args) {
245
+ if (!args.options.planId && !args.options.planName) {
246
+ return 'Specify either planId or planName';
247
+ }
248
+ if (args.options.planId && args.options.planName) {
249
+ return 'Specify either planId or planName but not both';
250
+ }
251
+ if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
252
+ return 'Specify either ownerGroupId or ownerGroupName when using planName';
253
+ }
254
+ if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
255
+ return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
256
+ }
257
+ if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
258
+ return `${args.options.ownerGroupId} is not a valid GUID`;
259
+ }
260
+ if (!args.options.bucketId && !args.options.bucketName) {
261
+ return 'Specify either bucketId or bucketName';
262
+ }
263
+ if (args.options.bucketId && args.options.bucketName) {
264
+ return 'Specify either bucketId or bucketName but not both';
265
+ }
266
+ if (args.options.startDateTime && !Utils_1.default.isValidISODateTime(args.options.startDateTime)) {
267
+ return 'The startDateTime is not a valid ISO date string';
268
+ }
269
+ if (args.options.dueDateTime && !Utils_1.default.isValidISODateTime(args.options.dueDateTime)) {
270
+ return 'The dueDateTime is not a valid ISO date string';
271
+ }
272
+ if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
273
+ return `percentComplete is not a number`;
274
+ }
275
+ if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
276
+ return `percentComplete should be between 0 and 100 `;
277
+ }
278
+ if (args.options.assignedToUserIds && !Utils_1.default.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
279
+ return 'assignedToUserIds contains invalid GUID';
280
+ }
281
+ if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
282
+ return 'Specify either assignedToUserIds or assignedToUserNames but not both';
283
+ }
284
+ return true;
285
+ }
286
+ }
287
+ module.exports = new PlannerTaskAddCommand();
288
+ //# sourceMappingURL=task-add.js.map
@@ -7,6 +7,7 @@ exports.default = {
7
7
  PLAN_ADD: `${prefix} plan add`,
8
8
  PLAN_GET: `${prefix} plan get`,
9
9
  PLAN_LIST: `${prefix} plan list`,
10
+ TASK_ADD: `${prefix} task add`,
10
11
  TASK_LIST: `${prefix} task list`
11
12
  };
12
13
  //# sourceMappingURL=commands.js.map
@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const cli_1 = require("../../../../cli");
4
4
  const Command_1 = require("../../../../Command");
5
5
  const request_1 = require("../../../../request");
6
- const SpoCommand_1 = require("../../../base/SpoCommand");
7
6
  const AadUserGetCommand = require("../../../aad/commands/user/user-get");
7
+ const SpoCommand_1 = require("../../../base/SpoCommand");
8
8
  const commands_1 = require("../../commands");
9
9
  class SpoGroupUserAddCommand extends SpoCommand_1.default {
10
10
  get name() {
@@ -17,15 +17,21 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
17
17
  return ['DisplayName', 'Email'];
18
18
  }
19
19
  commandAction(logger, args, cb) {
20
- this.getOnlyActiveUsers(args, logger)
20
+ let groupId = 0;
21
+ this
22
+ .getGroupId(args)
23
+ .then((_groupId) => {
24
+ groupId = _groupId;
25
+ return this.getOnlyActiveUsers(args, logger);
26
+ })
21
27
  .then((resolvedUsernameList) => {
22
28
  if (this.verbose) {
23
- logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId}...`);
29
+ logger.logToStderr(`Start adding Active user/s to SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
24
30
  }
25
31
  const data = {
26
32
  url: args.options.webUrl,
27
33
  peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
28
- roleValue: `group:${args.options.groupId}`
34
+ roleValue: `group:${groupId}`
29
35
  };
30
36
  const requestOptions = {
31
37
  url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
@@ -46,24 +52,51 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
46
52
  cb();
47
53
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
48
54
  }
55
+ getGroupId(args) {
56
+ if (args.options.groupId) {
57
+ return Promise.resolve(args.options.groupId);
58
+ }
59
+ const requestOptions = {
60
+ url: `${args.options.webUrl}/_api/web/sitegroups/GetByName('${encodeURIComponent(args.options.groupName)}')`,
61
+ headers: {
62
+ 'accept': 'application/json;odata=nometadata'
63
+ },
64
+ responseType: 'json'
65
+ };
66
+ return request_1.default
67
+ .get(requestOptions)
68
+ .then(response => {
69
+ const groupId = response.Id;
70
+ if (!groupId) {
71
+ return Promise.reject(`The specified group not exist in the SharePoint site`);
72
+ }
73
+ return Promise.resolve(groupId);
74
+ });
75
+ }
49
76
  getOnlyActiveUsers(args, logger) {
50
77
  if (this.verbose) {
51
78
  logger.logToStderr(`Removing Users which are not active from the original list`);
52
79
  }
53
- const activeUsernamelist = [];
54
- return Promise.all(args.options.userName.split(",").map(singleUsername => {
80
+ const activeUserNameList = [];
81
+ const userInfo = args.options.userName ? args.options.userName : args.options.email;
82
+ return Promise.all(userInfo.split(',').map(singleUserName => {
55
83
  const options = {
56
- userName: singleUsername.trim(),
57
84
  output: 'json',
58
85
  debug: args.options.debug,
59
86
  verbose: args.options.verbose
60
87
  };
88
+ if (args.options.userName) {
89
+ options.userName = singleUserName.trim();
90
+ }
91
+ else {
92
+ options.email = singleUserName.trim();
93
+ }
61
94
  return cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
62
95
  .then((getUserGetOutput) => {
63
96
  if (this.debug) {
64
97
  logger.logToStderr(getUserGetOutput.stderr);
65
98
  }
66
- activeUsernamelist.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
99
+ activeUserNameList.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
67
100
  }, (err) => {
68
101
  if (this.debug) {
69
102
  logger.logToStderr(err.stderr);
@@ -71,7 +104,7 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
71
104
  });
72
105
  }))
73
106
  .then(() => {
74
- return Promise.resolve(activeUsernamelist);
107
+ return Promise.resolve(activeUserNameList);
75
108
  });
76
109
  }
77
110
  getFormattedUserList(activeUserList) {
@@ -86,10 +119,16 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
86
119
  option: '-u, --webUrl <webUrl>'
87
120
  },
88
121
  {
89
- option: '--groupId <groupId>'
122
+ option: '--groupId [groupId]'
123
+ },
124
+ {
125
+ option: '--groupName [groupName]'
126
+ },
127
+ {
128
+ option: '--userName [userName]'
90
129
  },
91
130
  {
92
- option: '--userName <userName>'
131
+ option: '--email [email]'
93
132
  }
94
133
  ];
95
134
  const parentOptions = super.options();
@@ -100,8 +139,20 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
100
139
  if (isValidSharePointUrl !== true) {
101
140
  return isValidSharePointUrl;
102
141
  }
103
- if (typeof args.options.groupId !== 'number') {
104
- return `Group Id : ${args.options.groupId} is not a number`;
142
+ if (!args.options.groupId && !args.options.groupName) {
143
+ return 'Specify either groupId or groupName';
144
+ }
145
+ if (args.options.groupId && args.options.groupName) {
146
+ return 'Specify either groupId or groupName but not both';
147
+ }
148
+ if (!args.options.userName && !args.options.email) {
149
+ return 'Specify either userName or email';
150
+ }
151
+ if (args.options.userName && args.options.email) {
152
+ return 'Specify either userName or email but not both';
153
+ }
154
+ if (args.options.groupId && isNaN(args.options.groupId)) {
155
+ return `Specified groupId ${args.options.groupId} is not a number`;
105
156
  }
106
157
  return true;
107
158
  }
@@ -59,7 +59,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
59
59
  if (this.debug) {
60
60
  logger.logToStderr(err.stderr);
61
61
  }
62
- if (err.error.message !== 'Request failed with status code 404') {
62
+ if (err.error.message !== '404 FILE NOT FOUND') {
63
63
  return Promise.reject(err);
64
64
  }
65
65
  if (this.verbose) {