@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.792164a

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

@@ -1,17 +1,39 @@
-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 _TeamsChannelMemberListCommand_instances, _TeamsChannelMemberListCommand_initTelemetry, _TeamsChannelMemberListCommand_initOptions, _TeamsChannelMemberListCommand_initValidators, _TeamsChannelMemberListCommand_initOptionSets;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional()
+        .alias('i'),
+    teamName: z.string()
+        .optional(),
+    channelId: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional()
+        .alias('c'),
+    channelName: z.string()
+        .optional(),
+    role: z.enum(['owner', 'member', 'guest'])
+        .optional()
+        .alias('r')
+});
 class TeamsChannelMemberListCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.teamId = '';
+    }
     get name() {
         return commands.CHANNEL_MEMBER_LIST;
     }
@@ -21,14 +43,25 @@ class TeamsChannelMemberListCommand extends GraphCommand {
     defaultProperties() {
         return ['id', 'roles', 'displayName', 'userId', 'email'];
     }
-    constructor() {
-        super();
-        _TeamsChannelMemberListCommand_instances.add(this);
-        this.teamId = '';
-        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberListCommand_instances, "m", _TeamsChannelMemberListCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.channelId, opts.channelName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either channelId or channelName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['channelId', 'channelName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -55,11 +88,7 @@ class TeamsChannelMemberListCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.channelId) {
@@ -80,46 +109,5 @@ class TeamsChannelMemberListCommand extends GraphCommand {
         return channelItem.id;
     }
 }
-_TeamsChannelMemberListCommand_instances = new WeakSet(), _TeamsChannelMemberListCommand_initTelemetry = function _TeamsChannelMemberListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
-            role: typeof args.options.role
-        });
-    });
-}, _TeamsChannelMemberListCommand_initOptions = function _TeamsChannelMemberListCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '-c, --channelId [channelId]'
-    }, {
-        option: '--channelName [channelName]'
-    }, {
-        option: '-r, --role [role]',
-        autocomplete: ['owner', 'member', 'guest']
-    });
-}, _TeamsChannelMemberListCommand_initValidators = function _TeamsChannelMemberListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel ID`;
-        }
-        if (args.options.role) {
-            if (['owner', 'member', 'guest'].indexOf(args.options.role) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values owner|member|guest`;
-            }
-        }
-        return true;
-    });
-}, _TeamsChannelMemberListCommand_initOptionSets = function _TeamsChannelMemberListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] });
-};
 export default new TeamsChannelMemberListCommand();
 //# sourceMappingURL=channel-member-list.js.map

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -1,32 +1,79 @@
-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 _TeamsChannelMemberRemoveCommand_instances, _TeamsChannelMemberRemoveCommand_initTelemetry, _TeamsChannelMemberRemoveCommand_initOptions, _TeamsChannelMemberRemoveCommand_initValidators, _TeamsChannelMemberRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    teamName: z.string()
+        .optional(),
+    channelId: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional(),
+    channelName: z.string()
+        .optional(),
+    userName: z.string()
+        .optional(),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    id: z.string()
+        .optional(),
+    force: z.boolean()
+        .optional()
+        .alias('f')
+});
 class TeamsChannelMemberRemoveCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.teamId = '';
+        this.channelId = '';
+    }
     get name() {
         return commands.CHANNEL_MEMBER_REMOVE;
     }
     get description() {
         return 'Removes the specified member from the specified Microsoft Teams private or shared team channel';
     }
-    constructor() {
-        super();
-        _TeamsChannelMemberRemoveCommand_instances.add(this);
-        this.teamId = '';
-        this.channelId = '';
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberRemoveCommand_instances, "m", _TeamsChannelMemberRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.channelId, opts.channelName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either channelId or channelName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['channelId', 'channelName']
+            }
+        })
+            .refine(opts => [opts.userId, opts.userName, opts.id].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either userId, userName, or id, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'id']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeMember = async () => {
@@ -72,11 +119,7 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist in the Microsoft Teams';
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.channelId) {
@@ -125,52 +168,5 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand {
         return conversationMember.id;
     }
 }
-_TeamsChannelMemberRemoveCommand_instances = new WeakSet(), _TeamsChannelMemberRemoveCommand_initTelemetry = function _TeamsChannelMemberRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _TeamsChannelMemberRemoveCommand_initOptions = function _TeamsChannelMemberRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '--channelId [channelId]'
-    }, {
-        option: '--channelName [channelName]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsChannelMemberRemoveCommand_initValidators = function _TeamsChannelMemberRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel ID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsChannelMemberRemoveCommand_initOptionSets = function _TeamsChannelMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userId', 'userName', 'id'] });
-};
 export default new TeamsChannelMemberRemoveCommand();
 //# sourceMappingURL=channel-member-remove.js.map

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -1,32 +1,78 @@
-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 _TeamsChannelMemberSetCommand_instances, _TeamsChannelMemberSetCommand_initTelemetry, _TeamsChannelMemberSetCommand_initOptions, _TeamsChannelMemberSetCommand_initValidators, _TeamsChannelMemberSetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    teamName: z.string()
+        .optional(),
+    channelId: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional(),
+    channelName: z.string()
+        .optional(),
+    userName: z.string()
+        .optional(),
+    userId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    id: z.string()
+        .optional(),
+    role: z.enum(['owner', 'member'])
+        .alias('r')
+});
 class TeamsChannelMemberSetCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.teamId = '';
