@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -13,11 +13,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators;
+var _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators, _PlannerPlanGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -29,6 +30,7 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PLAN_GET;
@@ -39,38 +41,31 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'title', 'createdDateTime', 'owner', '@odata.etag'];
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        if (args.options.planId) {
-            args.options.id = args.options.planId;
-        }
-        if (args.options.planTitle) {
-            args.options.title = args.options.planTitle;
-        }
-        if (args.options.id) {
-            planner_1.planner
-                .getPlanById(args.options.id)
-                .then(plan => this.getPlanDetails(plan))
-                .then((res) => {
-                logger.log(res);
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else {
-            this
-                .getGroupId(args)
-                .then(groupId => planner_1.planner.getPlanByTitle(args.options.title, groupId))
-                .then(plan => this.getPlanDetails(plan))
-                .then((res) => {
-                if (res) {
-                    logger.log(res);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                if (args.options.id) {
+                    const plan = yield planner_1.planner.getPlanById(args.options.id);
+                    const result = yield this.getPlanDetails(plan);
+                    logger.log(result);
                 }
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
+                else {
+                    const groupId = yield this.getGroupId(args);
+                    const plan = yield planner_1.planner.getPlanByTitle(args.options.title, groupId);
+                    const result = yield this.getPlanDetails(plan);
+                    if (result) {
+                        logger.log(result);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getPlanDetails(plan) {
         const requestOptionsTaskDetails = {
@@ -99,8 +94,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
 _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTelemetry = function _PlannerPlanGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            planId: typeof args.options.planId !== 'undefined',
-            planTitle: typeof args.options.planTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
@@ -109,10 +102,6 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initOptions = function _PlannerPlanGetCommand_initOptions() {
     this.options.unshift({
-        option: '--planId [planId]'
-    }, {
-        option: '--planTitle [planTitle]'
-    }, {
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
@@ -123,28 +112,19 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initValidators = function _PlannerPlanGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.planId && args.options.planTitle ||
-            args.options.id && args.options.title ||
-            args.options.planId && args.options.title ||
-            args.options.id && args.options.planTitle) {
-            return 'Specify either id or title but not both';
+        if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName';
         }
-        if (!args.options.planId && !args.options.id) {
-            if (!args.options.planTitle && !args.options.title) {
-                return 'Specify either id or title';
-            }
-            if ((args.options.title || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName';
-            }
-            if ((args.options.title || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName but not both';
-            }
-            if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
-                return `${args.options.ownerGroupId} is not a valid GUID`;
-            }
+        if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName but not both';
+        }
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _PlannerPlanGetCommand_initOptionSets = function _PlannerPlanGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new PlannerPlanGetCommand();
 //# sourceMappingURL=plan-get.js.map

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

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators;
+var _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators, _PlannerPlanListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -28,6 +29,7 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanListCommand_instances, "m", _PlannerPlanListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PLAN_LIST;
@@ -38,20 +40,23 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'title', 'createdDateTime', 'owner'];
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getGroupId(args)
-            .then((groupId) => planner_1.planner.getPlansByGroupId(groupId))
-            .then((res) => {
-            if (res && res.length > 0) {
-                logger.log(res);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const groupId = yield this.getGroupId(args);
+                const result = yield planner_1.planner.getPlansByGroupId(groupId);
+                if (result && result.length > 0) {
+                    logger.log(result);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
@@ -77,17 +82,13 @@ _PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initT
     });
 }, _PlannerPlanListCommand_initValidators = function _PlannerPlanListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName';
-        }
-        if (args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName but not both';
-        }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _PlannerPlanListCommand_initOptionSets = function _PlannerPlanListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName'] });
 };
 module.exports = new PlannerPlanListCommand();
 //# sourceMappingURL=plan-list.js.map

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

@@ -16,9 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerPlanRemoveCommand_instances, _PlannerPlanRemoveCommand_initTelemetry, _PlannerPlanRemoveCommand_initOptions, _PlannerPlanRemoveCommand_initValidators, _PlannerPlanRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -38,47 +39,44 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the Microsoft Planner plan';
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        const removePlan = () => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const plan = yield this.getPlan(args);
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/planner/plans/${plan.id}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'if-match': plan['@odata.etag']
-                    },
-                    responseType: 'json'
-                };
-                yield request_1.default.delete(requestOptions);
-                cb();
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err, logger, cb);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
             }
-        });
-        if (args.options.confirm) {
-            removePlan();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the plan ${args.options.id || args.options.title}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+            const removePlan = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const plan = yield this.getPlan(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/planner/plans/${plan.id}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            'if-match': plan['@odata.etag']
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removePlan();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removePlan();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the plan ${args.options.id || args.options.title}?`
+                });
+                if (result.continue) {
+                    yield removePlan();
+                }
+            }
+        });
     }
     getPlan(args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -132,7 +130,7 @@ _PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_i
             if (args.options.ownerGroupId && args.options.ownerGroupName) {
                 return 'Specify either ownerGroupId or ownerGroupName but not both';
             }
-            if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                 return `${args.options.ownerGroupId} is not a valid GUID`;
             }
         }
@@ -142,7 +140,7 @@ _PlannerPlanRemoveCommand_instances = new WeakSet(), _PlannerPlanRemoveCommand_i
         return true;
     }));
 }, _PlannerPlanRemoveCommand_initOptionSets = function _PlannerPlanRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title']);
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new PlannerPlanRemoveCommand();
 //# sourceMappingURL=plan-remove.js.map

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

@@ -13,11 +13,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PlannerTaskAddCommand_instances, _PlannerTaskAddCommand_initTelemetry, _PlannerTaskAddCommand_initOptions, _PlannerTaskAddCommand_initValidators;
+var _PlannerTaskAddCommand_instances, _PlannerTaskAddCommand_initTelemetry, _PlannerTaskAddCommand_initOptions, _PlannerTaskAddCommand_initValidators, _PlannerTaskAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -32,6 +34,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskAddCommand_instances, "m", _PlannerTaskAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TASK_ADD;
@@ -39,54 +42,49 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Adds a new Microsoft Planner Task';
     }
-    commandAction(logger, args, cb) {
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getPlanId(args)
-            .then(planId => {
-            this.planId = planId;
-            return this.getBucketId(args, planId);
-        })
-            .then(bucketId => {
-            this.bucketId = bucketId;
-            return this.generateUserAssignments(args);
-        })
-            .then(assignments => {
-            const appliedCategories = this.generateAppliedCategories(args.options);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    planId: this.planId,
-                    bucketId: this.bucketId,
-                    title: args.options.title,
-                    startDateTime: args.options.startDateTime,
-                    dueDateTime: args.options.dueDateTime,
-                    percentComplete: args.options.percentComplete,
-                    assignments: assignments,
-                    orderHint: args.options.orderHint,
-                    assigneePriority: args.options.assigneePriority,
-                    appliedCategories: appliedCategories,
-                    priority: taskPriority_1.taskPriority.getPriorityValue(args.options.priority)
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(newTask => this.updateTaskDetails(args.options, newTask))
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                this.planId = yield this.getPlanId(args);
+                this.bucketId = yield this.getBucketId(args, this.planId);
+                const assignments = yield this.generateUserAssignments(args);
+                const appliedCategories = this.generateAppliedCategories(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/tasks`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        planId: this.planId,
+                        bucketId: this.bucketId,
+                        title: args.options.title,
+                        startDateTime: args.options.startDateTime,
+                        dueDateTime: args.options.dueDateTime,
+                        percentComplete: args.options.percentComplete,
+                        assignments: assignments,
+                        orderHint: args.options.orderHint,
+                        assigneePriority: args.options.assigneePriority,
+                        appliedCategories: appliedCategories,
+                        priority: taskPriority_1.taskPriority.getPriorityValue(args.options.priority)
+                    }
+                };
+                const newTask = yield request_1.default.post(requestOptions);
+                const result = yield this.updateTaskDetails(args.options, newTask);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getTaskDetailsEtag(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
             headers: {
                 accept: 'application/json'
             },
@@ -194,7 +192,7 @@ class PlannerTaskAddCommand extends GraphCommand_1.default {
         let userIds = [];
         const promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },
@@ -249,31 +247,19 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
     }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority_1.taskPriority.priorityValues });
 }, _PlannerTaskAddCommand_initValidators = function _PlannerTaskAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.planId && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle but not both';
-        }
         if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
         if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
-        if (!args.options.bucketId && !args.options.bucketName) {
-            return 'Specify either bucketId or bucketName';
-        }
-        if (args.options.bucketId && args.options.bucketName) {
-            return 'Specify either bucketId or bucketName but not both';
-        }
-        if (args.options.startDateTime && !utils_1.validation.isValidISODateTime(args.options.startDateTime)) {
+        if (args.options.startDateTime && !validation_1.validation.isValidISODateTime(args.options.startDateTime)) {
             return 'The startDateTime is not a valid ISO date string';
         }
-        if (args.options.dueDateTime && !utils_1.validation.isValidISODateTime(args.options.dueDateTime)) {
+        if (args.options.dueDateTime && !validation_1.validation.isValidISODateTime(args.options.dueDateTime)) {
             return 'The dueDateTime is not a valid ISO date string';
         }
         if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
@@ -282,7 +268,7 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
             return `percentComplete should be between 0 and 100`;
         }
-        if (args.options.assignedToUserIds && !utils_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+        if (args.options.assignedToUserIds && !validation_1.validation.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
             return 'assignedToUserIds contains invalid GUID';
         }
         if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
@@ -306,6 +292,8 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         }
         return true;
     }));
