@pnp/cli-microsoft365 6.3.0-beta.37c6261 → 6.3.0-beta.456e93a

package/.eslintrc.js

@@ -24,6 +24,8 @@ const dictionary = [
   'customizer',
   'dataverse',
   'default',
+  'event',
+  'eventreceiver',
   'external',
   'externalize',
   'fun',

package/dist/Command.js

@@ -484,15 +484,15 @@ class Command {
                 const title = this.getLogItemTitle(l);
                 const id = this.getLogItemId(l);
                 if (title && id) {
-                    output.push(`## ${title} (${id})`);
+                    output.push(`## ${title} (${id})`, os.EOL, os.EOL);
                 }
                 else if (title) {
-                    output.push(`## ${title}`);
+                    output.push(`## ${title}`, os.EOL, os.EOL);
                 }
                 else if (id) {
-                    output.push(`## ${id}`);
+                    output.push(`## ${id}`, os.EOL, os.EOL);
                 }
-                output.push(os.EOL, os.EOL, `Property | Value`, 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

@@ -118,6 +118,8 @@ class Cli {
             }
             try {
                 // process options before passing them on to validation stage
+                const contextCommandOptions = this.loadOptionsFromContext(this.commandToExecute.options, optionsWithoutShorts.options.debug);
+                optionsWithoutShorts.options = Object.assign(Object.assign({}, contextCommandOptions), optionsWithoutShorts.options);
                 yield this.commandToExecute.command.processOptions(optionsWithoutShorts.options);
             }
             catch (e) {
@@ -283,6 +285,42 @@ class Cli {
         }
         this.loadCommandFromFile(commandFilePath);
     }
+    loadOptionsFromContext(commandOptions, debug) {
+        const filePath = '.m365rc.json';
+        let m365rc = {};
+        if (!fs.existsSync(filePath)) {
+            return;
+        }
+        if (debug) {
+            Cli.error('found .m365rc.json file');
+        }
+        try {
+            const fileContents = fs.readFileSync(filePath, 'utf8');
+            if (fileContents) {
+                m365rc = JSON.parse(fileContents);
+            }
+        }
+        catch (e) {
+            this.closeWithError(`Error parsing ${filePath}`, { options: {} });
+        }
+        if (!m365rc.context) {
+            return;
+        }
+        if (debug) {
+            Cli.error('found context in .m365rc.json file');
+        }
+        const context = m365rc.context;
+        const foundOptions = {};
+        commandOptions.forEach(option => {
+            if (context[option.name]) {
+                foundOptions[option.name] = context[option.name];
+                if (debug) {
+                    Cli.error(`returning ${option.name} option from context`);
+                }
+            }
+        });
+        return foundOptions;
+    }
     /**
      * Loads command from the specified file into CLI. If can't find the file
      * or the file doesn't contain a command, loads all available commands.

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: `${this.resource}/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/user/user-recyclebinitem-remove.js

@@ -0,0 +1,92 @@
+"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 _AadUserRecycleBinItemRemoveCommand_instances, _AadUserRecycleBinItemRemoveCommand_initTelemetry, _AadUserRecycleBinItemRemoveCommand_initOptions, _AadUserRecycleBinItemRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserRecycleBinItemRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.USER_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Removes a user from the recycle bin in the current tenant';
+    }
+    constructor() {
+        super();
+        _AadUserRecycleBinItemRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemRemoveCommand_instances, "m", _AadUserRecycleBinItemRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemRemoveCommand_instances, "m", _AadUserRecycleBinItemRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadUserRecycleBinItemRemoveCommand_instances, "m", _AadUserRecycleBinItemRemoveCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearRecycleBinItem = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Permanently deleting user with id ${args.options.id} from Azure Active Directory`);
+                }
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
+                        headers: {}
+                    };
+                    yield request_1.default.delete(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield clearRecycleBinItem();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to permanently delete the user with id ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield clearRecycleBinItem();
+                }
+            }
+        });
+    }
+}
+_AadUserRecycleBinItemRemoveCommand_instances = new WeakSet(), _AadUserRecycleBinItemRemoveCommand_initTelemetry = function _AadUserRecycleBinItemRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _AadUserRecycleBinItemRemoveCommand_initOptions = function _AadUserRecycleBinItemRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--id <id>'
+    }, {
+        option: '--confirm'
+    });
+}, _AadUserRecycleBinItemRemoveCommand_initValidators = function _AadUserRecycleBinItemRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }));
+};
+module.exports = new AadUserRecycleBinItemRemoveCommand();
+//# sourceMappingURL=user-recyclebinitem-remove.js.map

package/dist/m365/aad/commands.js

@@ -60,6 +60,8 @@ 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_RECYCLEBINITEM_REMOVE: `${prefix} user recyclebinitem remove`,
     USER_SET: `${prefix} user set`,
     USER_SIGNIN_LIST: `${prefix} user signin list`
 };

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/flow/commands/environment/FlowEnvironmentDetails.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=FlowEnvironmentDetails.js.map

package/dist/m365/flow/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 _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions;
+var _FlowEnvironmentGetCommand_instances, _FlowEnvironmentGetCommand_initOptions, _FlowEnvironmentGetCommand_initTelemetry;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -33,27 +33,36 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
         super();
         _FlowEnvironmentGetCommand_instances.add(this);
         __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FlowEnvironmentGetCommand_instances, "m", _FlowEnvironmentGetCommand_initTelemetry).call(this);
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving information about Microsoft Flow environment ${args.options.name}...`);
+                logger.logToStderr(`Retrieving information about Microsoft Flow environment ${(_a = args.options.name) !== null && _a !== void 0 ? _a : ''}...`);
+            }
+            let requestUrl = `${this.resource}providers/Microsoft.ProcessSimple/environments/`;
+            if (args.options.name) {
+                requestUrl += `${formatting_1.formatting.encodeQueryParameter(args.options.name)}`;
+            }
+            else {
+                requestUrl += `~default`;
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${requestUrl}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
                 responseType: 'json'
             };
             try {
-                const res = yield request_1.default.get(requestOptions);
-                res.displayName = res.properties.displayName;
-                res.provisioningState = res.properties.provisioningState;
-                res.environmentSku = res.properties.environmentSku;
-                res.azureRegionHint = res.properties.azureRegionHint;
-                res.isDefault = res.properties.isDefault;
-                logger.log(res);
+                const flowItem = yield request_1.default.get(requestOptions);
+                flowItem.displayName = flowItem.properties.displayName;
+                flowItem.provisioningState = flowItem.properties.provisioningState;
+                flowItem.environmentSku = flowItem.properties.environmentSku;
+                flowItem.azureRegionHint = flowItem.properties.azureRegionHint;
+                flowItem.isDefault = flowItem.properties.isDefault;
+                logger.log(flowItem);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -63,7 +72,13 @@ class FlowEnvironmentGetCommand extends AzmgmtCommand_1.default {
 }
 _FlowEnvironmentGetCommand_instances = new WeakSet(), _FlowEnvironmentGetCommand_initOptions = function _FlowEnvironmentGetCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --name <name>'
+        option: '-n, --name [name]'
+    });
+}, _FlowEnvironmentGetCommand_initTelemetry = function _FlowEnvironmentGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined'
+        });
     });
 };
 module.exports = new FlowEnvironmentGetCommand();

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,11 +48,18 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
                     logger.log(result);
                 }
                 else {
-                    let groupId = undefined;
-                    if (args.options.ownerGroupId || args.options.ownerGroupName) {
-                        groupId = yield this.getGroupId(args);
+                    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 plan = yield planner_1.planner.getPlanByTitle(args.options.title, groupId, args.options.rosterId);
                     const result = yield this.getPlanDetails(plan);
                     if (result) {
                         logger.log(result);
@@ -93,9 +100,9 @@ _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',
-            rosterId: typeof args.options.rosterId !== 'undefined'
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
     });
 }, _PlannerPlanGetCommand_initOptions = function _PlannerPlanGetCommand_initOptions() {
@@ -103,12 +110,12 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
         option: '--ownerGroupName [ownerGroupName]'
-    }, {
-        option: '--rosterId [rosterId]'
     });
 }, _PlannerPlanGetCommand_initValidators = function _PlannerPlanGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -119,9 +126,9 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     }));
 }, _PlannerPlanGetCommand_initOptionSets = function _PlannerPlanGetCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['id', 'title']
+        options: ['id', 'title', 'rosterId']
     }, {
-        options: ['ownerGroupId', 'ownerGroupName', 'rosterId'],
+        options: ['ownerGroupId', 'ownerGroupName'],
         runsWhen: (args) => {
             return args.options.title !== undefined;
         }

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