@pnp/cli-microsoft365 6.3.0-beta.c3dc921 → 6.3.0-beta.e40d7b4

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -13,7 +13,7 @@ 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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
+var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators, _OneNoteNotebookListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
@@ -28,75 +28,63 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
     get description() {
         return 'Retrieve a list of notebooks';
     }
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
+    }
     constructor() {
         super();
         _OneNoteNotebookListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptionSets).call(this);
     }
     getEndpointUrl(args) {
-        return new Promise((resolve, reject) => {
-            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
+        return __awaiter(this, void 0, void 0, function* () {
+            let endpoint = `${this.resource}/v1.0/`;
             if (args.options.userId) {
-                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `users/${args.options.userId}`;
             }
             else if (args.options.userName) {
-                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `users/${args.options.userName}`;
             }
             else if (args.options.groupId) {
-                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
-                return resolve(endpoint);
+                endpoint += `groups/${args.options.groupId}`;
             }
             else if (args.options.groupName) {
-                this
-                    .getGroupId(args)
-                    .then((retrievedgroupId) => {
-                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const groupId = yield this.getGroupId(args.options.groupName);
+                endpoint += `groups/${groupId}`;
             }
             else if (args.options.webUrl) {
-                this
-                    .getSpoSiteId(args)
-                    .then((siteId) => {
-                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
-                    return resolve(endpoint);
-                })
-                    .catch((err) => {
-                    reject(err);
-                });
+                const siteId = yield this.getSpoSiteId(args.options.webUrl);
+                endpoint += `sites/${siteId}`;
             }
             else {
-                return resolve(endpoint);
+                endpoint += 'me';
             }
+            endpoint += '/onenote/notebooks';
+            return endpoint;
         });
     }
-    defaultProperties() {
-        return ['createdDateTime', 'displayName', 'id'];
-    }
-    getGroupId(args) {
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.groupName)
-            .then(group => group.id);
+    getGroupId(groupName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(groupName);
+            return group.id;
+        });
     }
-    getSpoSiteId(args) {
-        const url = new URL(args.options.webUrl);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((site) => site.id);
+    getSpoSiteId(webUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = new URL(webUrl);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const site = yield request_1.default.get(requestOptions);
+            return site.id;
+        });
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -114,7 +102,11 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
 _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            joined: args.options.joined
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
         });
     });
 }, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
@@ -127,14 +119,19 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
         if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
-        if (args.options.userId && args.options.userName) {
-            return 'Specify either userId or userName, but not both';
-        }
-        if (args.options.groupId && args.options.groupName) {
-            return 'Specify either groupId or groupName, but not both';
+        if (args.options.webUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         }
         return true;
     }));
+}, _OneNoteNotebookListCommand_initOptionSets = function _OneNoteNotebookListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName', 'groupId', 'groupName', 'webUrl'],
+        runsWhen: (args) => {
+            const options = [args.options.userId, args.options.userName, args.options.groupId, args.options.groupName, args.options.webUrl];
+            return options.some(item => item !== undefined);
+        }
+    });
 };
 module.exports = new OneNoteNotebookListCommand();
 //# sourceMappingURL=notebook-list.js.map

package/dist/m365/onenote/commands/page/page-list.js

@@ -15,12 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OneNotePageListCommand_instances, _OneNotePageListCommand_initTelemetry, _OneNotePageListCommand_initOptions, _OneNotePageListCommand_initValidators, _OneNotePageListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const spo_1 = require("../../../../utils/spo");
 class OneNotePageListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PAGE_LIST;
@@ -56,7 +56,7 @@ class OneNotePageListCommand extends GraphCommand_1.default {
                 endpoint += `groups/${groupId}`;
             }
             else if (args.options.webUrl) {
-                const siteId = yield this.getSpoSiteId(args.options.webUrl);
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.webUrl);
                 endpoint += `sites/${siteId}`;
             }
             else {
@@ -72,20 +72,6 @@ class OneNotePageListCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    getSpoSiteId(webUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const url = new URL(webUrl);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const site = yield request_1.default.get(requestOptions);
-            return site.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -22,6 +22,7 @@ const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const formatting_1 = require("../../../../utils/formatting");
+const accessToken_1 = require("../../../../utils/accessToken");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MAIL_SEND;
@@ -40,8 +41,8 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
-                if (isAppOnlyAuth === true && !args.options.sender) {
+                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (isAppOnlyAccessToken === true && !args.options.sender) {
                     throw `Specify a upn or user id in the 'sender' option when using app only authentication.`;
                 }
                 const requestOptions = {

package/dist/m365/outlook/commands/message/message-get.js

@@ -17,6 +17,7 @@ var _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookMessageGetCommand extends GraphCommand_1.default {
@@ -35,12 +36,12 @@ class OutlookMessageGetCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAccessToken ? 'app only permissions' : 'delegated permissions'}`);
                 }
                 let requestUrl = '';
-                if (isAppOnlyAuth) {
+                if (isAppOnlyAccessToken) {
                     if (!args.options.userId && !args.options.userPrincipalName) {
                         throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
                     }

package/dist/m365/pa/commands/environment/environment-get.js

@@ -13,7 +13,7 @@ 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 _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initOptions;
+var _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initTelemetry, _PaEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -32,15 +32,17 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     constructor() {
         super();
         _PaEnvironmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaEnvironmentGetCommand_instances, "m", _PaEnvironmentGetCommand_initOptions).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
+                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name || 'default'}...`);
             }
+            const environmentName = args.options.name ? formatting_1.formatting.encodeQueryParameter(args.options.name) : '~default';
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${environmentName}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -61,9 +63,15 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
         });
     }
 }
