@pnp/cli-microsoft365 5.5.0-beta.4e973d9 → 5.5.0-beta.8bd301f

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 (114) hide show
  1. package/dist/Auth.js +3 -3
  2. package/dist/Command.js +22 -0
  3. package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-restore.js +60 -9
  4. package/dist/m365/base/PowerAppsCommand.js +10 -0
  5. package/dist/m365/flow/commands/flow-export.js +3 -0
  6. package/dist/m365/pa/commands/app/app-get.js +3 -5
  7. package/dist/m365/pa/commands/app/app-list.js +10 -9
  8. package/dist/m365/pa/commands/app/app-remove.js +3 -3
  9. package/dist/m365/pa/commands/connector/connector-export.js +3 -3
  10. package/dist/m365/pa/commands/connector/connector-list.js +10 -9
  11. package/dist/m365/pa/commands/environment/environment-get.js +3 -3
  12. package/dist/m365/pa/commands/environment/environment-list.js +4 -4
  13. package/dist/m365/planner/commands/bucket/bucket-add.js +17 -9
  14. package/dist/m365/planner/commands/bucket/bucket-get.js +19 -11
  15. package/dist/m365/planner/commands/bucket/bucket-list.js +17 -9
  16. package/dist/m365/planner/commands/bucket/bucket-remove.js +19 -11
  17. package/dist/m365/planner/commands/bucket/bucket-set.js +19 -11
  18. package/dist/m365/planner/commands/plan/plan-add.js +98 -5
  19. package/dist/m365/planner/commands/plan/plan-get.js +58 -17
  20. package/dist/m365/planner/commands/plan/plan-remove.js +141 -0
  21. package/dist/m365/planner/commands/task/task-add.js +16 -16
  22. package/dist/m365/planner/commands/task/task-get.js +14 -9
  23. package/dist/m365/planner/commands/task/task-list.js +19 -11
  24. package/dist/m365/planner/commands/task/task-reference-add.js +1 -7
  25. package/dist/m365/planner/commands/task/task-reference-remove.js +11 -14
  26. package/dist/m365/planner/commands/task/task-remove.js +4 -19
  27. package/dist/m365/planner/commands/task/task-set.js +17 -23
  28. package/dist/m365/planner/commands/tenant/tenant-settings-set.js +95 -0
  29. package/dist/m365/planner/commands.js +3 -1
  30. package/dist/m365/search/commands/externalconnection/externalconnection-get.js +69 -0
  31. package/dist/m365/search/commands.js +1 -0
  32. package/dist/m365/spfx/commands/project/project-doctor/doctor-1.15.0.js +23 -0
  33. package/dist/m365/spfx/commands/project/project-doctor.js +2 -1
  34. package/dist/m365/spfx/commands/project/project-upgrade/rules/FN015008_FILE_eslintrc_js.js +7 -0
  35. package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.15.0.js +6 -4
  36. package/dist/m365/spfx/commands/spfx-doctor.js +15 -0
  37. package/dist/m365/spo/base-permissions.js +9 -0
  38. package/dist/m365/spo/commands/customaction/customaction-get.js +32 -4
  39. package/dist/m365/spo/commands/customaction/customaction-remove.js +43 -8
  40. package/dist/m365/spo/commands/field/field-get.js +14 -5
  41. package/dist/m365/spo/commands/field/field-remove.js +19 -10
  42. package/dist/m365/spo/commands/field/field-set.js +16 -9
  43. package/dist/m365/spo/commands/group/group-add.js +96 -0
  44. package/dist/m365/spo/commands/group/group-set.js +167 -0
  45. package/dist/m365/spo/commands/hubsite/hubsite-get.js +99 -13
  46. package/dist/m365/spo/commands/listitem/listitem-get.js +9 -9
  47. package/dist/m365/spo/commands/listitem/listitem-list.js +5 -1
  48. package/dist/m365/spo/commands/listitem/listitem-set.js +2 -2
  49. package/dist/m365/spo/commands/roledefinition/RoleDefinition.js +3 -0
  50. package/dist/m365/spo/commands/roledefinition/RoleType.js +16 -0
  51. package/dist/m365/spo/commands/roledefinition/roledefinition-get.js +59 -0
  52. package/dist/m365/spo/commands/site/site-classic-list.js +1 -0
  53. package/dist/m365/spo/commands/site/site-classic-set.js +1 -0
  54. package/dist/m365/spo/commands/site/site-list.js +59 -17
  55. package/dist/m365/spo/commands/site/site-set.js +322 -162
  56. package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js +9 -6
  57. package/dist/m365/spo/commands.js +3 -0
  58. package/dist/m365/teams/commands/cache/cache-remove.js +155 -0
  59. package/dist/m365/teams/commands/tab/tab-get.js +2 -2
  60. package/dist/m365/teams/commands/team/team-archive.js +51 -15
  61. package/dist/m365/teams/commands/team/team-clone.js +33 -7
  62. package/dist/m365/teams/commands/team/team-remove.js +47 -11
  63. package/dist/m365/teams/commands/team/team-set.js +25 -5
  64. package/dist/m365/teams/commands/team/team-unarchive.js +48 -12
  65. package/dist/m365/teams/commands.js +1 -0
  66. package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js +1 -9
  67. package/dist/utils/accessToken.js +18 -0
  68. package/dist/utils/planner.js +9 -8
  69. package/dist/utils/validation.js +5 -1
  70. package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-restore.md +21 -3
  71. package/docs/docs/cmd/aad/user/user-get.md +12 -0
  72. package/docs/docs/cmd/planner/bucket/bucket-add.md +9 -6
  73. package/docs/docs/cmd/planner/bucket/bucket-get.md +10 -7
  74. package/docs/docs/cmd/planner/bucket/bucket-list.md +8 -5
  75. package/docs/docs/cmd/planner/bucket/bucket-remove.md +8 -5
  76. package/docs/docs/cmd/planner/bucket/bucket-set.md +9 -6
  77. package/docs/docs/cmd/planner/plan/plan-add.md +18 -2
  78. package/docs/docs/cmd/planner/plan/plan-get.md +14 -2
  79. package/docs/docs/cmd/planner/plan/plan-remove.md +48 -0
  80. package/docs/docs/cmd/planner/task/task-add.md +11 -8
  81. package/docs/docs/cmd/planner/task/task-get.md +17 -8
  82. package/docs/docs/cmd/planner/task/task-list.md +9 -6
  83. package/docs/docs/cmd/planner/task/task-set.md +9 -6
  84. package/docs/docs/cmd/planner/tenant/tenant-settings-set.md +56 -0
  85. package/docs/docs/cmd/search/externalconnection/externalconnection-get.md +33 -0
  86. package/docs/docs/cmd/spo/customaction/customaction-get.md +15 -2
  87. package/docs/docs/cmd/spo/customaction/customaction-remove.md +33 -2
  88. package/docs/docs/cmd/spo/field/field-get.md +6 -3
  89. package/docs/docs/cmd/spo/field/field-remove.md +9 -6
  90. package/docs/docs/cmd/spo/field/field-set.md +7 -4
  91. package/docs/docs/cmd/spo/group/group-add.md +51 -0
  92. package/docs/docs/cmd/spo/group/group-set.md +69 -0
  93. package/docs/docs/cmd/spo/hubsite/hubsite-get.md +39 -7
  94. package/docs/docs/cmd/spo/listitem/listitem-get.md +11 -2
  95. package/docs/docs/cmd/spo/listitem/listitem-list.md +8 -0
  96. package/docs/docs/cmd/spo/roledefinition/roledefinition-get.md +27 -0
  97. package/docs/docs/cmd/spo/site/site-classic-list.md +3 -0
  98. package/docs/docs/cmd/spo/site/site-classic-set.md +3 -0
  99. package/docs/docs/cmd/spo/site/site-list.md +19 -7
  100. package/docs/docs/cmd/spo/site/site-set.md +50 -6
  101. package/docs/docs/cmd/teams/cache/cache-remove.md +46 -0
  102. package/docs/docs/cmd/teams/tab/tab-get.md +2 -2
  103. package/docs/docs/cmd/teams/team/team-archive.md +20 -5
  104. package/docs/docs/cmd/teams/team/team-clone.md +11 -5
  105. package/docs/docs/cmd/teams/team/team-remove.md +19 -5
  106. package/docs/docs/cmd/teams/team/team-set.md +10 -4
  107. package/docs/docs/cmd/teams/team/team-unarchive.md +18 -4
  108. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-health-get.md +1 -1
  109. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-healthissue-list.md +1 -1
  110. package/docs/docs/cmd/tenant/serviceannouncement/serviceannouncement-message-list.md +1 -1
  111. package/npm-shrinkwrap.json +173 -158
  112. package/package.json +13 -13
  113. package/dist/m365/planner/commands/plan/plan-details-get.js +0 -116
  114. package/docs/docs/cmd/planner/plan/plan-details-get.md +0 -45