+}, _PlannerTaskAddCommand_initOptionSets = function _PlannerTaskAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['planId', 'planTitle'] }, { options: ['bucketId', 'bucketName'] });
 };
 module.exports = new PlannerTaskAddCommand();
 //# sourceMappingURL=task-add.js.map

package/dist/m365/planner/commands/task/task-checklistitem-add.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -10,6 +19,7 @@ const uuid_1 = require("uuid");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
@@ -28,51 +38,52 @@ class PlannerTaskChecklistItemAddCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'title', 'isChecked'];
     }
-    commandAction(logger, args, cb) {
-        if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getTaskDetailsEtag(args.options.taskId)
-            .then(etag => {
-            const body = {
-                checklist: {
-                    // Generate new GUID for new task checklist item
-                    [(0, uuid_1.v4)()]: {
-                        '@odata.type': 'microsoft.graph.plannerChecklistItem',
-                        title: args.options.title,
-                        isChecked: args.options.isChecked || false
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const etag = yield this.getTaskDetailsEtag(args.options.taskId);
+                const body = {
+                    checklist: {
+                        // Generate new GUID for new task checklist item
+                        [(0, uuid_1.v4)()]: {
+                            '@odata.type': 'microsoft.graph.plannerChecklistItem',
+                            title: args.options.title,
+                            isChecked: args.options.isChecked || false
+                        }
                     }
+                };
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(args.options.taskId)}/details`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        prefer: 'return=representation',
+                        'if-match': etag
+                    },
+                    responseType: 'json',
+                    data: body
+                };
+                const result = yield request_1.default.patch(requestOptions);
+                if (args.options.output === 'json') {
+                    logger.log(result.checklist);
+                }
+                else {
+                    // Transform checklist item object to text friendly format
+                    const output = Object.getOwnPropertyNames(result.checklist).map(prop => (Object.assign({ id: prop }, result.checklist[prop])));
+                    logger.log(output);
                 }
-            };
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(args.options.taskId)}/details`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    prefer: 'return=representation',
-                    'if-match': etag
-                },
-                responseType: 'json',
-                data: body
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then((result) => {
-            if (args.options.output === 'json') {
-                logger.log(result.checklist);
             }
-            else {
-                // Transform checklist item object to text friendly format
-                const output = Object.getOwnPropertyNames(result.checklist).map(prop => (Object.assign({ id: prop }, result.checklist[prop])));
-                logger.log(output);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getTaskDetailsEtag(taskId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            url: `${this.resource}/v1.0/planner/tasks/${formatting_1.formatting.encodeQueryParameter(taskId)}/details`,
             headers: {
                 accept: 'application/json;odata.metadata=minimal'
             },