@pnp/cli-microsoft365 5.4.0 → 5.5.0-beta.10c7ae2

package/dist/Auth.js

@@ -330,7 +330,7 @@ class Auth {
             }
             return this.clientApplication.acquireTokenByUsernamePassword({
                 username: this.service.userName,
-                password: encodeURIComponent(this.service.password),
+                password: this.service.password,
                 scopes: [`${resource}/.default`]
             });
         });

package/dist/Command.js

@@ -14,6 +14,7 @@ const appInsights_1 = require("./appInsights");
 const Auth_1 = require("./Auth");
 const cli_1 = require("./cli");
 const request_1 = require("./request");
+const utils_1 = require("./utils");
 class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -81,6 +82,7 @@ class Command {
                 cb(new CommandError('Log in to Microsoft 365 first'));
                 return;
             }
+            this.loadValuesFromAccessToken(args);
             this.commandAction(logger, args, cb);
         }, (error) => {
             cb(new CommandError(error));
@@ -292,6 +294,26 @@ class Command {
             payload[o] = unknownOptions[o];
         });
     }
+    loadValuesFromAccessToken(args) {
+        if (!Auth_1.default.service.accessTokens[Auth_1.default.defaultResource]) {
+            return;
+        }
+        const token = Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken;
+        const optionNames = Object.getOwnPropertyNames(args.options);
+        optionNames.forEach(option => {
+            const value = args.options[option];
+            if (!value || typeof value !== 'string') {
+                return;
+            }
+            const lowerCaseValue = value.toLowerCase();
+            if (lowerCaseValue === '@meid') {
+                args.options[option] = utils_1.accessToken.getUserIdFromAccessToken(token);
+            }
+            if (lowerCaseValue === '@meusername') {
+                args.options[option] = utils_1.accessToken.getUserNameFromAccessToken(token);
+            }
+        });
+    }
 }
 exports.default = Command;
 //# sourceMappingURL=Command.js.map

package/dist/m365/flow/commands/flow-export.js

@@ -96,6 +96,9 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             const downloadFileUrl = formatArgument === 'json' ? '' : res.packageLink.value;
             const filenameRegEx = /([^\/]+\.zip)/i;
             filenameFromApi = formatArgument === 'json' ? `${res.properties.displayName}.json` : (filenameRegEx.exec(downloadFileUrl) || ['output.zip'])[0];
+            // Replace all illegal characters from the file name
+            const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+            filenameFromApi = filenameFromApi.replace(illegalCharsRegEx, '_');
             if (this.debug) {
                 logger.logToStderr(`Filename from PowerApps API: ${filenameFromApi}`);
                 logger.logToStderr('');

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

@@ -18,6 +18,7 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
         telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
         telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
@@ -27,6 +28,10 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         return ['id', 'name', 'planId', 'orderHint'];
     }
     commandAction(logger, args, cb) {
+        if (args.options.planName) {
+            args.options.planTitle = args.options.planName;
+            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
+        }
         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;
@@ -59,7 +64,7 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByName(args.options.planName, groupId))
+            .then(groupId => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
             .then(plan => plan.id);
     }
     getGroupId(args) {
@@ -81,6 +86,9 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
             {
                 option: "--planName [planName]"
             },
+            {
+                option: "--planTitle [planTitle]"
+            },
             {
                 option: "--ownerGroupId [ownerGroupId]"
             },
@@ -95,17 +103,17 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!args.options.planId && !args.options.planName) {
-            return 'Specify either planId or planName';
+        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+            return 'Specify either planId or planTitle';
         }
-        if (args.options.planId && args.options.planName) {
-            return 'Specify either planId or planName but not both';
+        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+            return 'Specify either planId or planTitle but not both';
         }