-_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
+_PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initTelemetry = function _PaEnvironmentGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
     });
 };
 module.exports = new PaEnvironmentGetCommand();

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PlannerPlanAddCommand_instances, _PlannerPlanAddCommand_initTelemetry, _PlannerPlanAddCommand_initOptions, _PlannerPlanAddCommand_initValidators, _PlannerPlanAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const formatting_1 = require("../../../../utils/formatting");
@@ -42,23 +43,34 @@ class PlannerPlanAddCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupId = yield this.getGroupId(args);
+                const data = {
+                    title: args.options.title
+                };
+                if (args.options.rosterId) {
+                    data.container = {
+                        "url": `https://graph.microsoft.com/v1.0/planner/rosters/${args.options.rosterId}`
+                    };
+                }
+                else {
+                    const groupId = yield this.getGroupId(args);
+                    data.owner = 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
-                    }
+                    data: data
                 };
                 const newPlan = yield request_1.default.post(requestOptions);
                 const result = yield this.updatePlanDetails(args.options, newPlan);
                 logger.log(result);
             }
             catch (err) {
+                if (err.error && err.error.error.message === "You do not have the required permissions to access this item, or the item may not exist.") {
+                    throw new Command_1.CommandError("You can only add 1 plan to a Roster");
+                }
                 this.handleRejectedODataJsonPromise(err);
             }
         });
@@ -167,6 +179,8 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
         option: "--ownerGroupId [ownerGroupId]"
     }, {
         option: "--ownerGroupName [ownerGroupName]"
+    }, {
+        option: "--rosterId [rosterId]"
     }, {
         option: '--shareWithUserIds [shareWithUserIds]'
     }, {
@@ -186,7 +200,7 @@ _PlannerPlanAddCommand_instances = new WeakSet(), _PlannerPlanAddCommand_initTel
         return true;
     }));
 }, _PlannerPlanAddCommand_initOptionSets = function _PlannerPlanAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName'] });
+    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName', 'rosterId'] });
 };
 module.exports = new PlannerPlanAddCommand();
 //# sourceMappingURL=plan-add.js.map

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

