@pnp/cli-microsoft365 6.11.0-beta.ee225fb → 6.11.0

package/dist/Auth.js

@@ -588,7 +588,8 @@ class Auth {
             resource = resource.substr(0, pos);
         }
         if (resource === 'https://api.bap.microsoft.com' ||
-            resource === 'https://api.powerapps.com') {
+            resource === 'https://api.powerapps.com' ||
+            resource.endsWith('.api.bap.microsoft.com')) {
             resource = 'https://service.powerapps.com/';
         }
         if (resource === 'https://api.powerbi.com') {

package/dist/Command.js

@@ -168,7 +168,7 @@ class Command {
             const resultOptionValue = yield inquirer
                 .prompt({
                 name: 'missingRequiredOptionValue',
-                message: `Value for '${missingRequiredOptionName}':`
+                message: `${missingRequiredOptionName}:`
             });
             args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
             Cli_1.Cli.log();

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

@@ -0,0 +1,177 @@
+"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 _PaAppPermissionEnsureCommand_instances, _PaAppPermissionEnsureCommand_initTelemetry, _PaAppPermissionEnsureCommand_initOptions, _PaAppPermissionEnsureCommand_initValidators, _PaAppPermissionEnsureCommand_initOptionSets, _PaAppPermissionEnsureCommand_initTypes;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const validation_1 = require("../../../../utils/validation");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+const accessToken_1 = require("../../../../utils/accessToken");
+const Auth_1 = require("../../../../Auth");
+class PaAppPermissionEnsureCommand extends PowerAppsCommand_1.default {
+    get name() {
+        return commands_1.default.APP_PERMISSION_ENSURE;
+    }
+    get description() {
+        return 'Assigns/updates permissions to a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppPermissionEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionEnsureCommand_instances, "m", _PaAppPermissionEnsureCommand_initTypes).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Assigning/updating permissions for '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' to the Power Apps app '${args.options.appName}'...`);
+            }
+            try {
+                const principalId = yield this.getPrincipalId(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/providers/Microsoft.PowerApps/${args.options.asAdmin ? `scopes/admin/environments/${args.options.environmentName}/` : ''}apps/${args.options.appName}/modifyPermissions?api-version=2022-11-01`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    data: {
+                        put: [
+                            {
+                                properties: {
+                                    principal: {
+                                        id: principalId,
+                                        type: this.getPrincipalType(args.options)
+                                    },
+                                    NotifyShareTargetOption: args.options.sendInvitationMail ? 'Notify' : 'DoNotNotify',
+                                    roleName: args.options.roleName
+                                }
+                            }
+                        ]
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getPrincipalType(options) {
+        if (options.userId || options.userName) {
+            return 'User';
+        }
+        if (options.groupId || options.groupName) {
+            return 'Group';
+        }
+        return 'Tenant';
+    }
+    getPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.groupId) {
+                return options.groupId;
+            }
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.groupName) {
+                const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(options.groupName);
+                return group.id;
+            }
+            if (options.userName) {
+                const userId = yield aadUser_1.aadUser.getUserIdByUpn(options.userName);
+                return userId;
+            }
+            return accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken);
+        });
+    }
+}
+_PaAppPermissionEnsureCommand_instances = new WeakSet(), _PaAppPermissionEnsureCommand_initTelemetry = function _PaAppPermissionEnsureCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            tenant: !!args.options.tenant,
+            sendInvitationMail: !!args.options.sendInvitationMail,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PaAppPermissionEnsureCommand_initOptions = function _PaAppPermissionEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--roleName <roleName>',
+        autocomplete: PaAppPermissionEnsureCommand.roleNames
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--tenant'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--sendInvitationMail'
+    }, {
+        option: '--asAdmin'
+    });
+}, _PaAppPermissionEnsureCommand_initValidators = function _PaAppPermissionEnsureCommand_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.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID for groupId.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid user principal name (UPN) for userName.`;
+        }
+        if (PaAppPermissionEnsureCommand.roleNames.indexOf(args.options.roleName) < 0) {
+            return `${args.options.roleName} is not a valid roleName. Allowed values are: ${PaAppPermissionEnsureCommand.roleNames.join(', ')}.`;
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'Specifying environmentName is only allowed when using asAdmin.';
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying asAdmin is only allowed when using environmentName.';
+        }
+        if (args.options.tenant && args.options.roleName !== 'CanView') {
+            return 'Sharing with the entire tenant is only supported with CanView role.';
+        }
+        return true;
+    }));
+}, _PaAppPermissionEnsureCommand_initOptionSets = function _PaAppPermissionEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
+}, _PaAppPermissionEnsureCommand_initTypes = function _PaAppPermissionEnsureCommand_initTypes() {
+    this.types.string.push('appName', 'roleName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
+};
+PaAppPermissionEnsureCommand.roleNames = ['CanEdit', 'CanView'];
+module.exports = new PaAppPermissionEnsureCommand();
+//# sourceMappingURL=app-permission-ensure.js.map

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

@@ -0,0 +1,170 @@
+"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 _PaAppPermissionRemoveCommand_instances, _PaAppPermissionRemoveCommand_initTelemetry, _PaAppPermissionRemoveCommand_initOptions, _PaAppPermissionRemoveCommand_initValidators, _PaAppPermissionRemoveCommand_initOptionSets, _PaAppPermissionRemoveCommand_initTypes;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const validation_1 = require("../../../../utils/validation");
+const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
+const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+const accessToken_1 = require("../../../../utils/accessToken");
+const Auth_1 = require("../../../../Auth");
+const Cli_1 = require("../../../../cli/Cli");
+class PaAppPermissionRemoveCommand extends PowerAppsCommand_1.default {
+    get name() {
+        return commands_1.default.APP_PERMISSION_REMOVE;
+    }
+    get description() {
+        return 'Removes permissions to a Power Apps app';
+    }
+    constructor() {
+        super();
+        _PaAppPermissionRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _PaAppPermissionRemoveCommand_instances, "m", _PaAppPermissionRemoveCommand_initTypes).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.confirm) {
+                    yield this.removeAppPermission(logger, args.options);
+                }
+                else {
+                    const result = yield Cli_1.Cli.prompt({
+                        type: 'confirm',
+                        name: 'continue',
+                        default: false,
+                        message: `Are you sure you want to remove the permissions of '${args.options.userId || args.options.userName || args.options.groupId || args.options.groupName || (args.options.tenant && 'everyone')}' from the Power App '${args.options.appName}'?`
+                    });
+                    if (result.continue) {
+                        yield this.removeAppPermission(logger, args.options);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeAppPermission(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing permissions for '${options.userId || options.userName || options.groupId || options.groupName || (options.tenant && 'everyone')}' for the Power Apps app ${options.appName}...`);
+            }
+            const principalId = yield this.getPrincipalId(options);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/${options.asAdmin ? `scopes/admin/environments/${options.environmentName}/` : ''}apps/${options.appName}/modifyPermissions?api-version=2022-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                data: {
+                    delete: [
+                        {
+                            id: principalId
+                        }
+                    ]
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.groupId) {
+                return options.groupId;
+            }
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.groupName) {
+                const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(options.groupName);
+                return group.id;
+            }
+            if (options.userName) {
+                const userId = yield aadUser_1.aadUser.getUserIdByUpn(options.userName);
+                return userId;
+            }
+            return `tenant-${accessToken_1.accessToken.getTenantIdFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)}`;
+        });
+    }
+}
+_PaAppPermissionRemoveCommand_instances = new WeakSet(), _PaAppPermissionRemoveCommand_initTelemetry = function _PaAppPermissionRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            tenant: !!args.options.tenant,
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PaAppPermissionRemoveCommand_initOptions = function _PaAppPermissionRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '--appName <appName>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--tenant'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--confirm'
+    });
+}, _PaAppPermissionRemoveCommand_initValidators = function _PaAppPermissionRemoveCommand_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 user principal name (UPN) for userName.`;
+        }
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID for groupId.`;
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'Specifying environmentName is only allowed when using asAdmin';
+        }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'Specifying asAdmin is only allowed when using environmentName';
+        }
+        return true;
+    }));
+}, _PaAppPermissionRemoveCommand_initOptionSets = function _PaAppPermissionRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName', 'groupId', 'groupName', 'tenant'] });
+}, _PaAppPermissionRemoveCommand_initTypes = function _PaAppPermissionRemoveCommand_initTypes() {
+    this.types.string.push('appName', 'userId', 'userName', 'groupId', 'groupName', 'environmentName');
+};
+module.exports = new PaAppPermissionRemoveCommand();
+//# sourceMappingURL=app-permission-remove.js.map

package/dist/m365/pa/commands.js

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

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

@@ -163,9 +163,15 @@ class PlannerTaskAddCommand 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.rosterId) {
+                const plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
+                return plan.id;
+            }
+            else {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+                return plan.id;
+            }
         });
     }
     getGroupId(args) {
@@ -214,6 +220,7 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         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',
             bucketId: typeof args.options.bucketId !== 'undefined',
@@ -232,7 +239,7 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         });
     });
 }, _PlannerTaskAddCommand_initOptions = function _PlannerTaskAddCommand_initOptions() {
-    this.options.unshift({ option: '-t, --title <title>' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, {
+    this.options.unshift({ option: '-t, --title <title>' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--rosterId [rosterId]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--startDateTime [startDateTime]' }, { option: '--dueDateTime [dueDateTime]' }, { option: '--percentComplete [percentComplete]' }, { option: '--assignedToUserIds [assignedToUserIds]' }, { option: '--assignedToUserNames [assignedToUserNames]' }, { option: '--assigneePriority [assigneePriority]' }, { option: '--description [description]' }, {
         option: '--appliedCategories [appliedCategories]',
         autocomplete: this.allowedAppliedCategories
     }, {
@@ -241,12 +248,6 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
     }, { option: '--orderHint [orderHint]' }, { option: '--priority [priority]', autocomplete: taskPriority_1.taskPriority.priorityValues });
 }, _PlannerTaskAddCommand_initValidators = function _PlannerTaskAddCommand_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`;
         }
@@ -287,7 +288,12 @@ _PlannerTaskAddCommand_instances = new WeakSet(), _PlannerTaskAddCommand_initTel
         return true;
     }));
 }, _PlannerTaskAddCommand_initOptionSets = function _PlannerTaskAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['planId', 'planTitle'] }, { options: ['bucketId', 'bucketName'] });
