@pnp/cli-microsoft365 5.0.0-beta.8687ee9 → 5.0.0-beta.8f5dd30

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 (95) hide show
  1. package/.devcontainer/devcontainer.json +13 -2
  2. package/.eslintrc.js +2 -0
  3. package/.mocharc.json +9 -0
  4. package/README.md +2 -2
  5. package/dist/Auth.js +22 -9
  6. package/dist/Command.js +1 -1
  7. package/dist/Utils.js +4 -0
  8. package/dist/api.d.ts +13 -0
  9. package/dist/api.js +17 -0
  10. package/dist/cli/Cli.js +26 -13
  11. package/dist/m365/aad/commands/app/app-add.js +43 -7
  12. package/dist/m365/aad/commands/app/app-delete.js +123 -0
  13. package/dist/m365/aad/commands/app/app-get.js +56 -11
  14. package/dist/m365/aad/commands/app/app-set.js +98 -3
  15. package/dist/m365/aad/commands/group/group-list.js +54 -0
  16. package/dist/m365/aad/commands/o365group/{Group.js → GroupExtended.js} +1 -1
  17. package/dist/m365/aad/commands/o365group/o365group-conversation-list.js +41 -0
  18. package/dist/m365/aad/commands/o365group/o365group-user-set.js +3 -3
  19. package/dist/m365/aad/commands/user/user-hibp.js +67 -0
  20. package/dist/m365/aad/commands/user/user-list.js +7 -4
  21. package/dist/m365/aad/commands.js +4 -0
  22. package/dist/m365/cli/commands/config/config-set.js +5 -1
  23. package/dist/m365/flow/commands/flow-get.js +2 -2
  24. package/dist/m365/outlook/commands/room/room-list.js +43 -0
  25. package/dist/m365/outlook/commands/roomlist/roomlist-list.js +25 -0
  26. package/dist/m365/outlook/commands.js +2 -0
  27. package/dist/m365/pa/cds-project-mutator.js +1 -1
  28. package/dist/m365/{aad/commands/o365group/GroupUser.js → planner/AppliedCategories.js} +1 -1
  29. package/dist/m365/planner/commands/task/task-details-get.js +39 -0
  30. package/dist/m365/planner/commands/task/task-get.js +37 -0
  31. package/dist/m365/planner/commands/task/task-list.js +37 -7
  32. package/dist/m365/planner/commands/task/task-set.js +357 -0
  33. package/dist/m365/planner/commands.js +4 -1
  34. package/dist/m365/spfx/commands/project/project-upgrade/rules/FN014008_CODE_launch_hostedWorkbench_type.js +62 -0
  35. package/dist/m365/spfx/commands/project/project-upgrade/{upgrade-1.14.0-beta.4.js → upgrade-1.14.0.js} +27 -25
  36. package/dist/m365/spfx/commands/project/project-upgrade.js +13 -15
  37. package/dist/m365/spfx/commands/spfx-doctor.js +25 -6
  38. package/dist/m365/spo/commands/group/group-user-add.js +74 -16
  39. package/dist/m365/spo/commands/group/group-user-remove.js +100 -0
  40. package/dist/m365/spo/commands/site/site-recyclebinitem-list.js +76 -0
  41. package/dist/m365/spo/commands.js +2 -0
  42. package/dist/m365/teams/commands/app/app-install.js +75 -21
  43. package/dist/m365/teams/commands/app/app-list.js +9 -6
  44. package/dist/m365/teams/commands/app/app-update.js +54 -12
  45. package/dist/m365/teams/commands/channel/channel-get.js +29 -7
  46. package/dist/m365/teams/commands/chat/chat-list.js +43 -0
  47. package/dist/m365/teams/commands/chat/chat-member-list.js +42 -0
  48. package/dist/m365/teams/commands/chat/chat-message-list.js +60 -0
  49. package/dist/m365/teams/commands/chat/chat-message-send.js +225 -0
  50. package/dist/m365/teams/commands/message/message-get.js +1 -1
  51. package/dist/m365/teams/commands/tab/tab-get.js +9 -6
  52. package/dist/m365/teams/commands.js +4 -0
  53. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js +57 -0
  54. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-list.js +56 -0
  55. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-get.js +39 -0
  56. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-list.js +38 -0
  57. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-get.js +51 -0
  58. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js +38 -0
  59. package/dist/m365/tenant/commands.js +6 -0
  60. package/dist/settingsNames.js +6 -0
  61. package/docs/docs/cmd/aad/app/app-delete.md +51 -0
  62. package/docs/docs/cmd/aad/app/app-get.md +12 -1
  63. package/docs/docs/cmd/aad/app/app-set.md +21 -0
  64. package/docs/docs/cmd/aad/group/group-list.md +30 -0
  65. package/docs/docs/cmd/aad/o365group/o365group-conversation-list.md +24 -0
  66. package/docs/docs/cmd/aad/user/user-hibp.md +46 -0
  67. package/docs/docs/cmd/aad/user/user-list.md +9 -0
  68. package/docs/docs/cmd/outlook/room/room-list.md +30 -0
  69. package/docs/docs/cmd/outlook/roomlist/roomlist-list.md +21 -0
  70. package/docs/docs/cmd/planner/task/task-details-get.md +24 -0
  71. package/docs/docs/cmd/planner/task/task-get.md +29 -0
  72. package/docs/docs/cmd/planner/task/task-list.md +5 -0
  73. package/docs/docs/cmd/planner/task/task-set.md +99 -0
  74. package/docs/docs/cmd/search/externalconnection/externalconnection-add.md +3 -3
  75. package/docs/docs/cmd/spfx/project/project-upgrade.md +8 -8
  76. package/docs/docs/cmd/spo/group/group-user-add.md +28 -6
  77. package/docs/docs/cmd/spo/group/group-user-remove.md +39 -0
  78. package/docs/docs/cmd/spo/site/site-recyclebinitem-list.md +40 -0
  79. package/docs/docs/cmd/teams/app/app-install.md +22 -4
  80. package/docs/docs/cmd/teams/app/app-update.md +12 -3
  81. package/docs/docs/cmd/teams/channel/channel-get.md +11 -2
  82. package/docs/docs/cmd/teams/chat/chat-list.md +30 -0
  83. package/docs/docs/cmd/teams/chat/chat-member-list.md +24 -0
  84. package/docs/docs/cmd/teams/chat/chat-message-list.md +24 -0
  85. package/docs/docs/cmd/teams/chat/chat-message-send.md +55 -0
  86. package/docs/docs/cmd/teams/message/message-get.md +0 -3
  87. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-get.md +33 -0
  88. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-list.md +30 -0
  89. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-get.md +24 -0
  90. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-list.md +34 -0
  91. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-get.md +28 -0
  92. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-list.md +34 -0
  93. package/npm-shrinkwrap.json +967 -997
  94. package/package.json +34 -27
  95. package/dist/m365/base/AadCommand.js +0 -10