@@ -48,8 +48,18 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
                     logger.log(result);
                 }
                 else {
-                    const groupId = yield this.getGroupId(args);
-                    const plan = yield planner_1.planner.getPlanByTitle(args.options.title, groupId);
+                    let plan = {};
+                    if (args.options.rosterId) {
+                        const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+                        plan = plans[0];
+                    }
+                    else {
+                        let groupId = undefined;
+                        if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                            groupId = yield this.getGroupId(args);
+                        }
+                        plan = yield planner_1.planner.getPlanByTitle(args.options.title, groupId);
+                    }
                     const result = yield this.getPlanDetails(plan);
                     if (result) {
                         logger.log(result);
@@ -62,27 +72,27 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         });
     }
     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 __awaiter(this, void 0, void 0, function* () {
+            const requestOptionsTaskDetails = {
+                url: `${this.resource}/v1.0/planner/plans/${plan.id}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json'
+            };
+            const planDetails = yield request_1.default.get(requestOptionsTaskDetails);
             return Object.assign(Object.assign({}, plan), planDetails);
         });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTelemetry = function _PlannerPlanGetCommand_initTelemetry() {
@@ -90,6 +100,7 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
@@ -99,6 +110,8 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -106,19 +119,20 @@ _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.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.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'] });
+    this.optionSets.push({
+        options: ['id', 'title', 'rosterId']
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.title !== undefined;
+        }
+    });
 };
 module.exports = new PlannerPlanGetCommand();
 //# sourceMappingURL=plan-get.js.map

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

@@ -16,16 +16,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PlannerPlanListCommand_instances, _PlannerPlanListCommand_initTelemetry, _PlannerPlanListCommand_initOptions, _PlannerPlanListCommand_initValidators, _PlannerPlanListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const validation_1 = require("../../../../utils/validation");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerPlanListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.PLAN_LIST;
     }
     get description() {
-        return 'Returns a list of plans associated with a specified group';
+        return 'Returns a list of plans associated with a specified group or roster';
     }
     constructor() {
         super();
@@ -41,10 +41,16 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const groupId = yield this.getGroupId(args);
-                const result = yield planner_1.planner.getPlansByGroupId(groupId);
-                if (result && result.length > 0) {
-                    logger.log(result);
+                let plannerPlans = null;
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    const groupId = yield this.getGroupId(args);
+                    plannerPlans = yield planner_1.planner.getPlansByGroupId(groupId);
+                }
+                else {
+                    plannerPlans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+                }
+                if (plannerPlans && plannerPlans.length > 0) {
+                    logger.log(plannerPlans);
                 }
             }
             catch (err) {
@@ -53,19 +59,21 @@ class PlannerPlanListCommand extends GraphCommand_1.default {
         });
     }
     getGroupId(args) {
-        if (args.options.ownerGroupId) {
-            return Promise.resolve(args.options.ownerGroupId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.ownerGroupName)
-            .then(group => group.id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.ownerGroupId) {
+                return args.options.ownerGroupId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.ownerGroupName);
+            return group.id;
+        });
     }
 }
 _PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initTelemetry = function _PlannerPlanListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
-            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined'
         });
     });
 }, _PlannerPlanListCommand_initOptions = function _PlannerPlanListCommand_initOptions() {
@@ -73,6 +81,8 @@ _PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initT
         option: "--ownerGroupId [ownerGroupId]"
     }, {
         option: "--ownerGroupName [ownerGroupName]"
+    }, {
+        option: "--rosterId [rosterId]"
     });
 }, _PlannerPlanListCommand_initValidators = function _PlannerPlanListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -82,7 +92,7 @@ _PlannerPlanListCommand_instances = new WeakSet(), _PlannerPlanListCommand_initT
         return true;
     }));
 }, _PlannerPlanListCommand_initOptionSets = function _PlannerPlanListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName'] });
+    this.optionSets.push({ options: ['ownerGroupId', 'ownerGroupName', 'rosterId'] });
 };
 module.exports = new PlannerPlanListCommand();
 //# sourceMappingURL=plan-list.js.map

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

@@ -79,7 +79,7 @@ class PlannerPlanRemoveCommand extends GraphCommand_1.default {
                 return planner_1.planner.getPlanById(id, 'minimal');
             }
             const groupId = yield this.getGroupId(args);
-            return yield planner_1.planner.getPlanByTitle(title, groupId);
+            return yield planner_1.planner.getPlanByTitle(title, groupId, 'minimal');
         });
     }
     getGroupId(args) {

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

@@ -59,9 +59,16 @@ class PlannerPlanSetCommand extends GraphCommand_1.default {
             if (id) {
                 return id;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(title, groupId);
-            return plan.id;
+            let groupId = '';
+            if (args.options.rosterId) {
+                const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+                return plans[0].id;
+            }
+            else {
+                groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(title, groupId);
+                return plan.id;
+            }
         });
     }
     getUserIds(options) {
@@ -214,6 +221,7 @@ _PlannerPlanSetCommand_instances = new WeakSet(), _PlannerPlanSetCommand_initTel
             title: typeof args.options.title !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             newTitle: typeof args.options.newTitle !== 'undefined',
             shareWithUserIds: typeof args.options.shareWithUserIds !== 'undefined',
             shareWithUserNames: typeof args.options.shareWithUserNames !== 'undefined'
@@ -228,6 +236,8 @@ _PlannerPlanSetCommand_instances = new WeakSet(), _PlannerPlanSetCommand_initTel
         option: '--ownerGroupId [ownerGroupId]'
     }, {
         option: '--ownerGroupName [ownerGroupName]'
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--newTitle [newTitle]'
     }, {
@@ -241,12 +251,6 @@ _PlannerPlanSetCommand_instances = new WeakSet(), _PlannerPlanSetCommand_initTel
             if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                 return `${args.options.ownerGroupId} is not a valid GUID`;
             }
-            if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName when using title';
-            }
-            if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName when using title but not both';
-            }
         }
         if (args.options.shareWithUserIds && args.options.shareWithUserNames) {
             return 'Specify either shareWithUserIds or shareWithUserNames but not both';
@@ -293,7 +297,14 @@ _PlannerPlanSetCommand_instances = new WeakSet(), _PlannerPlanSetCommand_initTel
         return true;
     }));
 }, _PlannerPlanSetCommand_initOptionSets = function _PlannerPlanSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
+    this.optionSets.push({
+        options: ['id', 'title', 'rosterId']
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.title !== undefined;
+        }
+    });
 };
 module.exports = new PlannerPlanSetCommand();
 //# sourceMappingURL=plan-set.js.map