+    this.optionSets.push({ options: ['planId', 'planTitle', 'rosterId'] }, { options: ['bucketId', 'bucketName'] }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.planTitle !== undefined;
+        }
+    });
 };
 module.exports = new PlannerTaskAddCommand();
 //# sourceMappingURL=task-add.js.map

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

@@ -131,9 +131,15 @@ class PlannerTaskGetCommand extends GraphCommand_1.default {
             if (options.planId) {
                 return options.planId;
             }
-            const groupId = yield this.getGroupId(options);
-            const plan = yield planner_1.planner.getPlanByTitle(options.planTitle, groupId);
-            return plan.id;
+            if (options.rosterId) {
+                const plan = yield planner_1.planner.getPlanByRosterId(options.rosterId);
+                return plan.id;
+            }
+            else {
+                const groupId = yield this.getGroupId(options);
+                const plan = yield planner_1.planner.getPlanByTitle(options.planTitle, groupId);
+                return plan.id;
+            }
         });
     }
     getGroupId(options) {
@@ -154,46 +160,50 @@ _PlannerTaskGetCommand_instances = new WeakSet(), _PlannerTaskGetCommand_initTel
             bucketId: typeof args.options.bucketId !== 'undefined',
             bucketName: typeof args.options.bucketName !== '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'
         });
     });
 }, _PlannerTaskGetCommand_initOptions = function _PlannerTaskGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '--bucketId [bucketId]' }, { option: '--bucketName [bucketName]' }, { option: '--planId [planId]' }, { option: '--planTitle [planTitle]' }, { option: '--rosterId [rosterId]' }, { option: '--ownerGroupId [ownerGroupId]' }, { option: '--ownerGroupName [ownerGroupName]' });
 }, _PlannerTaskGetCommand_initValidators = function _PlannerTaskGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
             if (args.options.bucketId || args.options.bucketName ||
-                args.options.planId || args.options.planName || args.options.planTitle ||
+                args.options.planId || args.options.planTitle || args.options.rosterId ||
                 args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify bucketId, bucketName, planId, planTitle, ownerGroupId or ownerGroupName when using id';
+                return 'Don\'t specify bucketId, bucketName, planId, planTitle, rosterId, ownerGroupId or ownerGroupName when using id';
             }
         }