@@ -21,12 +21,17 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
21
21
  telemetryProps.name = typeof args.options.name !== 'undefined';
22
22
  telemetryProps.planId = typeof args.options.planId !== 'undefined';
23
23
  telemetryProps.planName = typeof args.options.planName !== 'undefined';
24
+ telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
24
25
  telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
25
26
  telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
26
27
  telemetryProps.confirm = args.options.confirm || false;
27
28
  return telemetryProps;
28
29
  }
29
30
  commandAction(logger, args, cb) {
31
+ if (args.options.planName) {
32
+ args.options.planTitle = args.options.planName;
33
+ this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
34
+ }
30
35
  if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
31
36
  this.handleError('This command does not support application permissions.', logger, cb);
32
37
  return;
@@ -101,13 +106,13 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
101
106
  });
102
107
  }
103
108
  getPlanId(args) {
104
- const { planId, planName } = args.options;
109
+ const { planId, planTitle } = args.options;
105
110
  if (planId) {
106
111
  return Promise.resolve(planId);
107
112
  }
108
113
  return this
109
114
  .getGroupId(args)
110
- .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
115
+ .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
111
116
  .then(plan => plan.id);
112
117
  }
113
118
  getGroupId(args) {
@@ -133,6 +138,9 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
133
138
  {
134
139
  option: '--planName [planName]'
135
140
  },
141
+ {
142
+ option: "--planTitle [planTitle]"
143
+ },
136
144
  {
137
145
  option: '--ownerGroupId [ownerGroupId]'
138
146
  },
@@ -153,23 +161,23 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
153
161
  }
