@pnp/cli-microsoft365 6.0.0-beta.b5f756a → 6.0.0-beta.b62b543

package/dist/Command.js

@@ -61,6 +61,9 @@ class Command {
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initOptions).call(this);
         __classPrivateFieldGet(this, _Command_instances, "m", _Command_initValidators).call(this);
     }
+    get allowedOutputs() {
+        return ['csv', 'json', 'text'];
+    }
     validateUnknownOptions(args, command) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.allowUnknownOptions()) {
@@ -135,6 +138,17 @@ class Command {
             return true;
         });
     }
+    validateOutput(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.output &&
+                this.allowedOutputs.indexOf(args.options.output) < 0) {
+                return `'${args.options.output}' is not a valid output type. Allowed output types are ${this.allowedOutputs.join(', ')}`;
+            }
+            else {
+                return true;
+            }
+        });
+    }
     alias() {
         return;
     }
@@ -417,9 +431,9 @@ _Command_instances = new WeakSet(), _Command_initTelemetry = function _Command_i
 }, _Command_initOptions = function _Command_initOptions() {
     this.options.unshift({ option: '--query [query]' }, {
         option: '-o, --output [output]',
-        autocomplete: ['csv', 'json', 'text']
+        autocomplete: this.allowedOutputs
     }, { option: '--verbose' }, { option: '--debug' });
 }, _Command_initValidators = function _Command_initValidators() {
-    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), (args, command) => this.validateOptionSets(args, command));
+    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), args => this.validateOutput(args), (args, command) => this.validateOptionSets(args, command));
 };
 //# sourceMappingURL=Command.js.map

package/dist/m365/aad/commands/app/app-add.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 _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators;
+var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const uuid_1 = require("uuid");
@@ -32,6 +32,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_ADD;
@@ -731,9 +732,6 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
     });
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.manifest && !args.options.name) {
-            return 'Specify either the name of the app to create or the manifest';
-        }
         if (args.options.platform &&
             AadAppAddCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppAddCommand.aadApplicationPlatform.join(', ')}`;
@@ -778,6 +776,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppAddCommand_initOptionSets = function _AadAppAddCommand_initOptionSets() {
+    this.optionSets.push(['name', 'manifest']);
 };
 AadAppAddCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 AadAppAddCommand.aadAppScopeConsentBy = ['admins', 'adminsAndUsers'];

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

@@ -0,0 +1,38 @@
+"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 odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadAppListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.APP_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of Azure AD app registrations';
+    }
+    defaultProperties() {
+        return ['appId', 'id', 'displayName', "signInAudience"];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const results = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/applications`);
+                logger.log(results);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new AadAppListCommand();
+//# sourceMappingURL=app-list.js.map

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

@@ -80,6 +80,7 @@ _AadUserGetCommand_instances = new WeakSet(), _AadUserGetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             userName: typeof args.options.userName !== 'undefined',
+            email: typeof args.options.email !== 'undefined',
             properties: args.options.properties
         });
     });

