@pnp/cli-microsoft365 6.3.0-beta.e46ffee → 6.3.0-beta.fee5cdb

package/.eslintrc.js

@@ -7,9 +7,11 @@ const dictionary = [
   'adaptive',
   'ai',
   'app',
+  'application',
   'apply',
   'approve',
   'assets',
+  'audit',
   'bin',
   'builder',
   'catalog',
@@ -19,8 +21,11 @@ const dictionary = [
   'content',
   'conversation',
   'custom',
+  'customizer',
   'dataverse',
   'default',
+  'event',
+  'eventreceiver',
   'external',
   'externalize',
   'fun',
@@ -43,6 +48,9 @@ const dictionary = [
   'label',
   'list',
   'link',
+  'log',
+  'login',
+  'logout',
   'management',
   'member',
   'messaging',

package/dist/Command.js

@@ -481,7 +481,18 @@ class Command {
                 if (!l) {
                     return;
                 }
-                output.push(`## ${this.getLogItemTitle(l)} (${this.getLogItemId(l)})`, os.EOL, os.EOL, `Property | Value`, os.EOL, `---------|-------`, os.EOL);
+                const title = this.getLogItemTitle(l);
+                const id = this.getLogItemId(l);
+                if (title && id) {
+                    output.push(`## ${title} (${id})`, os.EOL, os.EOL);
+                }
+                else if (title) {
+                    output.push(`## ${title}`, os.EOL, os.EOL);
+                }
+                else if (id) {
+                    output.push(`## ${id}`, os.EOL, os.EOL);
+                }
+                output.push(`Property | Value`, os.EOL, `---------|-------`, os.EOL);
                 output.push(Object.keys(l).map(k => {
                     const value = l[k];
                     let stringValue = value;

package/dist/cli/Cli.js

@@ -458,7 +458,7 @@ class Cli {
         // data so that returned objects contain only default properties specified
         // on the current command. If there is no current command or the
         // command doesn't specify default properties, return original data
-        if (options.output === 'text' || options.output === 'csv') {
+        if (this.shouldTrimOutput(options.output)) {
             const cli = Cli.getInstance();
             const currentCommand = cli.commandToExecute;
             if (arrayType === 'object' &&
@@ -753,6 +753,9 @@ class Cli {
             }
         });
     }
+    static shouldTrimOutput(output) {
+        return output === 'text' || output === 'csv';
+    }
 }
 exports.Cli = Cli;
 Cli.defaultHelpMode = 'full';

package/dist/m365/aad/commands/group/group-list.js

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadGroupListCommand_instances, _AadGroupListCommand_initTelemetry, _AadGroupListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -39,7 +40,7 @@ class AadGroupListCommand extends GraphCommand_1.default {
             const endpoint = args.options.deleted ? 'directory/deletedItems/microsoft.graph.group' : 'groups';
             try {
                 const groups = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${endpoint}`);
-                if (args.options.output === 'text') {
+                if (Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     groups.forEach((group) => {
                         if (group.groupTypes && group.groupTypes.length > 0 && group.groupTypes[0] === 'Unified') {
                             group.groupType = 'Microsoft 365';

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -0,0 +1,103 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadUserRecycleBinItemClearCommand_instances, _AadUserRecycleBinItemClearCommand_initTelemetry, _AadUserRecycleBinItemClearCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserRecycleBinItemClearCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_RECYCLEBINITEM_CLEAR;
+    }
+    get description() {
+        return 'Removes all users from the tenant recycle bin';
+    }
+    constructor() {
+        super();
+        _AadUserRecycleBinItemClearCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemClearCommand_instances, "m", _AadUserRecycleBinItemClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemClearCommand_instances, "m", _AadUserRecycleBinItemClearCommand_initOptions).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearRecycleBinUsers = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const users = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/directory/deletedItems/microsoft.graph.user?$select=id`);
+                    if (this.verbose) {
+                        logger.logToStderr(`Amount of users to permanently delete: ${users.length}`);
+                    }
+                    const batchRequests = users.map((user, index) => {
+                        return {
+                            id: index,
+                            method: 'DELETE',
+                            url: `/directory/deletedItems/${user.id}`
+                        };
+                    });
+                    for (let i = 0; i < batchRequests.length; i += 20) {
+                        const batchRequestChunk = batchRequests.slice(i, i + 20);
+                        if (this.verbose) {
+                            logger.logToStderr(`Deleting users: ${i + batchRequestChunk.length}/${users.length}`);
+                        }
+                        const requestOptions = {
+                            url: 'https://graph.microsoft.com/v1.0/$batch',
+                            headers: {
+                                accept: 'application/json',
+                                'content-type': 'application/json'
+                            },
+                            responseType: 'json',
+                            data: {
+                                requests: batchRequestChunk
+                            }
+                        };
+                        yield request_1.default.post(requestOptions);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield clearRecycleBinUsers();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: 'Are you sure you want to permanently delete all deleted users?'
+                });
+                if (result.continue) {
+                    yield clearRecycleBinUsers();
+                }
+            }
+        });
+    }
+}
+_AadUserRecycleBinItemClearCommand_instances = new WeakSet(), _AadUserRecycleBinItemClearCommand_initTelemetry = function _AadUserRecycleBinItemClearCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _AadUserRecycleBinItemClearCommand_initOptions = function _AadUserRecycleBinItemClearCommand_initOptions() {
+    this.options.unshift({
+        option: '--confirm'
+    });
+};
+module.exports = new AadUserRecycleBinItemClearCommand();
+//# sourceMappingURL=user-recyclebinitem-clear.js.map

package/dist/m365/aad/commands.js

@@ -60,6 +60,7 @@ exports.default = {
     USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,
+    USER_RECYCLEBINITEM_CLEAR: `${prefix} user recyclebinitem clear`,
     USER_SET: `${prefix} user set`,
     USER_SIGNIN_LIST: `${prefix} user signin list`
 };

package/dist/m365/base/O365MgmtCommand.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Command_1 = require("../../Command");
+class O365MgmtCommand extends Command_1.default {
+    get resource() {
+        return 'https://manage.office.com';
+    }
+}
+exports.default = O365MgmtCommand;
+//# sourceMappingURL=O365MgmtCommand.js.map

package/dist/m365/context/commands/option/option-list.js

@@ -0,0 +1,54 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const Command_1 = require("../../../../Command");
+const ContextCommand_1 = require("../../../base/ContextCommand");
+const commands_1 = require("../../commands");
+class ContextOptionListCommand extends ContextCommand_1.default {
+    get name() {
+        return commands_1.default.OPTION_LIST;
+    }
+    get description() {
+        return 'List all options added to the context';
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving context options...`);
+            }
+            const filePath = '.m365rc.json';
+            let m365rc = {};
+            if (fs.existsSync(filePath)) {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Reading context file...`);
+                    }
+                    const fileContents = fs.readFileSync(filePath, 'utf8');
+                    if (fileContents) {
+                        m365rc = JSON.parse(fileContents);
+                    }
+                }
+                catch (e) {
+                    throw new Command_1.CommandError(`Error reading ${filePath}: ${e}. Please retrieve context options from ${filePath} manually.`);
+                }
+            }
+            if (!m365rc.context) {
+                throw new Command_1.CommandError(`No context present`);
+            }
+            else {
+                logger.log(m365rc.context);
+            }
+        });
+    }
+}
+module.exports = new ContextOptionListCommand();
+//# sourceMappingURL=option-list.js.map

