@pnp/cli-microsoft365 5.1.0 → 5.2.0-beta.307d8f5

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -63,10 +63,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6',
                     fix: 'Install Node.js v6'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.All,
                 yo: {
                     range: '^3',
@@ -82,10 +78,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6',
                     fix: 'Install Node.js v6'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.All,
                 yo: {
                     range: '^3',
@@ -101,10 +93,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6',
                     fix: 'Install Node.js v6'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.SP2019 | SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -120,10 +108,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6',
                     fix: 'Install Node.js v6'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.SP2019 | SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -139,10 +123,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6 || ^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.SP2019 | SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -158,10 +138,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6 || ^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -177,10 +153,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6 || ^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -196,10 +168,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^6 || ^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '^15',
-                    fix: 'npm i react@15'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -215,10 +183,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '16.3.2',
-                    fix: 'npm i react@16.3.2'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -234,10 +198,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '16.3.2',
-                    fix: 'npm i react@16.3.2'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -253,10 +213,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '16.7.0',
-                    fix: 'npm i react@16.7.0'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -272,10 +228,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^8',
                     fix: 'Install Node.js v8'
                 },
-                react: {
-                    range: '16.7.0',
-                    fix: 'npm i react@16.7.0'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -291,10 +243,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^8 || ^10',
                     fix: 'Install Node.js v10'
                 },
-                react: {
-                    range: '16.7.0',
-                    fix: 'npm i react@16.7.0'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -310,10 +258,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^8 || ^10',
                     fix: 'Install Node.js v10'
                 },
-                react: {
-                    range: '16.8.5',
-                    fix: 'npm i react@16.8.5'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -329,10 +273,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^10',
                     fix: 'Install Node.js v10'
                 },
-                react: {
-                    range: '16.8.5',
-                    fix: 'npm i react@16.8.5'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -348,10 +288,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^10',
                     fix: 'Install Node.js v10'
                 },
-                react: {
-                    range: '16.8.5',
-                    fix: 'npm i react@16.8.5'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -367,10 +303,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^10',
                     fix: 'Install Node.js v10'
                 },
-                react: {
-                    range: '16.8.5',
-                    fix: 'npm i react@16.8.5'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -386,10 +318,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^12',
                     fix: 'Install Node.js v12'
                 },
-                react: {
-                    range: '16.9.0',
-                    fix: 'npm i react@16.9.0'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -405,10 +333,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^12 || ^14',
                     fix: 'Install Node.js v12 or v14'
                 },
-                react: {
-                    range: '16.9.36',
-                    fix: 'npm i react@16.9.36'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^3',
@@ -424,10 +348,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^12 || ^14',
                     fix: 'Install Node.js v12 or v14'
                 },
-                react: {
-                    range: '16.9.51',
-                    fix: 'npm i react@16.9.51'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^4',
@@ -443,10 +363,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^12 || ^14',
                     fix: 'Install Node.js v12 or v14'
                 },
-                react: {
-                    range: '16.9.51',
-                    fix: 'npm i react@16.9.51'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^4',
@@ -462,10 +378,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^12 || ^14',
                     fix: 'Install Node.js v12 or v14'
                 },
-                react: {
-                    range: '16.9.51',
-                    fix: 'npm i react@16.9.51'
-                },
                 sp: SharePointVersion.SPO,
                 yo: {
                     range: '^4',
@@ -511,7 +423,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             .then(_ => this.checkNodeVersion(prerequisites, fixes, logger))
             .then(_ => this.checkYo(prerequisites, fixes, logger))
             .then(_ => this.checkGulp(prerequisites, fixes, logger))
-            .then(_ => this.checkReact(prerequisites, fixes, logger))
             .then(_ => this.checkTypeScript(fixes, logger))
             .then(_ => {
             if (fixes.length > 0) {
@@ -586,13 +497,6 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             }
         });
     }
-    checkReact(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('react', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger)
-            .then((reactVersion) => {
-            this.checkStatus('react', reactVersion, prerequisites.react, OptionalOrRequired.Optional, fixes, logger);
-        });
-    }
     checkTypeScript(fixes, logger) {
         return this
             .getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger)
@@ -713,15 +617,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         return process.version.substr(1);
     }
     checkStatus(what, versionFound, versionCheck, optionalOrRequired, fixes, logger) {
-        if (!versionFound) {
-            // TODO: we might need this code in the future if SPFx introduces required
-            // prerequisites with a specific version
-            // if (optionalOrRequired === OptionalOrRequired.Required) {
-            //   logger.log(this.getStatus(CheckStatus.Failure, `${what} not found, v${versionCheck.range} required`));
-            //   fixes.push(versionCheck.fix);
-            // }
-        }
-        else {
+        if (versionFound) {
             if ((0, semver_1.satisfies)(versionFound, versionCheck.range)) {
                 logger.log(this.getStatus(CheckStatus.Success, `${what} v${versionFound}`));
             }

package/dist/m365/spo/commands/file/file-checkout.js

@@ -62,10 +62,10 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
             }
         }
         if (args.options.id && args.options.fileUrl) {
-            return 'Specify either URL or UniqueId but not both';
+            return 'Specify either id or fileUrl but not both';
         }
         if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify URL or UniqueId, one is required';
+            return 'Specify id or fileUrl, one is required';
         }
         return true;
     }