-        if (args.options.title && !args.options.bucketId && !args.options.bucketName) {
-            return 'Specify either bucketId or bucketName when using title';
-        }
-        if (args.options.title && args.options.bucketId && args.options.bucketName) {
-            return 'Specify either bucketId or bucketName when using title but not both';
-        }
-        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
-            return 'Specify either planId or planTitle when using bucketName';
-        }
-        if (args.options.bucketName && args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle when using bucketName but not both';
-        }
-        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;
     }));
 }, _PlannerTaskGetCommand_initOptionSets = function _PlannerTaskGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
+    this.optionSets.push({ options: ['id', 'title'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => {
+            return args.options.id === undefined;
+        }
+    }, {
+        options: ['bucketId', 'bucketName'],
+        runsWhen: (args) => {
+            return args.options.title !== undefined;
+        }
+    }, {
+        options: ['planId', 'planTitle'],
+        runsWhen: (args) => {
+            return args.options.bucketName !== undefined && args.options.rosterId === undefined;
+        }
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.planTitle !== undefined;
+        }
+    });
 };
 module.exports = new PlannerTaskGetCommand();
 //# sourceMappingURL=task-get.js.map

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators;
+var _PlannerTaskListCommand_instances, _PlannerTaskListCommand_initTelemetry, _PlannerTaskListCommand_initOptions, _PlannerTaskListCommand_initValidators, _PlannerTaskListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const odata_1 = require("../../../../utils/odata");
@@ -39,6 +39,7 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerTaskListCommand_instances, "m", _PlannerTaskListCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -107,9 +108,15 @@ class PlannerTaskListCommand extends GraphCommand_1.default {
             if (args.options.planId) {
                 return formatting_1.formatting.encodeQueryParameter(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.rosterId) {
+                const plan = yield planner_1.planner.getPlanByRosterId(args.options.rosterId);
+                return plan.id;
+            }
+            else {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(args.options.planTitle, groupId);
+                return plan.id;
+            }
         });
     }
     getGroupId(args) {
@@ -140,6 +147,7 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
             bucketName: typeof args.options.bucketName !== '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'
         });
@@ -153,6 +161,8 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
         option: '--planId [planId]'
     }, {
         option: '--planTitle [planTitle]'
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -160,26 +170,23 @@ _PlannerTaskListCommand_instances = new WeakSet(), _PlannerTaskListCommand_initT
     });
 }, _PlannerTaskListCommand_initValidators = function _PlannerTaskListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.bucketId && args.options.bucketName) {
-            return 'To retrieve tasks from a bucket, specify bucketId or bucketName, but not both';
-        }
-        if (args.options.bucketName && !args.options.planId && !args.options.planTitle) {
-            return 'Specify either planId or planTitle when using bucketName';
-        }
-        if (args.options.planId && args.options.planTitle) {
-            return 'Specify either planId or planTitle but not both';
-        }
-        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;
     }));
+}, _PlannerTaskListCommand_initOptionSets = function _PlannerTaskListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['bucketId', 'bucketName'] }, {
+        options: ['planId', 'planTitle'],
+        runsWhen: (args) => {
+            return args.options.bucketName !== undefined && args.options.rosterId === undefined;
+        }
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => {
+            return args.options.planTitle !== undefined;
+        }
+    });
 };
 module.exports = new PlannerTaskListCommand();
 //# sourceMappingURL=task-list.js.map