@@ -406,8 +406,8 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
406
406
  fix: 'Install Node.js v12 or v14'
407
407
  },
408
408
  react: {
409
- range: '16.9.0',
410
- fix: 'npm i react@16.9.0'
409
+ range: '16.9.36',
410
+ fix: 'npm i react@16.9.36'
411
411
  },
412
412
  sp: SharePointVersion.SPO,
413
413
  yo: {
@@ -425,8 +425,8 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
425
425
  fix: 'Install Node.js v12 or v14'
426
426
  },
427
427
  react: {
428
- range: '16.9.0',
429
- fix: 'npm i react@16.9.0'
428
+ range: '16.9.51',
429
+ fix: 'npm i react@16.9.51'
430
430
  },
431
431
  sp: SharePointVersion.SPO,
432
432
  yo: {
@@ -444,8 +444,27 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
444
444
  fix: 'Install Node.js v12 or v14'
445
445
  },
446
446
  react: {
447
- range: '16.9.0',
448
- fix: 'npm i react@16.9.0'
447
+ range: '16.9.51',
448
+ fix: 'npm i react@16.9.51'
449
+ },
450
+ sp: SharePointVersion.SPO,
451
+ yo: {
452
+ range: '^4',
453
+ fix: 'npm i -g yo@4'
454
+ }
455
+ },
456
+ '1.14.0': {
457
+ gulp: {
458
+ range: '^4',
459
+ fix: 'npm i -g gulp@4'
460
+ },
461
+ node: {
462
+ range: '^12 || ^14',
463
+ fix: 'Install Node.js v12 or v14'
464
+ },
465
+ react: {
466
+ range: '16.9.51',
467
+ fix: 'npm i react@16.9.51'
449
468
  },
450
469
  sp: SharePointVersion.SPO,
451
470
  yo: {
@@ -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.getValidUsers(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,32 +52,66 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
46
52
  cb();
47
53
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
48
54
  }
49
- getOnlyActiveUsers(args, logger) {
55
+ getGroupId(args) {
56
+ const getGroupMethod = args.options.groupName ?
57
+ `GetByName('${encodeURIComponent(args.options.groupName)}')` :
58
+ `GetById('${args.options.groupId}')`;
59
+ const requestOptions = {
60
+ url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}`,
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 does not exist in the SharePoint site`);
72
+ }
73
+ return groupId;
74
+ });
75
+ }
76
+ getValidUsers(args, logger) {
50
77
  if (this.verbose) {
51
- logger.logToStderr(`Removing Users which are not active from the original list`);
78
+ logger.logToStderr(`Checking if the specified users exist`);
52
79
  }
53
- const activeUsernamelist = [];
54
- return Promise.all(args.options.userName.split(",").map(singleUsername => {
80
+ const validUserNames = [];
81
+ const invalidUserNames = [];
82
+ const userInfo = args.options.userName ? args.options.userName : args.options.email;
83
+ return Promise
84
+ .all(userInfo.split(',').map(singleUserName => {
55
85
  const options = {
56
- userName: singleUsername.trim(),
57
86
  output: 'json',
58
87
  debug: args.options.debug,
59
88
  verbose: args.options.verbose
60
89
  };
61
- return cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
90
+ if (args.options.userName) {
91
+ options.userName = singleUserName.trim();
92
+ }
93
+ else {
94
+ options.email = singleUserName.trim();
95
+ }
96
+ return cli_1.Cli
97
+ .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
62
98
  .then((getUserGetOutput) => {
63
99
  if (this.debug) {
64
100
  logger.logToStderr(getUserGetOutput.stderr);
65
101
  }
66
- activeUsernamelist.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
102
+ validUserNames.push(JSON.parse(getUserGetOutput.stdout).userPrincipalName);
67
103
  }, (err) => {
68
104
  if (this.debug) {
69
105
  logger.logToStderr(err.stderr);
70
106
  }
107
+ invalidUserNames.push(singleUserName);
71
108
  });
72
109
  }))
73
110
  .then(() => {
74
- return Promise.resolve(activeUsernamelist);
111
+ if (invalidUserNames.length > 0) {
112
+ return Promise.reject(`Users not added to the group because the following users don't exist: ${invalidUserNames.join(', ')}`);
113
+ }
114
+ return Promise.resolve(validUserNames);
75
115
  });
76
116
  }
77
117
  getFormattedUserList(activeUserList) {
@@ -86,10 +126,16 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
86
126
  option: '-u, --webUrl <webUrl>'
87
127
  },
88
128
  {
89
- option: '--groupId <groupId>'
129
+ option: '--groupId [groupId]'
130
+ },
131
+ {
132
+ option: '--groupName [groupName]'
133
+ },
134
+ {
135
+ option: '--userName [userName]'
90
136
  },
91
137
  {
92
- option: '--userName <userName>'
138
+ option: '--email [email]'
93
139
  }
94
140
  ];
95
141
  const parentOptions = super.options();
@@ -100,8 +146,20 @@ class SpoGroupUserAddCommand extends SpoCommand_1.default {
100
146
  if (isValidSharePointUrl !== true) {
101
147
  return isValidSharePointUrl;
102
148
  }
103
- if (typeof args.options.groupId !== 'number') {
104
- return `Group Id : ${args.options.groupId} is not a number`;
149
+ if (!args.options.groupId && !args.options.groupName) {
150
+ return 'Specify either groupId or groupName';
151
+ }
152
+ if (args.options.groupId && args.options.groupName) {
153
+ return 'Specify either groupId or groupName but not both';
154
+ }
155
+ if (!args.options.userName && !args.options.email) {
156
+ return 'Specify either userName or email';
157
+ }
158
+ if (args.options.userName && args.options.email) {
159
+ return 'Specify either userName or email but not both';
160
+ }
161
+ if (args.options.groupId && isNaN(args.options.groupId)) {
162
+ return `Specified groupId ${args.options.groupId} is not a number`;
105
163
  }
106
164
  return true;
107
165
  }
@@ -0,0 +1,100 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const cli_1 = require("../../../../cli");
4
+ const request_1 = require("../../../../request");
5
+ const SpoCommand_1 = require("../../../base/SpoCommand");
6
+ const commands_1 = require("../../commands");
7
+ class SpoGroupUserRemoveCommand extends SpoCommand_1.default {
8
+ get name() {
9
+ return commands_1.default.GROUP_USER_REMOVE;
10
+ }
11
+ get description() {
12
+ return 'Removes the specified user from a SharePoint group';
13
+ }
14
+ getTelemetryProperties(args) {
15
+ const telemetryProps = super.getTelemetryProperties(args);
16
+ telemetryProps.groupId = (!(!args.options.groupId)).toString();
17
+ telemetryProps.groupName = (!(!args.options.groupName)).toString();
18
+ telemetryProps.confirm = (!(!args.options.confirm)).toString();
19
+ return telemetryProps;
20
+ }
21
+ commandAction(logger, args, cb) {
22
+ const removeUserfromSPGroup = () => {
23
+ if (this.verbose) {
24
+ logger.logToStderr(`Removing User with Username ${args.options.userName} from Group: ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
25
+ }
26
+ const loginName = `i:0#.f|membership|${args.options.userName}`;
27
+ const requestUrl = `${args.options.webUrl}/_api/web/sitegroups/${args.options.groupId
28
+ ? `GetById('${encodeURIComponent(args.options.groupId)}')`
29
+ : `GetByName('${encodeURIComponent(args.options.groupName)}')`}/users/removeByLoginName(@LoginName)?@LoginName='${encodeURIComponent(loginName)}'`;
30
+ const requestOptions = {
31
+ url: requestUrl,
32
+ headers: {
33
+ 'accept': 'application/json;odata=nometadata'
34
+ },
35
+ responseType: 'json'
36
+ };
37
+ request_1.default
38
+ .post(requestOptions)
39
+ .then(() => {
40
+ cb();
41
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
42
+ };
43
+ if (args.options.confirm) {
44
+ if (this.debug) {
45
+ logger.logToStderr('Confirmation bypassed by entering confirm option. Removing the user from SharePoint Group...');
46
+ }
47
+ removeUserfromSPGroup();
48
+ }
49
+ else {
50
+ cli_1.Cli.prompt({
51
+ type: 'confirm',
52
+ name: 'continue',
53
+ default: false,
54
+ message: `Are you sure you want to remove user User ${args.options.userName} from SharePoint group?`
55
+ }, (result) => {
56
+ if (!result.continue) {
57
+ cb();
58
+ }
59
+ else {
60
+ removeUserfromSPGroup();
61
+ }
62
+ });
63
+ }
64
+ }
65
+ options() {
66
+ const options = [
67
+ {
68
+ option: '-u, --webUrl <webUrl>'
69
+ },
70
+ {
71
+ option: '--groupId [groupId]'
72
+ },
73
+ {
74
+ option: '--groupName [groupName]'
75
+ },
76
+ {
77
+ option: '--userName <userName>'
78
+ },
79
+ {
80
+ option: '--confirm'
81
+ }
82
+ ];
83
+ const parentOptions = super.options();
84
+ return options.concat(parentOptions);
85
+ }
86
+ validate(args) {
87
+ if (args.options.groupId && args.options.groupName) {
88
+ return 'Use either "groupName" or "groupId", but not both';
89
+ }
90
+ if (!args.options.groupId && !args.options.groupName) {
91
+ return 'Either "groupName" or "groupId" is required';
92
+ }
93
+ if (args.options.groupId && isNaN(args.options.groupId)) {
94
+ return `Specified "groupId" ${args.options.groupId} is not valid`;
95
+ }
96
+ return SpoCommand_1.default.isValidSharePointUrl(args.options.webUrl);
97
+ }
98
+ }
99
+ module.exports = new SpoGroupUserRemoveCommand();
100
+ //# sourceMappingURL=group-user-remove.js.map
@@ -0,0 +1,76 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const request_1 = require("../../../../request");
4
+ const SpoCommand_1 = require("../../../base/SpoCommand");
5
+ const commands_1 = require("../../commands");
6
+ class SpoSiteRecycleBinItemListCommand extends SpoCommand_1.default {
7
+ get name() {
8
+ return commands_1.default.SITE_RECYCLEBINITEM_LIST;
9
+ }
10
+ get description() {
11
+ return 'Lists items from recycle bin';
12
+ }
13
+ defaultProperties() {
14
+ return ['Id', 'Title', 'DirName'];
15
+ }
16
+ commandAction(logger, args, cb) {
17
+ if (this.verbose) {
18
+ logger.logToStderr(`Retrieving all items from recycle bin at ${args.options.siteUrl}...`);
19
+ }
20
+ const state = args.options.secondary ? '2' : '1';
21
+ let requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin?$filter=(ItemState eq ${state})`;
22
+ if (typeof args.options.type !== 'undefined') {
23
+ const type = SpoSiteRecycleBinItemListCommand.recycleBinItemType.find(item => item.value === args.options.type);
24
+ if (typeof type !== 'undefined') {
25
+ requestUrl += ` and (ItemType eq ${type.id})`;
26
+ }
27
+ }
28
+ const requestOptions = {
29
+ url: requestUrl,
30
+ headers: {
31
+ 'accept': 'application/json;odata=nometadata'
32
+ },
33
+ responseType: 'json'
34
+ };
35
+ request_1.default
36
+ .get(requestOptions)
37
+ .then((response) => {
38
+ logger.log(response.value);
39
+ cb();
40
+ }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
41
+ }
42
+ options() {
43
+ const options = [
44
+ {
45
+ option: '-u, --siteUrl <siteUrl>'
46
+ },
47
+ {
48
+ option: '-t, --type [type]',
49
+ autocomplete: SpoSiteRecycleBinItemListCommand.recycleBinItemType.map(item => item.value)
50
+ },
51
+ {
52
+ option: '-s, --secondary'
53
+ }
54
+ ];
55
+ const parentOptions = super.options();
56
+ return options.concat(parentOptions);
57
+ }
58
+ validate(args) {
59
+ const isValidSharePointUrl = SpoCommand_1.default.isValidSharePointUrl(args.options.siteUrl);
60
+ if (isValidSharePointUrl !== true) {
61
+ return isValidSharePointUrl;
62
+ }
63
+ if (typeof args.options.type !== 'undefined' &&
64
+ !SpoSiteRecycleBinItemListCommand.recycleBinItemType.some(item => item.value === args.options.type)) {
65
+ return `${args.options.type} is not a valid value. Allowed values are ${SpoSiteRecycleBinItemListCommand.recycleBinItemType.map(item => item.value).join(', ')}`;
66
+ }
67
+ return true;
68
+ }
69
+ }
70
+ SpoSiteRecycleBinItemListCommand.recycleBinItemType = [
71
+ { id: 1, value: 'files' },
72
+ { id: 3, value: 'listItems' },
73
+ { id: 5, value: 'folders' }
74
+ ];
75
+ module.exports = new SpoSiteRecycleBinItemListCommand();
76
+ //# sourceMappingURL=site-recyclebinitem-list.js.map
@@ -64,6 +64,7 @@ exports.default = {
64
64
  GROUP_REMOVE: `${prefix} group remove`,
65
65
  GROUP_USER_ADD: `${prefix} group user add`,
66
66
  GROUP_USER_LIST: `${prefix} group user list`,
67
+ GROUP_USER_REMOVE: `${prefix} group user remove`,
67
68
  HIDEDEFAULTTHEMES_GET: `${prefix} hidedefaultthemes get`,
68
69
  HIDEDEFAULTTHEMES_SET: `${prefix} hidedefaultthemes set`,
69
70
  HOMESITE_GET: `${prefix} homesite get`,
@@ -183,6 +184,7 @@ exports.default = {
183
184
  SITE_GROUPIFY: `${prefix} site groupify`,
184
185
  SITE_LIST: `${prefix} site list`,
185
186
  SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
187
+ SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
186
188
  SITE_REMOVE: `${prefix} site remove`,
187
189
  SITE_RENAME: `${prefix} site rename`,
188
190
  SITE_SET: `${prefix} site set`,
@@ -1,7 +1,9 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const cli_1 = require("../../../../cli");
3
4
  const request_1 = require("../../../../request");
4
5
  const Utils_1 = require("../../../../Utils");
6
+ const AadUserGetCommand = require("../../../aad/commands/user/user-get");
5
7
  const GraphCommand_1 = require("../../../base/GraphCommand");
6
8
  const commands_1 = require("../../commands");
7
9
  class TeamsAppInstallCommand extends GraphCommand_1.default {
@@ -9,33 +11,70 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
9
11
  return commands_1.default.APP_INSTALL;
10
12
  }
11
13
  get description() {
12
- return 'Installs an app from the catalog to a Microsoft Teams team';
14
+ return 'Installs a Microsoft Teams team app from the catalog in the specified team or for the specified user';
13
15
  }
14
16
  commandAction(logger, args, cb) {
15
- const endpoint = `${this.resource}/v1.0`;
16
- const requestOptions = {
17
- url: `${endpoint}/teams/${args.options.teamId}/installedApps`,
18
- headers: {
19
- 'content-type': 'application/json;odata=nometadata',
20
- 'accept': 'application/json;odata.metadata=none'
21
- },
22
- responseType: 'json',
23
- data: {
24
- 'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
17
+ this
18
+ .validateUser(args, logger)
19
+ .then(_ => {
20
+ var _a;
21
+ let url = `${this.resource}/v1.0`;
22
+ if (args.options.teamId) {
23
+ url += `/teams/${encodeURIComponent(args.options.teamId)}/installedApps`;
25
24
  }
26
- };
27
- request_1.default
28
- .post(requestOptions)
25
+ else {
26
+ url += `/users/${encodeURIComponent(((_a = args.options.userId) !== null && _a !== void 0 ? _a : args.options.userName))}/teamwork/installedApps`;
27
+ }
28
+ const requestOptions = {
29
+ url: url,
30
+ headers: {
31
+ 'content-type': 'application/json;odata=nometadata',
32
+ 'accept': 'application/json;odata.metadata=none'
33
+ },
34
+ responseType: 'json',
35
+ data: {
36
+ 'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.appId}`
37
+ }
38
+ };
39
+ return request_1.default.post(requestOptions);
40
+ })
29
41
  .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
30
42
  }
43
+ // we need this method, because passing an invalid user ID to the API
44
+ // won't cause an error
45
+ validateUser(args, logger) {
46
+ if (!args.options.userId) {
47
+ return Promise.resolve(true);
48
+ }
49
+ if (this.verbose) {
50
+ logger.logToStderr(`Checking if user ${args.options.userId} exists...`);
51
+ }
52
+ const options = {
53
+ id: args.options.userId,
54
+ output: 'json',
55
+ debug: args.options.debug,
56
+ verbose: args.options.verbose
57
+ };
58
+ return cli_1.Cli
59
+ .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
60
+ .then((res) => {
61
+ if (this.verbose) {
62
+ logger.logToStderr(res.stderr);
63
+ }
64
+ return true;
65
+ }, (err) => {
66
+ if (this.verbose) {
67
+ logger.logToStderr(err.stderr);
68
+ }
69
+ return Promise.reject(`User with ID ${args.options.userId} not found. Original error: ${err.error.message}`);
70
+ });
71
+ }
31
72
  options() {
32
73
  const options = [
33
- {
34
- option: '--appId <appId>'
35
- },
36
- {
37
- option: '--teamId <teamId>'
38
- }
74
+ { option: '--appId <appId>' },
75
+ { option: '--teamId [teamId' },
76
+ { option: '--userId [userId]' },
77
+ { option: '--userName [userName]' }
39
78
  ];
40
79
  const parentOptions = super.options();
41
80
  return options.concat(parentOptions);
@@ -44,9 +83,24 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
44
83
  if (!Utils_1.default.isValidGuid(args.options.appId)) {
45
84
  return `${args.options.appId} is not a valid GUID`;
46
85
  }
47
- if (!Utils_1.default.isValidGuid(args.options.teamId)) {
86
+ if (!args.options.teamId &&
87
+ !args.options.userId &&
88
+ !args.options.userName) {
89
+ return `Specify either teamId, userId or userName`;
90
+ }
91
+ if ((args.options.teamId && args.options.userId) ||
92
+ (args.options.teamId && args.options.userName) ||
93
+ (args.options.userId && args.options.userName)) {
94
+ return `Specify either teamId, userId or userName but not multiple`;
95
+ }
96
+ if (args.options.teamId &&
97
+ !Utils_1.default.isValidGuid(args.options.teamId)) {
48
98
  return `${args.options.teamId} is not a valid GUID`;
49
99
  }
100
+ if (args.options.userId &&
101
+ !Utils_1.default.isValidGuid(args.options.userId)) {
102
+ return `${args.options.userId} is not a valid GUID`;
103
+ }
50
104
  return true;
51
105
  }
52
106
  }
@@ -25,24 +25,27 @@ class TeamsAppListCommand extends GraphItemsListCommand_1.GraphItemsListCommand
25
25
  if (args.options.teamId) {
26
26
  return Promise.resolve(args.options.teamId);
27
27
  }
28
- const teamRequestOptions = {
29
- url: `${this.resource}/v1.0/me/joinedTeams?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
28
+ const requestOptions = {
29
+ url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
30
30
  headers: {
31
31
  accept: 'application/json;odata.metadata=none'
32
32
  },
33
33
  responseType: 'json'
34
34
  };
35
35
  return request_1.default
36
- .get(teamRequestOptions)
36
+ .get(requestOptions)
37
37
  .then(response => {
38
- const teamItem = response.value[0];
39
- if (!teamItem) {
38
+ const groupItem = response.value[0];
39
+ if (!groupItem) {
40
+ return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
41
+ }
42
+ if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
40
43
  return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
41
44
  }
42
45
  if (response.value.length > 1) {
43
46
  return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
44
47
  }
45
- return Promise.resolve(teamItem.id);
48
+ return Promise.resolve(groupItem.id);
46
49
  });
47
50
  }
48
51
  getEndpointUrl(args) {
@@ -13,27 +13,63 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
13
13
  get description() {
14
14
  return 'Updates Teams app in the organization\'s app catalog';
15
15
  }
16
+ getTelemetryProperties(args) {
17
+ const telemetryProps = super.getTelemetryProperties(args);
18
+ telemetryProps.id = typeof args.options.id !== 'undefined';
19
+ telemetryProps.name = typeof args.options.name !== 'undefined';
20
+ return telemetryProps;
21
+ }
16
22
  commandAction(logger, args, cb) {
17
- const { id: appId, filePath } = args.options;
18
- const fullPath = path.resolve(filePath);
19
- if (this.verbose) {
20
- logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
23
+ const { filePath } = args.options;
24
+ this
25
+ .getAppId(args)
26
+ .then((appId) => {
27
+ const fullPath = path.resolve(filePath);
28
+ if (this.verbose) {
29
+ logger.logToStderr(`Updating app with id '${appId}' and file '${fullPath}' in the app catalog...`);
30
+ }
31
+ const requestOptions = {
32
+ url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
33
+ headers: {
34
+ "content-type": "application/zip"
35
+ },
36
+ data: fs.readFileSync(fullPath)
37
+ };
38
+ return request_1.default.put(requestOptions);
39
+ })
40
+ .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
41
+ }
42
+ getAppId(args) {
43
+ if (args.options.id) {
44
+ return Promise.resolve(args.options.id);
21
45
  }
22
46
  const requestOptions = {
23
- url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
47
+ url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
24
48
  headers: {
25
- "content-type": "application/zip"
49
+ accept: 'application/json;odata.metadata=none'
26
50
  },
27
- data: fs.readFileSync(fullPath)
51
+ responseType: 'json'
28
52
  };
29
- request_1.default
30
- .put(requestOptions)
31
- .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
53
+ return request_1.default
54
+ .get(requestOptions)
55
+ .then(response => {
56
+ const app = response.value[0];
57
+ if (!app) {
58
+ return Promise.reject(`The specified Teams app does not exist`);
59
+ }
60
+ if (response.value.length > 1) {
61
+ return Promise.reject(`Multiple Teams apps with name ${args.options.name} found. Please choose one of these ids: ${response.value.map(x => x.id).join(', ')}`);
62
+ }
63
+ return Promise.resolve(app.id);
64
+ });
32
65
  }
33
66
  options() {
34
67
  const options = [
35
68
  {
36
- option: '-i, --id <id>'
69
+ option: '-i, --id [id]'
70
+ },
71
+ {
72
+ option: '-n, --name [name]'
37
73
  },
38
74
  {
39
75
  option: '-p, --filePath <filePath>'
@@ -43,7 +79,13 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
43
79
  return options.concat(parentOptions);
44
80
  }
45
81
  validate(args) {
46
- if (!Utils_1.default.isValidGuid(args.options.id)) {
82
+ if (!args.options.id && !args.options.name) {
83
+ return 'Specify either id or name';
84
+ }
85
+ if (args.options.id && args.options.name) {
86
+ return 'Specify either id or name, but not both';
87
+ }
88
+ if (args.options.id && !Utils_1.default.isValidGuid(args.options.id)) {
47
89
  return `${args.options.id} is not a valid GUID`;
48
90
  }
49
91
  const fullPath = path.resolve(args.options.filePath);