@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.d8f63d2

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -49,13 +49,12 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         });
     }
     getBucketId(args) {
-        const { id, name } = args.options;
-        if (id) {
-            return Promise.resolve(id);
-        }
-        return this
-            .getPlanId(args)
-            .then((planId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, name } = args.options;
+            if (id) {
+                return id;
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -63,28 +62,27 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(buckets => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => name.toLowerCase() === b.name.toLowerCase());
             if (!filteredBuckets.length) {
-                return Promise.reject(`The specified bucket ${name} does not exist`);
+                throw `The specified bucket ${name} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`);
+                throw `Multiple buckets with name ${name} found: ${filteredBuckets.map(x => x.id)}`;
             }
-            return Promise.resolve(filteredBuckets[0].id.toString());
+            return filteredBuckets[0].id.toString();
         });
     }
     getPlanId(args) {
-        const { planId, planTitle } = args.options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = args.options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getBucketById(id) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -99,13 +97,14 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         });
     }
     getGroupId(args) {
-        const { ownerGroupId, ownerGroupName } = args.options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_initTelemetry = function _PlannerBucketGetCommand_initTelemetry() {

package/dist/m365/planner/commands/bucket/bucket-list.js

@@ -52,21 +52,23 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         });
     }
     getPlanId(args) {
-        if (args.options.planId) {
-            return Promise.resolve(args.options.planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.planId) {
+                return args.options.planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_initTelemetry = function _PlannerBucketListCommand_initTelemetry() {

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -73,19 +73,18 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         });
     }
     getBucket(args) {
-        if (args.options.id) {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }
-        return this
-            .getPlanId(args)
-            .then(planId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return yield request_1.default.get(requestOptions);
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -93,37 +92,37 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(buckets => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => args.options.name.toLowerCase() === b.name.toLowerCase());
             if (!filteredBuckets.length) {
-                return Promise.reject(`The specified bucket ${args.options.name} does not exist`);
+                throw `The specified bucket ${args.options.name} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`);
+                throw `Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`;
             }
-            return Promise.resolve(filteredBuckets[0]);
+            return filteredBuckets[0];
         });
     }
     getPlanId(args) {
-        const { planId, planTitle } = args.options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = args.options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(args) {
-        const { ownerGroupId, ownerGroupName } = args.options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveCommand_initTelemetry = function _PlannerBucketRemoveCommand_initTelemetry() {

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -64,19 +64,18 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         });
     }
     getBucket(args) {
-        if (args.options.id) {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
-                headers: {
-                    accept: 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        }
-        return this
-            .getPlanId(args)
-            .then(planId => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return yield request_1.default.get(requestOptions);
+            }
+            const planId = yield this.getPlanId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
                 headers: {
@@ -84,37 +83,37 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(buckets => {
+            const buckets = yield request_1.default.get(requestOptions);
             const filteredBuckets = buckets.value.filter(b => args.options.name.toLowerCase() === b.name.toLowerCase());
             if (!filteredBuckets.length) {
-                return Promise.reject(`The specified bucket ${args.options.name} does not exist`);
+                throw `The specified bucket ${args.options.name} does not exist`;
             }
             if (filteredBuckets.length > 1) {
-                return Promise.reject(`Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`);
+                throw `Multiple buckets with name ${args.options.name} found: ${filteredBuckets.map(x => x.id)}`;
             }
-            return Promise.resolve(filteredBuckets[0]);
+            return filteredBuckets[0];
         });
     }
     getPlanId(args) {
-        const { planId, planTitle } = args.options;
-        if (planId) {
-            return Promise.resolve(planId);
-        }
-        return this
-            .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
-            .then(plan => plan.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { planId, planTitle } = args.options;
+            if (planId) {
+                return planId;
+            }
+            const groupId = yield this.getGroupId(args);
+            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+            return plan.id;
+        });
     }
     getGroupId(args) {
-        const { ownerGroupId, ownerGroupName } = args.options;
-        if (ownerGroupId) {
-            return Promise.resolve(ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            const { ownerGroupId, ownerGroupName } = args.options;
+            if (ownerGroupId) {
+                return ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_initTelemetry = function _PlannerBucketSetCommand_initTelemetry() {

package/dist/m365/planner/commands/plan/plan-add.js

@@ -76,13 +76,12 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         });
     }
     updatePlanDetails(options, newPlan) {
-        const planId = newPlan.id;
-        if (!options.shareWithUserIds && !options.shareWithUserNames) {
-            return Promise.resolve(newPlan);
-        }
-        return Promise
-            .all([this.generateSharedWith(options), this.getPlanDetailsEtag(planId)])
-            .then(resArray => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const planId = newPlan.id;
+            if (!options.shareWithUserIds && !options.shareWithUserNames) {
+                return newPlan;
+            }
+            const resArray = yield Promise.all([this.generateSharedWith(options), this.getPlanDetailsEtag(planId)]);
             const sharedWith = resArray[0];
             const etag = resArray[1];
             const requestOptionsPlanDetails = {
@@ -97,70 +96,68 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
                     sharedWith: sharedWith
                 }
             };
-            return request_1.default.patch(requestOptionsPlanDetails);
-        })
-            .then(planDetails => {
+            const planDetails = yield request_1.default.patch(requestOptionsPlanDetails);
             return Object.assign(Object.assign({}, newPlan), planDetails);
         });
     }
     getPlanDetailsEtag(planId) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => response['@odata.etag']);
