@pnp/cli-microsoft365 7.0.0-beta.68abdfc → 7.0.0-beta.7e7b4f8

package/dist/Command.js

@@ -40,7 +40,7 @@ class CommandErrorWithOutput {
 exports.CommandErrorWithOutput = CommandErrorWithOutput;
 class Command {
     get allowedOutputs() {
-        return ['csv', 'json', 'md', 'text'];
+        return ['csv', 'json', 'md', 'text', 'none'];
     }
     constructor() {
         // These functions must be defined with # so that they're truly private

package/dist/cli/Cli.js

@@ -107,7 +107,9 @@ class Cli {
                 showHelp ||
                 parsedArgs.h ||
                 parsedArgs.help) {
-                this.printHelp(this.getHelpMode(parsedArgs));
+                if (parsedArgs.output !== 'none') {
+                    this.printHelp(this.getHelpMode(parsedArgs));
+                }
                 return Promise.resolve();
             }
             const optionsWithoutShorts = Cli.removeShortOptions(this.optionsFromArgs);
@@ -144,11 +146,21 @@ class Cli {
         return __awaiter(this, void 0, void 0, function* () {
             const logger = {
                 log: (message) => {
-                    const output = Cli.formatOutput(command, message, args.options);
-                    Cli.log(output);
+                    if (args.options.output !== 'none') {
+                        const output = Cli.formatOutput(command, message, args.options);
+                        Cli.log(output);
+                    }
+                },
+                logRaw: (message) => {
+                    if (args.options.output !== 'none') {
+                        Cli.log(message);
+                    }
                 },
-                logRaw: (message) => Cli.log(message),
-                logToStderr: (message) => Cli.error(message)
+                logToStderr: (message) => {
+                    if (args.options.output !== 'none') {
+                        Cli.error(message);
+                    }
+                }
             };
             if (args.options.debug) {
                 logger.logToStderr(`Executing command ${command.name} with options ${JSON.stringify(args)}`);
@@ -158,7 +170,7 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
-            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true);
+            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true) && args.options.output !== 'none';
             // don't show spinner if running tests
             /* c8 ignore next 3 */
             if (showSpinner && typeof global.it === 'undefined') {
@@ -207,7 +219,7 @@ class Cli {
                     logErr.push(message);
                 }
             };
-            if (args.options.debug) {
+            if (args.options.debug && args.options.output !== 'none') {
                 const message = `Executing command ${command.name} with options ${JSON.stringify(args)}`;
                 if (listener && listener.stderr) {
                     listener.stderr(message);
@@ -730,8 +742,11 @@ class Cli {
         Cli.log();
     }
     closeWithError(error, args, showHelpIfEnabled = false) {
-        const chalk = require('chalk');
         let exitCode = 1;
+        if (args.options.output === 'none') {
+            return process.exit(exitCode);
+        }
+        const chalk = require('chalk');
         let errorMessage = error instanceof Command_1.CommandError ? error.message : error;
         if ((!args.options.output || args.options.output === 'json') &&
             !this.getSettingWithDefaultValue(settingsNames_1.settingsNames.printErrorsAsPlainText, true)) {

package/dist/m365/aad/commands/user/user-get.js

@@ -50,6 +50,9 @@ class AadUserGetCommand extends GraphCommand_1.default {
             else if (args.options.email) {
                 requestUrl += `?$filter=mail eq '${formatting_1.formatting.encodeQueryParameter(args.options.email)}'${properties}`;
             }
+            if (args.options.withManager) {
+                requestUrl += '&$expand=manager($select=displayName,userPrincipalName,id,mail)';
+            }
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -82,7 +85,8 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
             id: typeof args.options.id !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
             email: typeof args.options.email !== 'undefined',
-            properties: args.options.properties
+            properties: args.options.properties,
+            withManager: typeof args.options.withManager !== 'undefined'
         });
     });
 }, _AadUserGetCommand_initOptions = function _AadUserGetCommand_initOptions() {
@@ -94,6 +98,8 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
         option: '--email [email]'
     }, {
         option: '-p, --properties [properties]'
+    }, {
+        option: '--withManager'
     });
 }, _AadUserGetCommand_initValidators = function _AadUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

package/dist/m365/booking/commands/business/business-get.js

@@ -56,26 +56,25 @@ class BookingBusinessGetCommand extends GraphCommand_1.default {
         });
     }
     getBusinessId(options) {
-        if (options.id) {
-            return Promise.resolve(options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const name = options.name;
             const bookingBusinesses = response.value.filter(val => { var _a; return ((_a = val.displayName) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === name.toLocaleLowerCase(); });
             if (!bookingBusinesses.length) {
-                return Promise.reject(`The specified business with name ${options.name} does not exist.`);
+                throw `The specified business with name ${options.name} does not exist.`;
             }
             if (bookingBusinesses.length > 1) {
-                return Promise.reject(`Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`);
+                throw `Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`;
             }
             return bookingBusinesses[0].id;
         });

package/dist/m365/cli/commands/config/config-set.js

@@ -73,7 +73,7 @@ _CliConfigSetCommand_instances = new WeakSet(), _CliConfigSetCommand_initTelemet
         if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
             return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
         }
-        const allowedOutputs = ['text', 'json', 'csv', 'md'];
+        const allowedOutputs = ['text', 'json', 'csv', 'md', 'none'];
         if (args.options.key === settingsNames_1.settingsNames.output &&
             allowedOutputs.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedOutputs.join(', ')}`;

package/dist/m365/pa/commands/app/app-owner-set.js

@@ -0,0 +1,115 @@
+"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 _PaAppOwnerSetCommand_instances, _PaAppOwnerSetCommand_initTelemetry, _PaAppOwnerSetCommand_initOptions, _PaAppOwnerSetCommand_initValidators, _PaAppOwnerSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadUser_1 = require("../../../../utils/aadUser");
+const validation_1 = require("../../../../utils/validation");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
+const commands_1 = require("../../commands");
+class PaAppOwnerSetCommand extends PowerAppsCommand_1.default {
+    get name() {
+        return commands_1.default.APP_OWNER_SET;
+    }
+    get description() {
+        return 'Sets a new owner for a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppOwnerSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppOwnerSetCommand_instances, "m", _PaAppOwnerSetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Setting new owner ${args.options.userId || args.options.userName} for Power Apps app ${args.options.appName}...`);
+            }
+            try {
+                const userId = yield this.getUserId(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/providers/Microsoft.PowerApps/scopes/admin/environments/${args.options.environmentName}/apps/${args.options.appName}/modifyAppOwner?api-version=2022-11-01`,
+                    headers: {
+                        accept: 'application/json',
+                        'Content-Type': 'application/json'
+                    },
+                    responseType: 'json',
+                    data: {
+                        roleForOldAppOwner: args.options.roleForOldAppOwner,
+                        newAppOwner: userId
+                    }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getUserId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.userId) {
+                return options.userId;
+            }
+            return aadUser_1.aadUser.getUserIdByUpn(options.userName);
+        });
+    }
+}
+_PaAppOwnerSetCommand_instances = new WeakSet(), _PaAppOwnerSetCommand_initTelemetry = function _PaAppOwnerSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            roleForOldAppOwner: typeof args.options.roleForOldAppOwner !== 'undefined'
+        });
+    });
+}, _PaAppOwnerSetCommand_initOptions = function _PaAppOwnerSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --environmentName <environmentName>'
+    }, {
+        option: '--appName <appName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--roleForOldAppOwner [roleForOldAppOwner]',
+        autocomplete: PaAppOwnerSetCommand.roleForOldAppOwner
+    });
+}, _PaAppOwnerSetCommand_initValidators = function _PaAppOwnerSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.appName)) {
+            return `${args.options.appName} is not a valid GUID for appName`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID for userId`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid UPN for userName`;
+        }
+        if (args.options.roleForOldAppOwner && PaAppOwnerSetCommand.roleForOldAppOwner.indexOf(args.options.roleForOldAppOwner) < 0) {
+            return `${args.options.roleForOldAppOwner} is not a valid roleForOldAppOwner. Allowed values are: ${PaAppOwnerSetCommand.roleForOldAppOwner.join(', ')}`;
+        }
+        return true;
+    }));
+}, _PaAppOwnerSetCommand_initOptionSets = function _PaAppOwnerSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
+};
+PaAppOwnerSetCommand.roleForOldAppOwner = ['CanView', 'CanEdit'];
+module.exports = new PaAppOwnerSetCommand();
+//# sourceMappingURL=app-owner-set.js.map

package/dist/m365/pa/commands/app/app-permission-list.js

@@ -0,0 +1,104 @@
+"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 _PaAppPermissionListCommand_instances, _PaAppPermissionListCommand_initTelemetry, _PaAppPermissionListCommand_initOptions, _PaAppPermissionListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
+const commands_1 = require("../../commands");
+class PaAppPermissionListCommand extends PowerAppsCommand_1.default {
+    get name() {
+        return commands_1.default.APP_PERMISSION_LIST;
+    }
+    get description() {
+        return 'Lists all permissions of a Power Apps app';
+    }
+    defaultProperties() {
+        return ['roleName', 'principalId', 'principalType'];
+    }
+    constructor() {
+        super();
+        _PaAppPermissionListCommand_instances.add(this);
+        this.allowedRoleNames = ['Owner', 'CanEdit', 'CanView'];
+        __classPrivateFieldGet(this, _PaAppPermissionListCommand_instances, "m", _PaAppPermissionListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionListCommand_instances, "m", _PaAppPermissionListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionListCommand_instances, "m", _PaAppPermissionListCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving permissions for app ${args.options.appName}${args.options.roleName !== undefined ? ` with role name ${args.options.roleName}` : ''}`);
+            }
+            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environmentName ? '/environments/' + formatting_1.formatting.encodeQueryParameter(args.options.environmentName) : ''}/apps/${args.options.appName}/permissions?api-version=2022-11-01`;
+            try {
+                let permissions = yield odata_1.odata.getAllItems(url);
+                if (args.options.roleName) {
+                    permissions = permissions.filter(permission => permission.properties.roleName === args.options.roleName);
+                }
+                if (args.options.output !== 'json') {
+                    permissions.forEach(permission => {
+                        permission.roleName = permission.properties.roleName;
+                        permission.principalId = permission.properties.principal.id;
+                        permission.principalType = permission.properties.principal.type;
+                    });
+                }
+                logger.log(permissions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PaAppPermissionListCommand_instances = new WeakSet(), _PaAppPermissionListCommand_initTelemetry = function _PaAppPermissionListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            roleName: typeof args.options.roleName !== 'undefined'
+        });
+    });
+}, _PaAppPermissionListCommand_initOptions = function _PaAppPermissionListCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--roleName [roleName]',
+        autocomplete: this.allowedRoleNames
+    });
+}, _PaAppPermissionListCommand_initValidators = function _PaAppPermissionListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.appName)) {
+            return `${args.options.appName} is not a valid GUID for appName.`;
+        }
+        if (args.options.roleName && !this.allowedRoleNames.includes(args.options.roleName)) {
+            return `${args.options.roleName} is not a valid roleName. Allowed values are ${this.allowedRoleNames.join(',')}`;
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying the environmentName is required when using asAdmin';
+        }
+        if (!args.options.asAdmin && args.options.environmentName) {
+            return 'Specifying environmentName is only allowed when using asAdmin';
+        }
+        return true;
+    }));
+};
+module.exports = new PaAppPermissionListCommand();
+//# sourceMappingURL=app-permission-list.js.map

package/dist/m365/pa/commands.js

@@ -7,6 +7,8 @@ exports.default = {
     APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,
     APP_CONSENT_SET: `${prefix} app consent set`,
+    APP_OWNER_SET: `${prefix} app owner set`,
+    APP_PERMISSION_LIST: `${prefix} app permission list`,
     CONNECTOR_EXPORT: `${prefix} connector export`,
     CONNECTOR_LIST: `${prefix} connector list`,
     ENVIRONMENT_GET: `${prefix} environment get`,

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

@@ -68,9 +68,13 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
             if (args.options.planId) {
                 return args.options.planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
-            return plan.id;
+            if (args.options.planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -88,6 +92,7 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         Object.assign(this.telemetryProperties, {
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             orderHint: typeof args.options.orderHint !== 'undefined'
@@ -100,6 +105,8 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
         option: "--planId [planId]"
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: "--ownerGroupId [ownerGroupId]"
     }, {
@@ -109,19 +116,16 @@ _PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_ini
     });
 }, _PlannerBucketAddCommand_initValidators = function _PlannerBucketAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-        }
-        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-        }
         if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
 }, _PlannerBucketAddCommand_initOptionSets = function _PlannerBucketAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['planId', 'planTitle'] });
+    this.optionSets.push({ options: ['planId', 'planTitle', 'rosterId'] }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map

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

@@ -75,13 +75,17 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getBucketById(id) {
@@ -114,6 +118,7 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
@@ -127,6 +132,8 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -135,24 +142,12 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
 }, _PlannerBucketGetCommand_initValidators = function _PlannerBucketGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planTitle || args.options.rosterId || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, rosterId, ownerGroupId or ownerGroupName when using id';
             }
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
-            }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
             if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
                 if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;
                 }
@@ -162,11 +157,22 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
                     return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
                 }
             }
+            if (args.options.rosterId) {
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
+                }
+            }
         }
         return true;
     }));
 }, _PlannerBucketGetCommand_initOptionSets = function _PlannerBucketGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

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

@@ -56,9 +56,13 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
             if (args.options.planId) {
                 return args.options.planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
-            return plan.id;
+            if (args.options.planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(args.options.rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -76,6 +80,7 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         Object.assign(this.telemetryProperties, {
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
         });
@@ -85,6 +90,8 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -92,19 +99,16 @@ _PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_i
     });
 }, _PlannerBucketListCommand_initValidators = function _PlannerBucketListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-        }
-        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
-            return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-        }
         if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
 }, _PlannerBucketListCommand_initOptionSets = function _PlannerBucketListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['planId', 'planTitle'] });
+    this.optionSets.push({ options: ['planId', 'planTitle', 'rosterId'] }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map