package/dist/m365/aad/commands/user/user-guest-add.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 _AadUserGuestAddCommand_instances, _AadUserGuestAddCommand_initTelemetry, _AadUserGuestAddCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserGuestAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserGuestAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.USER_GUEST_ADD;
+    }
+    get description() {
+        return 'Invite an external user to the organization';
+    }
+    defaultProperties() {
+        return ['id', 'inviteRedeemUrl', 'invitedUserDisplayName', 'invitedUserEmailAddress', 'invitedUserType', 'resetRedemption', 'sendInvitationMessage', 'status'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/invitations`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        invitedUserEmailAddress: args.options.emailAddress,
+                        inviteRedirectUrl: args.options.inviteRedirectUrl || 'https://myapplications.microsoft.com',
+                        invitedUserDisplayName: args.options.displayName,
+                        sendInvitationMessage: args.options.sendInvitationMessage,
+                        invitedUserMessageInfo: {
+                            customizedMessageBody: args.options.welcomeMessage,
+                            messageLanguage: args.options.messageLanguage || 'en-US',
+                            ccRecipients: args.options.ccRecipients ? this.mapEmailsToRecipients([args.options.ccRecipients]) : undefined
+                        }
+                    }
+                };
+                const result = yield request_1.default.post(requestOptions);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    mapEmailsToRecipients(emails) {
+        return emails.map(mail => ({
+            emailAddress: {
+                address: mail.trim()
+            }
+        }));
+    }
+}
+_AadUserGuestAddCommand_instances = new WeakSet(), _AadUserGuestAddCommand_initTelemetry = function _AadUserGuestAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            inviteRedirectUrl: typeof args.options.inviteRedirectUrl !== 'undefined',
+            welcomeMessage: typeof args.options.welcomeMessage !== 'undefined',
+            messageLanguage: typeof args.options.messageLanguage !== 'undefined',
+            ccRecipients: typeof args.options.ccRecipients !== 'undefined',
+            sendInvitationMessage: !!args.options.sendInvitationMessage
+        });
+    });
+}, _AadUserGuestAddCommand_initOptions = function _AadUserGuestAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--emailAddress <emailAddress>'
+    }, {
+        option: '--displayName [displayName]'
+    }, {
+        option: '--inviteRedirectUrl [inviteRedirectUrl]'
+    }, {
+        option: '--welcomeMessage [welcomeMessage]'
+    }, {
+        option: '--messageLanguage [messageLanguage]'
+    }, {
+        option: '--ccRecipients [ccRecipients]'
+    }, {
+        option: '--sendInvitationMessage'
+    });
+};
+module.exports = new AadUserGuestAddCommand();
+//# sourceMappingURL=user-guest-add.js.map

package/dist/m365/aad/commands.js

@@ -4,6 +4,7 @@ const prefix = 'aad';
 exports.default = {
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
+    APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_LIST: `${prefix} app role list`,
@@ -54,6 +55,7 @@ exports.default = {
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     USER_GET: `${prefix} user get`,
+    USER_GUEST_ADD: `${prefix} user guest add`,
     USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,

package/dist/m365/adaptivecard/commands/adaptivecard-send.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 _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators;
+var _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry, _AdaptiveCardSendCommand_initOptions, _AdaptiveCardSendCommand_initValidators, _AdaptiveCardSendCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
@@ -25,6 +25,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand_1.default {
         __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AdaptiveCardSendCommand_instances, "m", _AdaptiveCardSendCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SEND;
@@ -206,9 +207,6 @@ _AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_ini
     });
 }, _AdaptiveCardSendCommand_initValidators = function _AdaptiveCardSendCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.card && !args.options.title) {
-            return 'Specify either the title or the card to send';
-        }
         if (args.options.card) {
             try {
                 JSON.parse(args.options.card);
@@ -227,6 +225,8 @@ _AdaptiveCardSendCommand_instances = new WeakSet(), _AdaptiveCardSendCommand_ini
         }
         return true;
     }));
+}, _AdaptiveCardSendCommand_initOptionSets = function _AdaptiveCardSendCommand_initOptionSets() {
+    this.optionSets.push(['title', 'card']);
 };
 module.exports = new AdaptiveCardSendCommand();
 //# sourceMappingURL=adaptivecard-send.js.map

package/dist/m365/base/SpoCommand.js

@@ -24,23 +24,24 @@ class SpoCommand extends Command_1.default {
     getNamesOfOptionsWithUrls() {
         const namesOfOptionsWithUrls = [
             'appCatalogUrl',
-            'siteUrl',
-            'webUrl',
-            'origin',
-            'url',
-            'imageUrl',
             'actionUrl',
-            'logoUrl',
+            'imageUrl',
             'libraryUrl',
-            'thumbnailUrl',
-            'targetUrl',
+            'logoUrl',
             'newSiteUrl',
-            'previewImageUrl',
             'NoAccessRedirectUrl',
-            'StartASiteFormUrl',
             'OrgNewsSiteUrl',
+            'origin',
+            'parentUrl',
             'parentWebUrl',
-            'siteLogoUrl'
+            'previewImageUrl',
+            'siteLogoUrl',
+            'siteUrl',
+            'StartASiteFormUrl',
+            'targetUrl',
+            'thumbnailUrl',
+            'url',
+            'webUrl'
         ];
         const excludedOptionsWithUrls = this.getExcludedOptionsWithUrls();
         if (!excludedOptionsWithUrls) {

package/dist/m365/commands/status.js

@@ -37,12 +37,17 @@ class StatusCommand extends Command_1.default {
                     logger.logToStderr({
                         connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
                         authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant,
                         accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
                     });
                 }
                 else {
                     logger.log({
-                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                        connectedAs: accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        appId: Auth_1.default.service.appId,
+                        appTenant: Auth_1.default.service.tenant
                     });
                 }
             }

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

@@ -0,0 +1,97 @@
+"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 _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry, _OutlookMessageGetCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OutlookMessageGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves specified message';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                }
+                let requestUrl = '';
+                if (isAppOnlyAuth) {
+                    if (!args.options.userId && !args.options.userPrincipalName) {
+                        throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                    }
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                    }
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                }
+                else {
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                    }
+                    if (args.options.userId || args.options.userPrincipalName) {
+                        requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                    }
+                    else {
+                        requestUrl += 'me';
+                    }
+                }
+                requestUrl += `/messages/${args.options.id}`;
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${requestUrl}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_initTelemetry = function _OutlookMessageGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+        });
+    });
+}, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userPrincipalName [userPrincipalName]'
+    });
+};
+module.exports = new OutlookMessageGetCommand();
+//# sourceMappingURL=message-get.js.map

package/dist/m365/outlook/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'outlook';
 exports.default = {
     MAIL_SEND: `${prefix} mail send`,
+    MESSAGE_GET: `${prefix} message get`,
     MESSAGE_LIST: `${prefix} message list`,
     MESSAGE_MOVE: `${prefix} message move`,
     REPORT_MAILACTIVITYCOUNTS: `${prefix} report mailactivitycounts`,

package/dist/m365/planner/commands/bucket/bucket-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 _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators;
+var _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators, _PlannerBucketGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -30,6 +30,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.BUCKET_GET;
@@ -144,9 +145,6 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
             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.name) {
-                return 'Specify either id or name';
-            }
         }
         if (args.options.name) {
             if (!args.options.planId && !args.options.planTitle) {
@@ -172,11 +170,10 @@ _PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_ini
                 }
             }
         }
-        if (!args.options.id && !args.options.name) {
-            return 'Please specify id or name';
-        }
         return true;
     }));
+}, _PlannerBucketGetCommand_initOptionSets = function _PlannerBucketGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

package/dist/m365/planner/commands/plan/plan-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 _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators;
+var _PlannerPlanGetCommand_instances, _PlannerPlanGetCommand_initTelemetry, _PlannerPlanGetCommand_initOptions, _PlannerPlanGetCommand_initValidators, _PlannerPlanGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -30,6 +30,7 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerPlanGetCommand_instances, "m", _PlannerPlanGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.PLAN_GET;
@@ -111,25 +112,19 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initValidators = function _PlannerPlanGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.title) {
-            return 'Specify either id or title but not both';
+        if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName';
         }
-        if (!args.options.id) {
-            if (!args.options.title) {
-                return 'Specify either id or title';
-            }
-            if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName';
-            }
-            if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
-                return 'Specify either ownerGroupId or ownerGroupName but not both';
-            }
-            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
-                return `${args.options.ownerGroupId} is not a valid GUID`;
-            }
+        if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName but not both';
+        }
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _PlannerPlanGetCommand_initOptionSets = function _PlannerPlanGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new PlannerPlanGetCommand();
 //# sourceMappingURL=plan-get.js.map