-        if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planName';
+        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+        if ((args.options.planName || 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)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;

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

@@ -29,11 +29,16 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         telemetryProps.name = typeof args.options.name !== 'undefined';
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
         telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        if (args.options.planName) {
+            args.options.planTitle = args.options.planName;
+            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
+        }
         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;
@@ -75,13 +80,13 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         });
     }
     getPlanId(args) {
-        const { planId, planName } = args.options;
+        const { planId, planTitle } = args.options;
         if (planId) {
             return Promise.resolve(planId);
         }
         return this
             .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
+            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
             .then(plan => plan.id);
     }
     getBucketById(id) {
@@ -119,6 +124,9 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             {
                 option: '--planName [planName]'
             },
+            {
+                option: "--planTitle [planTitle]"
+            },
             {
                 option: '--ownerGroupId [ownerGroupId]'
             },
@@ -131,26 +139,26 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
     }
     validate(args) {
         if (args.options.id) {
-            if (args.options.planId || args.options.planName || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planName, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
             if (args.options.name) {
                 return 'Specify either id or name';
             }
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planName) {
-                return 'Specify either planId or planName when using name';
+            if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+                return 'Specify either planId or planTitle when using name';
             }
-            if (args.options.planId && args.options.planName) {
-                return 'Specify either planId or planName when using name but not both';
+            if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+                return 'Specify either planId or planTitle when using name but not both';
             }
-            if (args.options.planName) {
+            if (args.options.planName || args.options.planTitle) {
                 if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planName';
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
                 }
                 if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
                 }
                 if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;

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

@@ -17,6 +17,7 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
         telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
         return telemetryProps;
@@ -25,6 +26,10 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         return ['id', 'name', 'planId', 'orderHint'];
     }
     commandAction(logger, args, cb) {
+        if (args.options.planName) {
+            args.options.planTitle = args.options.planName;
+            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
+        }
         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;
@@ -43,7 +48,7 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         }
         return this
             .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByName(args.options.planName, groupId))
+            .then(groupId => planner_1.planner.getPlanByTitle(args.options.planTitle, groupId))
             .then(plan => plan.id);
     }
     getGroupId(args) {
@@ -62,6 +67,9 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
             {
                 option: '--planName [planName]'
             },
+            {
+                option: "--planTitle [planTitle]"
+            },
             {
                 option: '--ownerGroupId [ownerGroupId]'
             },
@@ -73,17 +81,17 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!args.options.planId && !args.options.planName) {
-            return 'Specify either planId or planName';
+        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+            return 'Specify either planId or planTitle';
         }
-        if (args.options.planId && args.options.planName) {
-            return 'Specify either planId or planName but not both';
+        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+            return 'Specify either planId or planTitle but not both';
         }
