@pnp/cli-microsoft365 6.0.0-beta.27b9708 → 6.0.0-beta.291f17c

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators, _PlannerBucketListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -39,18 +41,21 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'name', 'planId', 'orderHint'];
     }
-    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) => utils_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`))
-            .then((buckets) => {
-            logger.log(buckets);
-            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 {
+                const planId = yield this.getPlanId(args);
+                const buckets = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/planner/plans/${planId}/buckets`);
+                logger.log(buckets);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getPlanId(args) {
         if (args.options.planId) {
@@ -97,13 +102,13 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         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`;
         }
         return true;
     }));
 }, _PlannerBucketListCommand_initOptionSets = function _PlannerBucketListCommand_initOptionSets() {
-    this.optionSets.push(['planId', 'planTitle']);
+    this.optionSets.push({ options: ['planId', 'planTitle'] });
 };
 module.exports = new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map

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

@@ -16,9 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerBucketRemoveCommand_instances, _PlannerBucketRemoveCommand_initTelemetry, _PlannerBucketRemoveCommand_initOptions, _PlannerBucketRemoveCommand_initValidators, _PlannerBucketRemoveCommand_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,45 +39,44 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the Microsoft Planner bucket from a 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 removeBucket = () => {
-            this
-                .getBucket(args)
-                .then(bucket => {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/planner/buckets/${bucket.id}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'if-match': bucket['@odata.etag']
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeBucket();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the bucket ${args.options.id || args.options.name}?`
-            }, (result) => {
-                if (!result.continue) {
-                    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;
+            }
+            const removeBucket = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const bucket = yield this.getBucket(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/planner/buckets/${bucket.id}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none',
+                            'if-match': bucket['@odata.etag']
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeBucket();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeBucket();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the bucket ${args.options.id || args.options.name}?`
+                });
+                if (result.continue) {
+                    yield removeBucket();
+                }
+            }
+        });
     }
     getBucket(args) {
         if (args.options.id) {
@@ -181,7 +181,7 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
                 if (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`;
                 }
             }
@@ -194,7 +194,7 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
         return true;
     }));
 }, _PlannerBucketRemoveCommand_initOptionSets = function _PlannerBucketRemoveCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new PlannerBucketRemoveCommand();
 //# sourceMappingURL=bucket-remove.js.map

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

@@ -17,7 +17,8 @@ var _PlannerBucketSetCommand_instances, _PlannerBucketSetCommand_initTelemetry,
 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");
@@ -37,33 +38,36 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates a Microsoft Planner bucket';
     }
-    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
-            .getBucket(args)
-            .then(bucket => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets/${bucket.id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'if-match': bucket['@odata.etag']
-                },
-                responseType: 'json',
-                data: {}
-            };
-            const { newName, orderHint } = args.options;
-            if (newName) {
-                requestOptions.data.name = newName;
+    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 (orderHint) {
-                requestOptions.data.orderHint = orderHint;
+            try {
+                const bucket = yield this.getBucket(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets/${bucket.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'if-match': bucket['@odata.etag']
+                    },
+                    responseType: 'json',
+                    data: {}
+                };
+                const { newName, orderHint } = args.options;
+                if (newName) {
+                    requestOptions.data.name = newName;
+                }
+                if (orderHint) {
+                    requestOptions.data.orderHint = orderHint;
+                }
+                yield request_1.default.patch(requestOptions);
             }
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getBucket(args) {
         if (args.options.id) {
@@ -171,7 +175,7 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
                 if (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`;
                 }
             }
@@ -187,7 +191,7 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         return true;
     }));
 }, _PlannerBucketSetCommand_initOptionSets = function _PlannerBucketSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'name']);
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 module.exports = new PlannerBucketSetCommand();
 //# sourceMappingURL=bucket-set.js.map

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

@@ -17,7 +17,10 @@ var _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _Pla
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const accessToken_1 = require("../../../../utils/accessToken");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerPlanAddCommand extends GraphCommand_1.default {
@@ -38,32 +41,33 @@ class PlannerPlanAddCommand 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) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/plans`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    owner: groupId,
-                    title: args.options.title
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(newPlan => this.updatePlanDetails(args.options, newPlan))
-            .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 {
+                const groupId = yield this.getGroupId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/plans`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        owner: groupId,
+                        title: args.options.title
+                    }
+                };
+                const newPlan = yield request_1.default.post(requestOptions);
+                const result = yield this.updatePlanDetails(args.options, newPlan);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     updatePlanDetails(options, newPlan) {
         const planId = newPlan.id;
@@ -123,7 +127,7 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         const userArr = userNames.split(',').map(o => o.trim());
         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'
                 },
@@ -148,7 +152,7 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
         }
-        return utils_1.aadGroup
+        return aadGroup_1.aadGroup
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
@@ -176,19 +180,19 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
     });
 }, _PlannerPlanAddCommand_initValidators = function _PlannerPlanAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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.shareWithUserIds && args.options.shareWithUserNames) {
             return 'Specify either shareWithUserIds or shareWithUserNames but not both';
         }
-        if (args.options.shareWithUserIds && !utils_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
+        if (args.options.shareWithUserIds && !validation_1.validation.isValidGuidArray(args.options.shareWithUserIds.split(','))) {
             return 'shareWithUserIds contains invalid GUID';
         }
         return true;
     }));
 }, _PlannerPlanAddCommand_initOptionSets = function _PlannerPlanAddCommand_initOptionSets() {
-    this.optionSets.push(['ownerGroupId', 'ownerGroupName']);
+    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName'] });
 };
 module.exports = new PlannerPlanAddCommand();
 //# sourceMappingURL=plan-add.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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");
@@ -39,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);
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
@@ -78,13 +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 && !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(['ownerGroupId', 'ownerGroupName']);
+    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName'] });
 };
 module.exports = new PlannerPlanListCommand();
 //# sourceMappingURL=plan-list.js.map