package/dist/m365/spo/commands/site/site-remove.js

@@ -50,7 +50,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                             if (args.options.skipRecycleBin || args.options.wait) {
                                 logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
                             }
-                            return this.deleteGroupifiedSite(group.id, logger);
+                            return this.deleteGroup(group.id, logger);
                         })
                             .catch((err) => {
                             if (err.response.status === 404) {
@@ -79,7 +79,8 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                             else {
                                 return Promise.reject(err);
                             }
-                        });
+                        })
+                            .then(_ => this.deleteSite(args.options.url, args.options.wait, logger));
                     }
                 })
                     .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
@@ -296,7 +297,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    deleteGroupifiedSite(groupId, logger) {
+    deleteGroup(groupId, logger) {
         if (this.verbose) {
             logger.logToStderr(`Removing Microsoft 365 Group: ${groupId}...`);
         }

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -18,58 +17,25 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this.dots = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((adminUrl) => {
-            this.spoAdminUrl = adminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Restoring deleted site collection ${args.options.url}...`);
-            }
             const requestOptions = {
-                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
                 headers: {
-                    'X-RequestDigest': this.context.FormDigestValue
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json;charset=utf-8'
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="RestoreDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: {
+                    siteUrl: args.options.url
+                }
             };
             return request_1.default.post(requestOptions);
         })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!args.options.wait || isComplete) {
-                        resolve();
-                        return;
-                    }
-                    setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            dots: this.dots,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+            .then(res => {
+            logger.log(JSON.parse(res));
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [

package/dist/m365/spo/commands/tenant/tenant-settings-set.js

@@ -13,6 +13,14 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets tenant global settings';
     }
+    types() {
+        return {
+            boolean: [
+                'EnableAzureADB2BIntegration',
+                'SyncAadB2BManagementPolicy'
+            ]
+        };
+    }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.MinCompatibilityLevel = (!(!args.options.MinCompatibilityLevel)).toString();
@@ -97,6 +105,8 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
         telemetryProps.DisabledWebPartIds = (!(!args.options.DisabledWebPartIds)).toString();
         telemetryProps.AllowedDomainListForSyncClient = (!(!args.options.AllowedDomainListForSyncClient)).toString();
         telemetryProps.DisableCustomAppAuthentication = (!(!args.options.DisableCustomAppAuthentication)).toString();
+        telemetryProps.EnableAzureADB2BIntegration = typeof args.options.EnableAzureADB2BIntegration !== 'undefined';
+        telemetryProps.SyncAadB2BManagementPolicy = typeof args.options.SyncAadB2BManagementPolicy !== 'undefined';
         return telemetryProps;
     }
     getAllEnumOptions() {
@@ -176,6 +186,9 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
                 cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
                 return;
             }
+            if (args.options.EnableAzureADB2BIntegration === true) {
+                this.warn(logger, 'WARNING: Make sure to also enable the Azure AD one-time passcode authentication preview. If it is not enabled then SharePoint will not use Azure AD B2B even if EnableAzureADB2BIntegration is set to true. Learn more at http://aka.ms/spo-b2b-integration.');
+            }
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
@@ -490,6 +503,14 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
             {
                 option: '--DisableCustomAppAuthentication [DisableCustomAppAuthentication]',
                 autocomplete: ['true', 'false']
+            },
+            {
+                option: '--EnableAzureADB2BIntegration [EnableAzureADB2BIntegration]',
+                autocomplete: ['true', 'false']
+            },
+            {
+                option: '--SyncAadB2BManagementPolicy [SyncAadB2BManagementPolicy]',
+                autocomplete: ['true', 'false']
             }
         ];
         const parentOptions = super.options();

package/dist/m365/teams/commands/app/app-install.js

@@ -72,7 +72,7 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
     options() {
         const options = [
             { option: '--appId <appId>' },
-            { option: '--teamId [teamId' },
+            { option: '--teamId [teamId]' },
             { option: '--userId [userId]' },
             { option: '--userName [userName]' }
         ];

package/dist/m365/teams/commands/channel/channel-add.js

@@ -16,6 +16,8 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         telemetryProps.description = typeof args.options.description !== 'undefined';
         telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
         telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
+        telemetryProps.type = args.options.type || 'standard';
+        telemetryProps.owner = typeof args.options.owner !== 'undefined';
         return telemetryProps;
     }
     getTeamId(args) {
@@ -44,23 +46,35 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             return Promise.resolve(matchingTeams[0]);
         });
     }
+    createChannel(args, teamId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/teams/${teamId}/channels`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                membershipType: args.options.type || 'standard',
+                displayName: args.options.name
+            },
+            responseType: 'json'
+        };
+        if (args.options.type === 'private') {
+            // Private channels must have at least 1 owner
+            requestOptions.data.members = [
+                {
+                    '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                    'user@odata.bind': `https://graph.microsoft.com/v1.0/users('${args.options.owner}')`,
+                    roles: ['owner']
+                }
+            ];
+        }
+        return request_1.default.post(requestOptions);
+    }
     commandAction(logger, args, cb) {
         this
             .getTeamId(args)
-            .then((teamId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${teamId}/channels`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    displayName: args.options.name
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
+            .then((teamId) => this.createChannel(args, teamId))
             .then((res) => {
             logger.log(res);
             cb();
@@ -79,6 +93,13 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             },
             {
                 option: '-d, --description [description]'
+            },
+            {
+                option: '--type [type]',
+                autocomplete: ['standard', 'private']
+            },
+            {
+                option: '--owner [owner]'
             }
         ];
         const parentOptions = super.options();
@@ -94,6 +115,15 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.type && ['standard', 'private'].indexOf(args.options.type) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private.`;
+        }
+        if (args.options.type === 'private' && !args.options.owner) {
+            return 'Specify owner when creating a private channel.';
+        }
+        if (args.options.type !== 'private' && args.options.owner) {
+            return 'Specify owner only when creating a private channel.';
+        }
         return true;
     }
 }

package/dist/m365/teams/commands/channel/channel-list.js

@@ -49,7 +49,10 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         this
             .getTeamId(args)
             .then((teamId) => {
-            const endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+            let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+            if (args.options.type) {
+                endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+            }
             return utils_1.odata.getAllItems(endpoint, logger);
         })
             .then((items) => {
@@ -64,6 +67,10 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             },
             {
                 option: '--teamName [teamName]'
+            },
+            {
+                option: '--type [type]',
+                autocomplete: ['standard', 'private']
             }
         ];
         const parentOptions = super.options();
@@ -79,6 +86,9 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.type && ['standard', 'private'].indexOf(args.options.type.toLowerCase()) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private`;
+        }
         return true;
     }
 }

package/dist/m365/teams/commands/{conversationmember/conversationmember-add.js → channel/channel-member-add.js}

@@ -5,13 +5,16 @@ const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class TeamsConversationMemberAddCommand extends GraphCommand_1.default {
+class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     get name() {
-        return commands_1.default.CONVERSATIONMEMBER_ADD;
+        return commands_1.default.CHANNEL_MEMBER_ADD;
     }
     get description() {
         return 'Adds a conversation member in a private channel.';
     }
+    alias() {
+        return [commands_1.default.CONVERSATIONMEMBER_ADD];
+    }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
@@ -24,6 +27,7 @@ class TeamsConversationMemberAddCommand extends GraphCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        this.showDeprecationWarning(logger, commands_1.default.CONVERSATIONMEMBER_ADD, commands_1.default.CHANNEL_MEMBER_ADD);
         let teamId = '';
         let channelId = '';
         this
@@ -47,6 +51,13 @@ class TeamsConversationMemberAddCommand extends GraphCommand_1.default {
         })
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
+    optionSets() {
+        return [
+            ['teamId', 'teamName'],
+            ['channelId', 'channelName'],
+            ['userId', 'userDisplayName']
+        ];
+    }
     options() {
         const options = [
             {
@@ -75,30 +86,12 @@ class TeamsConversationMemberAddCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (args.options.teamId && args.options.teamName) {
-            return 'Specify either teamId or teamName, but not both.';
-        }
-        if (!args.options.teamId && !args.options.teamName) {
-            return 'Specify teamId or teamName, one is required';
-        }
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.channelId && args.options.channelName) {
-            return 'Specify either channelId or channelName, but not both.';
-        }
-        if (!args.options.channelId && !args.options.channelName) {
-            return 'Specify channelId or channelName, one is required';
-        }
         if (args.options.channelId && !utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        if (args.options.userId && args.options.userDisplayName) {
-            return 'Specify either userId or userDisplayName, but not both.';
-        }
-        if (!args.options.userId && !args.options.userDisplayName) {
-            return 'Specify userId or userDisplayName, one is required';
-        }
         return true;
     }
     addUser(userId, endpoint, roles) {
@@ -196,5 +189,5 @@ class TeamsConversationMemberAddCommand extends GraphCommand_1.default {
         }, err => { return Promise.reject(err); });
     }
 }
-module.exports = new TeamsConversationMemberAddCommand();
-//# sourceMappingURL=conversationmember-add.js.map
+module.exports = new TeamsChannelMemberAddCommand();
+//# sourceMappingURL=channel-member-add.js.map