-    }
-    generateSharedWith(options) {
-        const sharedWith = {};
-        return this
-            .getUserIds(options)
-            .then((userIds) => {
-            userIds.map(x => sharedWith[x] = true);
-            return Promise.resolve(sharedWith);
-        });
-    }
-    getUserIds(options) {
-        if (options.shareWithUserIds) {
-            return Promise.resolve(options.shareWithUserIds.split(','));
-        }
-        // Hitting this section means assignedToUserNames won't be undefined
-        const userNames = options.shareWithUserNames;
-        const userArr = userNames.split(',').map(o => o.trim());
-        const promises = userArr.map(user => {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/planner/plans/${planId}/details`,
                 headers: {
-                    'content-type': 'application/json'
+                    accept: 'application/json'
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
+            const response = yield request_1.default.get(requestOptions);
+            return response['@odata.etag'];
         });
-        return Promise
-            .all(promises)
-            .then((usersRes) => {
+    }
+    generateSharedWith(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharedWith = {};
+            const userIds = yield this.getUserIds(options);
+            userIds.map(x => sharedWith[x] = true);
+            return sharedWith;
+        });
+    }
+    getUserIds(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.shareWithUserIds) {
+                return options.shareWithUserIds.split(',');
+            }
+            // Hitting this section means assignedToUserNames won't be undefined
+            const userNames = options.shareWithUserNames;
+            const userArr = userNames.split(',').map(o => o.trim());
+            const promises = userArr.map(user => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                    headers: {
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.get(requestOptions);
+            });
+            const usersRes = yield Promise.all(promises);
             const userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
             const userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
             // Find the members where no graph response was found
             const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
             if (invalidUsers && invalidUsers.length > 0) {
-                return Promise.reject(`Cannot proceed with planner plan creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+                throw `Cannot proceed with planner plan creation. The following users provided are invalid : ${invalidUsers.join(',')}`;
             }
-            return Promise.resolve(userIds);
+            return userIds;
         });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTelemetry = function _PlannerPlanAddCommand_initTelemetry() {

package/dist/m365/planner/commands/plan/plan-set.js

@@ -72,32 +72,31 @@ class PlannerPlanSetCommand extends GraphCommand_1.default {
         });
     }
     getUserIds(options) {
-        if (options.shareWithUserIds) {
-            return Promise.resolve(options.shareWithUserIds.split(','));
-        }
-        const userNames = options.shareWithUserNames;
-        const userArr = userNames.split(',').map(o => o.trim());
-        const promises = userArr.map(user => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        });
-        return Promise
-            .all(promises)
-            .then((usersRes) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.shareWithUserIds) {
+                return options.shareWithUserIds.split(',');
+            }
+            const userNames = options.shareWithUserNames;
+            const userArr = userNames.split(',').map(o => o.trim());
+            const promises = userArr.map(user => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                    headers: {
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.get(requestOptions);
+            });
+            const usersRes = yield Promise.all(promises);
             const userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
             const userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
             // Find the members where no graph response was found
             const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
             if (invalidUsers && invalidUsers.length > 0) {
-                return Promise.reject(`Cannot proceed with planner plan creation. The following users provided are invalid: ${invalidUsers.join(',')}`);
+                throw `Cannot proceed with planner plan creation. The following users provided are invalid: ${invalidUsers.join(',')}`;
             }
-            return Promise.resolve(userIds);
+            return userIds;
         });
     }
     generateSharedWith(options) {