package/dist/m365/context/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'context';
 exports.default = {
     INIT: `${prefix} init`,
+    OPTION_LIST: `${prefix} option list`,
     OPTION_REMOVE: `${prefix} option remove`,
     OPTION_SET: `${prefix} option set`,
     REMOVE: `${prefix} remove`

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -21,6 +21,7 @@ const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const xmldom_1 = require("@xmldom/xmldom");
+const Cli_1 = require("../../../../cli/Cli");
 class GraphChangelogListCommand extends AnonymousCommand_1.default {
     get name() {
         return commands_1.default.CHANGELOG_LIST;
@@ -106,14 +107,14 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
             items: []
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
-            const description = args.options.output === 'text' ?
+            const description = Cli_1.Cli.shouldTrimOutput(args.options.output) ?
                 md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
                 category: item.getElementsByTagName('category').item(1).textContent,
                 title: item.getElementsByTagName('title').item(0).textContent,
-                description: args.options.output === 'text' ?
+                description: Cli_1.Cli.shouldTrimOutput(args.options.output) ?
                     description.length > 50 ? `${description.substring(0, 47)}...` : description :
                     description,
                 pubDate: new Date(item.getElementsByTagName('pubDate').item(0).textContent)

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

@@ -13,14 +13,14 @@ 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");
 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 OneNoteNotebookListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.NOTEBOOK_LIST;
@@ -28,61 +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) {
-                spo_1.spo.getSpoGraphSiteId(args.options.webUrl)
-                    .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(groupName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(groupName);
+            return group.id;
+        });
     }
-    getGroupId(args) {
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.groupName)
-            .then(group => 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* () {
@@ -100,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() {
@@ -113,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/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-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