+        this.channelId = '';
+    }
     get name() {
         return commands.CHANNEL_MEMBER_SET;
     }
     get description() {
         return 'Updates the role of the specified member in the specified Microsoft Teams private or shared team channel';
     }
-    constructor() {
-        super();
-        _TeamsChannelMemberSetCommand_instances.add(this);
-        this.teamId = '';
-        this.channelId = '';
-        __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelMemberSetCommand_instances, "m", _TeamsChannelMemberSetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        })
+            .refine(opts => [opts.channelId, opts.channelName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either channelId or channelName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['channelId', 'channelName']
+            }
+        })
+            .refine(opts => [opts.userName, opts.userId, opts.id].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either userName, userId, or id, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['userName', 'userId', 'id']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -56,11 +102,7 @@ class TeamsChannelMemberSetCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw `The specified team does not exist in the Microsoft Teams`;
-        }
-        return group.id;
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.channelId) {
@@ -109,55 +151,5 @@ class TeamsChannelMemberSetCommand extends GraphCommand {
         return conversationMember.id;
     }
 }
-_TeamsChannelMemberSetCommand_instances = new WeakSet(), _TeamsChannelMemberSetCommand_initTelemetry = function _TeamsChannelMemberSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            channelId: typeof args.options.channelId !== 'undefined',
-            channelName: typeof args.options.channelName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
-        });
-    });
-}, _TeamsChannelMemberSetCommand_initOptions = function _TeamsChannelMemberSetCommand_initOptions() {
-    this.options.unshift({
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '--channelId [channelId]'
-    }, {
-        option: '--channelName [channelName]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '-r, --role <role>',
-        autocomplete: ['owner', 'member']
-    });
-}, _TeamsChannelMemberSetCommand_initValidators = function _TeamsChannelMemberSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        if (args.options.channelId && !validation.isValidTeamsChannelId(args.options.channelId)) {
-            return `${args.options.channelId} is not a valid Teams Channel ID`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid GUID`;
-        }
-        if (['owner', 'member'].indexOf(args.options.role) === -1) {
-            return `${args.options.role} is not a valid role value. Allowed values owner|member`;
-        }
-        return true;
-    });
-}, _TeamsChannelMemberSetCommand_initOptionSets = function _TeamsChannelMemberSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['teamId', 'teamName'] }, { options: ['channelId', 'channelName'] }, { options: ['userName', 'userId', 'id'] });
-};
 export default new TeamsChannelMemberSetCommand();
 //# sourceMappingURL=channel-member-set.js.map

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

@@ -1,31 +1,64 @@
-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 _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { teams } from '../../../../utils/teams.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    id: z.string()
+        .refine(val => validation.isValidTeamsChannelId(val), {
+        message: 'The value is not a valid Teams channel id.'
+    })
+        .optional()
+        .alias('i'),
+    name: z.string()
+        .optional()
+        .alias('n'),
+    teamId: z.string()
+        .refine(val => validation.isValidGuid(val), {
+        message: 'The value must be a valid GUID.'
+    })
+        .optional(),
+    teamName: z.string()
+        .optional(),
+    force: z.boolean()
+        .optional()
+        .alias('f')
+});
 class TeamsChannelRemoveCommand extends GraphCommand {
+    constructor() {
+        super(...arguments);
+        this.teamId = "";
+    }
     get name() {
         return commands.CHANNEL_REMOVE;
     }
     get description() {
         return 'Removes the specified channel in the Microsoft Teams team';
     }
-    constructor() {
-        super();
-        _TeamsChannelRemoveCommand_instances.add(this);
-        this.teamId = "";
-        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.name].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either id or name, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
+        })
+            .refine(opts => [opts.teamId, opts.teamName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either teamId or teamName, but not both.',
+            params: {
+                customCode: 'optionSet',
+                options: ['teamId', 'teamName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeChannel = async () => {
@@ -63,13 +96,7 @@ class TeamsChannelRemoveCommand extends GraphCommand {
         if (args.options.teamId) {
             return args.options.teamId;
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.teamName);
-        if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-            throw 'The specified team does not exist';
-        }
-        else {
-            return group.id;
-        }
+        return teams.getTeamIdByDisplayName(args.options.teamName);
     }
     async getChannelId(args) {
         if (args.options.id) {
@@ -90,40 +117,5 @@ class TeamsChannelRemoveCommand extends GraphCommand {
         return channelItem.id;
     }
 }
-_TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            teamId: typeof args.options.teamId !== 'undefined',
-            teamName: typeof args.options.teamName !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _TeamsChannelRemoveCommand_initOptions = function _TeamsChannelRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '--teamId [teamId]'
-    }, {
-        option: '--teamName [teamName]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidTeamsChannelId(args.options.id)) {
-            return `${args.options.id} is not a valid Teams channel id`;
-        }
-        if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
-            return `${args.options.teamId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] }, { options: ['teamId', 'teamName'] });
-};
 export default new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map