-        if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planName';
+        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+        if ((args.options.planName || 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)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;

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

@@ -21,12 +21,17 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         telemetryProps.name = typeof args.options.name !== 'undefined';
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
         telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
         telemetryProps.confirm = args.options.confirm || false;
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        if (args.options.planName) {
+            args.options.planTitle = args.options.planName;
+            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
+        }
         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;
@@ -101,13 +106,13 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
         });
     }
     getPlanId(args) {
-        const { planId, planName } = args.options;
+        const { planId, planTitle } = args.options;
         if (planId) {
             return Promise.resolve(planId);
         }
         return this
             .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
+            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
             .then(plan => plan.id);
     }
     getGroupId(args) {
@@ -133,6 +138,9 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
             {
                 option: '--planName [planName]'
             },
+            {
+                option: "--planTitle [planTitle]"
+            },
             {
                 option: '--ownerGroupId [ownerGroupId]'
             },
@@ -153,23 +161,23 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     }
     validate(args) {
         if (args.options.id) {
-            if (args.options.planId || args.options.planName || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planName, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
         }
         else {
-            if (!args.options.planId && !args.options.planName) {
-                return 'Specify either planId or planName when using name';
+            if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+                return 'Specify either planId or planTitle when using name';
             }
-            if (args.options.planId && args.options.planName) {
-                return 'Specify either planId or planName when using name but not both';
+            if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+                return 'Specify either planId or planTitle when using name but not both';
             }
-            if (args.options.planName) {
+            if (args.options.planName || args.options.planTitle) {
                 if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planName';
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
                 }
                 if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
                 }
                 if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;

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

@@ -20,6 +20,7 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         telemetryProps.name = typeof args.options.name !== 'undefined';
         telemetryProps.planId = typeof args.options.planId !== 'undefined';
         telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
         telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
         telemetryProps.newName = typeof args.options.newName !== 'undefined';
@@ -27,6 +28,10 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        if (args.options.planName) {
+            args.options.planTitle = args.options.planName;
+            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
+        }
         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;
@@ -89,13 +94,13 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
         });
     }
     getPlanId(args) {
-        const { planId, planName } = args.options;
+        const { planId, planTitle } = args.options;
         if (planId) {
             return Promise.resolve(planId);
         }
         return this
             .getGroupId(args)
-            .then(groupId => planner_1.planner.getPlanByName(planName, groupId))
+            .then(groupId => planner_1.planner.getPlanByTitle(planTitle, groupId))
             .then(plan => plan.id);
     }
     getGroupId(args) {
@@ -121,6 +126,9 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
             {
                 option: '--planName [planName]'
             },
+            {
+                option: "--planTitle [planTitle]"
+            },
             {
                 option: '--ownerGroupId [ownerGroupId]'
             },
@@ -144,23 +152,23 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
     }
     validate(args) {
         if (args.options.id) {
-            if (args.options.planId || args.options.planName || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planName, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planName) {
-                return 'Specify either planId or planName when using name';
+            if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+                return 'Specify either planId or planTitle when using name';
             }
-            if (args.options.planId && args.options.planName) {
-                return 'Specify either planId or planName when using name but not both';
+            if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+                return 'Specify either planId or planTitle when using name but not both';
             }
-            if (args.options.planName) {
+            if (args.options.planName || args.options.planTitle) {
                 if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planName';
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
                 }
                 if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
                 }
                 if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;

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

@@ -6,15 +6,21 @@ const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Auth_1 = require("../../../../Auth");
 const aadGroup_1 = require("../../../../utils/aadGroup");
+const request_1 = require("../../../../request");
 class PlannerPlanGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_GET;
     }
+    alias() {
+        return [commands_1.default.PLAN_DETAILS_GET];
+    }
     get description() {
         return 'Get a Microsoft Planner plan';
     }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.planId = typeof args.options.planId !== 'undefined';
+        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
         telemetryProps.id = typeof args.options.id !== 'undefined';
         telemetryProps.title = typeof args.options.title !== 'undefined';
         telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
@@ -25,13 +31,21 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         return ['id', 'title', 'createdDateTime', 'owner', '@odata.etag'];
     }
     commandAction(logger, args, cb) {
+        this.showDeprecationWarning(logger, commands_1.default.PLAN_DETAILS_GET, commands_1.default.PLAN_GET);
         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();
@@ -40,15 +54,31 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         else {
             this
                 .getGroupId(args)
-                .then(groupId => planner_1.planner.getPlanByName(args.options.title, groupId))
-                .then((plan) => {
-                if (plan) {
-                    logger.log(plan);
+                .then(groupId => planner_1.planner.getPlanByTitle(args.options.title, groupId))
+                .then(plan => this.getPlanDetails(plan))
+                .then((res) => {
+                if (res) {
+                    logger.log(res);
                 }
                 cb();
             }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         }
     }
+    getPlanDetails(plan) {
+        const requestOptionsTaskDetails = {
+            url: `${this.resource}/v1.0/planner/plans/${plan.id}/details`,
+            headers: {
+                'accept': 'application/json;odata.metadata=none',
+                'Prefer': 'return=representation'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptionsTaskDetails)
+            .then(planDetails => {
+            return Object.assign(Object.assign({}, plan), planDetails);
+        });
+    }
     getGroupId(args) {
         if (args.options.ownerGroupId) {
             return Promise.resolve(args.options.ownerGroupId);
@@ -59,6 +89,12 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
     }
     options() {
         const options = [
+            {
+                option: '--planId [planId]'
+            },
+            {
+                option: '--planTitle [planTitle]'
+            },
             {
                 option: '-i, --id [id]'
             },
@@ -76,20 +112,25 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!args.options.id && !args.options.title) {
-            return 'Specify either id or title';
-        }
-        if (args.options.id && args.options.title) {
-            return 'Specify either id or title';
-        }
-        if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName';
-        }
-        if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName but not both';
+        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.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
-            return `${args.options.ownerGroupId} is not a valid GUID`;
+        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`;
+            }
         }
         return true;
     }