154
162
  validate(args) {
155
163
  if (args.options.id) {
156
- if (args.options.planId || args.options.planName || args.options.ownerGroupId || args.options.ownerGroupName) {
157
- return 'Don\'t specify planId, planName, ownerGroupId or ownerGroupName when using id';
164
+ if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
165
+ return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
158
166
  }
159
167
  }
160
168
  else {
161
- if (!args.options.planId && !args.options.planName) {
162
- return 'Specify either planId or planName when using name';
169
+ if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
170
+ return 'Specify either planId or planTitle when using name';
163
171
  }
164
- if (args.options.planId && args.options.planName) {
165
- return 'Specify either planId or planName when using name but not both';
172
+ if (args.options.planId && (args.options.planName || args.options.planTitle)) {
173
+ return 'Specify either planId or planTitle when using name but not both';
166
174
  }
167
- if (args.options.planName) {
175
+ if (args.options.planName || args.options.planTitle) {
168
176
  if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
169
- return 'Specify either ownerGroupId or ownerGroupName when using planName';
177
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
170
178
  }
171
179
  if (args.options.ownerGroupId && args.options.ownerGroupName) {
172
- return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
180
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
173
181
  }
174
182
  if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
175
183
  return `${args.options.ownerGroupId} is not a valid GUID`;
@@ -20,6 +20,7 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
20
20
  telemetryProps.name = typeof args.options.name !== 'undefined';
21
21
  telemetryProps.planId = typeof args.options.planId !== 'undefined';
22
22
  telemetryProps.planName = typeof args.options.planName !== 'undefined';
23
+ telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
23
24
  telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
24
25
  telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
25
26
  telemetryProps.newName = typeof args.options.newName !== 'undefined';
@@ -27,6 +28,10 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
27
28
  return telemetryProps;
28
29
  }
29
30
  commandAction(logger, args, cb) {
31
+ if (args.options.planName) {
32
+ args.options.planTitle = args.options.planName;
33
+ this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
34
+ }
30
35
  if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
31
36
  this.handleError('This command does not support application permissions.', logger, cb);
32
37
  return;
@@ -89,13 +94,13 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
89
94
  });
90
95
  }
91
96
  getPlanId(args) {
92
- const { planId, planName } = args.options;
97
+ const { planId, planTitle } = args.options;
93
98
  if (planId) {
94
99
  return Promise.resolve(planId);
95
100
  }
96
101
  return this
97
102
  .getGroupId(args)
98
- .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
103
+ .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
99
104
  .then(plan => plan.id);
100
105
  }
101
106
  getGroupId(args) {
@@ -121,6 +126,9 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
121
126
  {
122
127
  option: '--planName [planName]'
123
128
  },
129
+ {
130
+ option: "--planTitle [planTitle]"
131
+ },
124
132
  {
125
133
  option: '--ownerGroupId [ownerGroupId]'
126
134
  },
@@ -144,23 +152,23 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
144
152
  }
145
153
  validate(args) {
146
154
  if (args.options.id) {
147
- if (args.options.planId || args.options.planName || args.options.ownerGroupId || args.options.ownerGroupName) {
148
- return 'Don\'t specify planId, planName, ownerGroupId or ownerGroupName when using id';
155
+ if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
156
+ return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
149
157
  }
150
158
  }
151
159
  if (args.options.name) {
152
- if (!args.options.planId && !args.options.planName) {
153
- return 'Specify either planId or planName when using name';
160
+ if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
161
+ return 'Specify either planId or planTitle when using name';
154
162
  }
155
- if (args.options.planId && args.options.planName) {
156
- return 'Specify either planId or planName when using name but not both';
163
+ if (args.options.planId && (args.options.planName || args.options.planTitle)) {
164
+ return 'Specify either planId or planTitle when using name but not both';
157
165
  }
158
- if (args.options.planName) {
166
+ if (args.options.planName || args.options.planTitle) {
159
167
  if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
160
- return 'Specify either ownerGroupId or ownerGroupName when using planName';
168
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
161
169
  }
162
170
  if (args.options.ownerGroupId && args.options.ownerGroupName) {
163
- return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
171
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
164
172
  }
165
173
  if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
166
174
  return `${args.options.ownerGroupId} is not a valid GUID`;
@@ -1,11 +1,10 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const utils_1 = require("../../../../utils");
4
3
  const Auth_1 = require("../../../../Auth");
5
4
  const request_1 = require("../../../../request");
5
+ const utils_1 = require("../../../../utils");
6
6
  const GraphCommand_1 = require("../../../base/GraphCommand");
7
7
  const commands_1 = require("../../commands");
8
- const aadGroup_1 = require("../../../../utils/aadGroup");
9
8
  class PlannerPlanAddCommand extends GraphCommand_1.default {
10
9
  get name() {
11
10
  return commands_1.default.PLAN_ADD;
@@ -17,6 +16,8 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
17
16
  const telemetryProps = super.getTelemetryProperties(args);
18
17
  telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
19
18
  telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
19
+ telemetryProps.shareWithUserIds = typeof args.options.shareWithUserIds !== 'undefined';
20
+ telemetryProps.shareWithUserNames = typeof args.options.shareWithUserNames !== 'undefined';
20
21
  return telemetryProps;
21
22
  }
22
23
  defaultProperties() {
@@ -43,16 +44,96 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
43
44
  };
44
45
  return request_1.default.post(requestOptions);
45
46
  })
47
+ .then(newPlan => this.updatePlanDetails(args.options, newPlan))
46
48
  .then((res) => {
47
49
  logger.log(res);
48
50
  cb();
49
51
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
50
52
  }
53
+ updatePlanDetails(options, newPlan) {
54
+ const planId = newPlan.id;
55
+ if (!options.shareWithUserIds && !options.shareWithUserNames) {
56
+ return Promise.resolve(newPlan);
57
+ }
58
+ return Promise
59
+ .all([this.generateSharedWith(options), this.getPlanDetailsEtag(planId)])
60
+ .then(resArray => {
61
+ const sharedWith = resArray[0];
62
+ const etag = resArray[1];
63
+ const requestOptionsPlanDetails = {
64
+ url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
65
+ headers: {
66
+ 'accept': 'application/json;odata.metadata=none',
67
+ 'If-Match': etag,
68
+ 'Prefer': 'return=representation'
69
+ },
70
+ responseType: 'json',
71
+ data: {
72
+ sharedWith: sharedWith
73
+ }
74
+ };
75
+ return request_1.default.patch(requestOptionsPlanDetails);
76
+ })
77
+ .then(planDetails => {
78
+ return Object.assign(Object.assign({}, newPlan), planDetails);
79
+ });
80
+ }
81
+ getPlanDetailsEtag(planId) {
82
+ const requestOptions = {
83
+ url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
84
+ headers: {
85
+ accept: 'application/json'
86
+ },
87
+ responseType: 'json'
88
+ };
89
+ return request_1.default
90
+ .get(requestOptions)
91
+ .then((response) => response['@odata.etag']);
92
+ }
93
+ generateSharedWith(options) {
94
+ const sharedWith = {};
95
+ return this
96
+ .getUserIds(options)
97
+ .then((userIds) => {
98
+ userIds.map(x => sharedWith[x] = true);
99
+ return Promise.resolve(sharedWith);
100
+ });
101
+ }
102
+ getUserIds(options) {
103
+ if (options.shareWithUserIds) {
104
+ return Promise.resolve(options.shareWithUserIds.split(','));
105
+ }
106
+ // Hitting this section means assignedToUserNames won't be undefined
107
+ const userNames = options.shareWithUserNames;
108
+ const userArr = userNames.split(',').map(o => o.trim());
109
+ const promises = userArr.map(user => {
110
+ const requestOptions = {
111
+ url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
112
+ headers: {
113
+ 'content-type': 'application/json'
114
+ },
115
+ responseType: 'json'
116
+ };
117
+ return request_1.default.get(requestOptions);
118
+ });
119
+ return Promise
120
+ .all(promises)
121
+ .then((usersRes) => {
122
+ const userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
123
+ const userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
124
+ // Find the members where no graph response was found
125
+ const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
126
+ if (invalidUsers && invalidUsers.length > 0) {
127
+ return Promise.reject(`Cannot proceed with planner plan creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
128
+ }
129
+ return Promise.resolve(userIds);
130
+ });
131
+ }
51
132
  getGroupId(args) {
52
133
  if (args.options.ownerGroupId) {
53
134
  return Promise.resolve(args.options.ownerGroupId);
54
135
  }
55
- return aadGroup_1.aadGroup
136
+ return utils_1.aadGroup
56
137
  .getGroupByDisplayName(args.options.ownerGroupName)
57
138
  .then(group => group.id);
58
139
  }
@@ -62,10 +143,16 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
62
143
  option: '-t, --title <title>'
63
144
  },
64
145
  {
65
- option: "--ownerGroupId [ownerGroupId]"
146
+ option: '--ownerGroupId [ownerGroupId]'
66
147
  },
67
148
  {
68
- option: "--ownerGroupName [ownerGroupName]"
149
+ option: '--ownerGroupName [ownerGroupName]'
150
+ },
151
+ {
152
+ option: '--shareWithUserIds [shareWithUserIds]'
153
+ },
154
+ {
155
+ option: '--shareWithUserNames [shareWithUserNames]'
69
156
  }
70
157
  ];
71
158
  const parentOptions = super.options();
@@ -81,6 +168,12 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
81
168
  if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
82
169
  return `${args.options.ownerGroupId} is not a valid GUID`;
83
170
  }
171
+ if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
172
+ return 'Specify either shareWithUserIds or shareWithUserNames but not both';
173
+ }
174
+ if (args.options.shareWithUserIds && !utils_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
175
+ return 'shareWithUserIds contains invalid GUID';
176
+ }
84
177
  return true;
85
178
  }
86
179
  }
@@ -6,15 +6,21 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
6
6
  const commands_1 = require("../../commands");
7
7
  const Auth_1 = require("../../../../Auth");
8
8
  const aadGroup_1 = require("../../../../utils/aadGroup");
9
+ const request_1 = require("../../../../request");
9
10
  class PlannerPlanGetCommand extends GraphCommand_1.default {
10
11
  get name() {
11
12
  return commands_1.default.PLAN_GET;
12
13
  }
14
+ alias() {
15
+ return [commands_1.default.PLAN_DETAILS_GET];
16
+ }
13
17
  get description() {
14
18
  return 'Get a Microsoft Planner plan';
15
19
  }
16
20
  getTelemetryProperties(args) {
17
21
  const telemetryProps = super.getTelemetryProperties(args);
22
+ telemetryProps.planId = typeof args.options.planId !== 'undefined';
23
+ telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
18
24
  telemetryProps.id = typeof args.options.id !== 'undefined';
19
25
  telemetryProps.title = typeof args.options.title !== 'undefined';
20
26
  telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
@@ -25,13 +31,21 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
25
31
  return ['id', 'title', 'createdDateTime', 'owner', '@odata.etag'];
26
32
  }
27
33
  commandAction(logger, args, cb) {
34
+ this.showDeprecationWarning(logger, commands_1.default.PLAN_DETAILS_GET, commands_1.default.PLAN_GET);
28
35
  if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
29
36
  this.handleError('This command does not support application permissions.', logger, cb);
30
37
  return;
31
38
  }
39
+ if (args.options.planId) {
40
+ args.options.id = args.options.planId;
41
+ }
42
+ if (args.options.planTitle) {
43
+ args.options.title = args.options.planTitle;
44
+ }
32
45
  if (args.options.id) {
33
46
  planner_1.planner
34
47
  .getPlanById(args.options.id)
48
+ .then(plan => this.getPlanDetails(plan))
35
49
  .then((res) => {
36
50
  logger.log(res);
37
51
  cb();
@@ -40,15 +54,31 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
40
54
  else {
41
55
  this
42
56
  .getGroupId(args)
43
- .then(groupId => planner_1.planner.getPlanByName(args.options.title, groupId))
44
- .then((plan) => {
45
- if (plan) {
46
- logger.log(plan);
57
+ .then(groupId => planner_1.planner.getPlanByTitle(args.options.title, groupId))
58
+ .then(plan => this.getPlanDetails(plan))
59
+ .then((res) => {
60
+ if (res) {
61
+ logger.log(res);
47
62
  }
48
63
  cb();
49
64
  }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
50
65
  }
51
66
  }
67
+ getPlanDetails(plan) {
68
+ const requestOptionsTaskDetails = {
69
+ url: `${this.resource}/v1.0/planner/plans/${plan.id}/details`,
70
+ headers: {
71
+ 'accept': 'application/json;odata.metadata=none',
72
+ 'Prefer': 'return=representation'
73
+ },
74
+ responseType: 'json'
75
+ };
76
+ return request_1.default
77
+ .get(requestOptionsTaskDetails)
78
+ .then(planDetails => {
79
+ return Object.assign(Object.assign({}, plan), planDetails);
80
+ });
81
+ }
52
82
  getGroupId(args) {
53
83
  if (args.options.ownerGroupId) {
54
84
  return Promise.resolve(args.options.ownerGroupId);
@@ -59,6 +89,12 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
59
89
  }
60
90
  options() {
61
91
  const options = [
92
+ {
93
+ option: '--planId [planId]'
94
+ },
95
+ {
96
+ option: '--planTitle [planTitle]'
97
+ },
62
98
  {
63
99
  option: '-i, --id [id]'
64
100
  },
@@ -76,20 +112,25 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
76
112
  return options.concat(parentOptions);
77
113
  }
78
114
  validate(args) {
79
- if (!args.options.id && !args.options.title) {
80
- return 'Specify either id or title';
81
- }
82
- if (args.options.id && args.options.title) {
83
- return 'Specify either id or title';
84
- }
85
- if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
86
- return 'Specify either ownerGroupId or ownerGroupName';
87
- }
88
- if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
89
- return 'Specify either ownerGroupId or ownerGroupName but not both';
115
+ if (args.options.planId && args.options.planTitle ||
116
+ args.options.id && args.options.title ||
117
+ args.options.planId && args.options.title ||
118
+ args.options.id && args.options.planTitle) {
119
+ return 'Specify either id or title but not both';
90
120
  }
91
- if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
92
- return `${args.options.ownerGroupId} is not a valid GUID`;
121
+ if (!args.options.planId && !args.options.id) {
122
+ if (!args.options.planTitle && !args.options.title) {
123
+ return 'Specify either id or title';
124
+ }
125
+ if ((args.options.title || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
126
+ return 'Specify either ownerGroupId or ownerGroupName';
127
+ }
128
+ if ((args.options.title || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
129
+ return 'Specify either ownerGroupId or ownerGroupName but not both';
130
+ }
131
+ if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
132
+ return `${args.options.ownerGroupId} is not a valid GUID`;
133
+ }
93
134
  }
94
135
  return true;
95
136
  }
@@ -0,0 +1,141 @@
1
+ "use strict";
2
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
+ return new (P || (P = Promise))(function (resolve, reject) {
5
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
9
+ });
10
+ };
11
+ Object.defineProperty(exports, "__esModule", { value: true });
12
+ const Auth_1 = require("../../../../Auth");
13
+ const cli_1 = require("../../../../cli");
14
+ const request_1 = require("../../../../request");
15
+ const utils_1 = require("../../../../utils");
16
+ const aadGroup_1 = require("../../../../utils/aadGroup");
17
+ const planner_1 = require("../../../../utils/planner");
18
+ const GraphCommand_1 = require("../../../base/GraphCommand");
19
+ const commands_1 = require("../../commands");
20
+ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
21
+ get name() {
22
+ return commands_1.default.PLAN_REMOVE;
23
+ }
24
+ get description() {
25
+ return 'Removes the Microsoft Planner plan';
26
+ }
27
+ getTelemetryProperties(args) {
28
+ const telemetryProps = super.getTelemetryProperties(args);
29
+ telemetryProps.id = typeof args.options.id !== 'undefined';
30
+ telemetryProps.title = typeof args.options.title !== 'undefined';
31
+ telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
32
+ telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
33
+ telemetryProps.confirm = !!args.options.confirm;
34
+ return telemetryProps;
35
+ }
36
+ commandAction(logger, args, cb) {
37
+ if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
38
+ this.handleError('This command does not support application permissions.', logger, cb);
39
+ return;
40
+ }
41
+ const removePlan = () => __awaiter(this, void 0, void 0, function* () {
42
+ try {
43
+ const plan = yield this.getPlan(args);
44
+ const requestOptions = {
45
+ url: `${this.resource}/v1.0/planner/plans/${plan.id}`,
46
+ headers: {
47
+ accept: 'application/json;odata.metadata=none',
48
+ 'if-match': plan['@odata.etag']
49
+ },
50
+ responseType: 'json'
51
+ };
52
+ yield request_1.default.delete(requestOptions);
53
+ cb();
54
+ }
55
+ catch (err) {
56
+ this.handleRejectedODataJsonPromise(err, logger, cb);
57
+ }
58
+ });
59
+ if (args.options.confirm) {
60
+ removePlan();
61
+ }
62
+ else {
63
+ cli_1.Cli.prompt({
64
+ type: 'confirm',
65
+ name: 'continue',
66
+ default: false,
67
+ message: `Are you sure you want to remove the plan ${args.options.id || args.options.title}?`
68
+ }, (result) => {
69
+ if (!result.continue) {
70
+ cb();
71
+ }
72
+ else {
73
+ removePlan();
74
+ }
75
+ });
76
+ }
77
+ }
78
+ getPlan(args) {
79
+ return __awaiter(this, void 0, void 0, function* () {
80
+ const { id, title } = args.options;
81
+ if (id) {
82
+ return planner_1.planner.getPlanById(id, 'minimal');
83
+ }
84
+ const groupId = yield this.getGroupId(args);
85
+ return yield planner_1.planner.getPlanByTitle(title, groupId);
86
+ });
87
+ }
88
+ getGroupId(args) {
89
+ return __awaiter(this, void 0, void 0, function* () {
90
+ const { ownerGroupId, ownerGroupName } = args.options;
91
+ if (ownerGroupId) {
92
+ return ownerGroupId;
93
+ }
94
+ const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
95
+ return group.id;
96
+ });
97
+ }
98
+ optionSets() {
99
+ return [['id', 'title']];
100
+ }
101
+ options() {
102
+ const options = [
103
+ {
104
+ option: '-i, --id [id]'
105
+ },
106
+ {
107
+ option: '-t, --title [title]'
108
+ },
109
+ {
110
+ option: '--ownerGroupId [ownerGroupId]'
111
+ },
112
+ {
113
+ option: '--ownerGroupName [ownerGroupName]'
114
+ },
115
+ {
116
+ option: '--confirm'
117
+ }
118
+ ];
119
+ const parentOptions = super.options();
120
+ return options.concat(parentOptions);
121
+ }
122
+ validate(args) {
123
+ if (args.options.title) {
124
+ if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
125
+ return 'Specify either ownerGroupId or ownerGroupName';
126
+ }
127
+ if (args.options.ownerGroupId && args.options.ownerGroupName) {
128
+ return 'Specify either ownerGroupId or ownerGroupName but not both';
129
+ }
130
+ if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
131
+ return `${args.options.ownerGroupId} is not a valid GUID`;
132
+ }
133
+ }
134
+ else if (args.options.ownerGroupId || args.options.ownerGroupName) {
135
+ return 'Don\'t specify ownerGroupId or ownerGroupName when using id';
136
+ }
137
+ return true;
138
+ }
139
+ }
140
+ module.exports = new PlannerPlanRemoveCommand();
141
+ //# sourceMappingURL=plan-remove.js.map
@@ -24,6 +24,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
24
24
  const telemetryProps = super.getTelemetryProperties(args);
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';
@@ -42,6 +43,10 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
42
43
  return telemetryProps;
43
44
  }
44
45
  commandAction(logger, args, cb) {
46
+ if (args.options.planName) {
47
+ args.options.planTitle = args.options.planName;
48
+ this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
49
+ }
45
50
  if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
46
51
  this.handleError('This command does not support application permissions.', logger, cb);
47
52
  return;
@@ -96,13 +101,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
96
101
  };
97
102
  return request_1.default
98
103
  .get(requestOptions)
99
- .then((response) => {
100
- const etag = response ? response['@odata.etag'] : undefined;
101
- if (!etag) {
102
- return Promise.reject(`Error fetching task details`);
103
- }
104
- return Promise.resolve(etag);
105
- });
104
+ .then((response) => response['@odata.etag']);
106
105
  }
107
106
  generateAppliedCategories(options) {
108
107
  if (!options.appliedCategories) {
@@ -181,7 +180,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
181
180
  }
182
181
  return this
183
182
  .getGroupId(args)
184
- .then((groupId) => planner_1.planner.getPlanByName(args.options.planName, groupId))
183
+ .then((groupId) => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
185
184
  .then(plan => plan.id);
186
185
  }
187
186
  getGroupId(args) {
@@ -229,6 +228,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
229
228
  { option: '-t, --title <title>' },
230
229
  { option: '--planId [planId]' },
231
230
  { option: '--planName [planName]' },
231
+ { option: '--planTitle [planTitle]' },
232
232
  { option: '--ownerGroupId [ownerGroupId]' },
233
233
  { option: '--ownerGroupName [ownerGroupName]' },
234
234
  { option: '--bucketId [bucketId]' },
@@ -255,17 +255,17 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
255
255
  return options.concat(parentOptions);
256
256
  }
257
257
  validate(args) {
258
- if (!args.options.planId && !args.options.planName) {
259
- return 'Specify either planId or planName';
258
+ if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
259
+ return 'Specify either planId or planTitle';
260
260
  }
261
- if (args.options.planId && args.options.planName) {
262
- return 'Specify either planId or planName but not both';
261
+ if (args.options.planId && (args.options.planName || args.options.planTitle)) {
262
+ return 'Specify either planId or planTitle but not both';
263
263
  }
264
- if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
265
- return 'Specify either ownerGroupId or ownerGroupName when using planName';
264
+ if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
265
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
266
266
  }
267
- if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
268
- return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
267
+ if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
268
+ return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
269
269
  }
270
270
  if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
271
271
  return `${args.options.ownerGroupId} is not a valid GUID`;