fix custom bot token issue

clashperk · May 12, 2024 · d21b435 · d21b435
1 parent b82170f
commit d21b435
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/apps/service-auth/src/guilds/guilds.controller.ts b/apps/service-auth/src/guilds/guilds.controller.ts
@@ -1,5 +1,5 @@
 import { JwtAuthGuard, Role, Roles, RolesGuard } from '@app/auth';
-import { Body, Controller, Get, Param, Put, Query, UseGuards } from '@nestjs/common';
+import { Body, Controller, Get, Param, ParseBoolPipe, Put, Query, UseGuards } from '@nestjs/common';
 import { ApiBearerAuth, ApiBody, ApiOperation, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { GuildOutput, GuildRostersOutput, ReorderClanCategoriesInput } from './dto';
 import { GuildsService } from './guilds.service';
@@ -33,8 +33,12 @@ export class GuildsController {
 
  @Get('/:guildId/members')
  @ApiOperation({ summary: '(Internal)' })
- getGuildMembers(@Param('guildId') guildId: string, @Query('q') q: string) {
- return this.guildsService.getMembers(guildId, q);
+ getGuildMembers(
+ @Param('guildId') guildId: string,
+ @Query('q') queryString: string,
+ @Query('isPublicBot', ParseBoolPipe) isPublicBot: boolean,
+ ) {
+ return this.guildsService.getMembers(guildId, queryString, !isPublicBot);
  }
 
  @Put('/:guildId/clans/reorder')

diff --git a/apps/service-auth/src/guilds/guilds.service.ts b/apps/service-auth/src/guilds/guilds.service.ts
@@ -32,15 +32,13 @@ export class GuildsService {
  private rosterCategoriesCollection: Collection<RosterCategoriesEntity>,
  ) {}
 
- async getMembers(guildId: string, query: string) {
- const [bot, settings] = await Promise.all([
- this.customBotsCollection.findOne({ guildIds: guildId }),
- this.settingsCollection.findOne({ guildId }),
- ]);
+ async getMembers(guildId: string, query: string, isCustomBot: boolean) {
+ const bot = isCustomBot ? await this.customBotsCollection.findOne({ guildIds: guildId }) : null;
+
  return this.discordClientService.listMembers({
  query,
  guildId,
- token: settings?.hasCustomBot ? bot?.token ?? null : null,
+ token: bot?.token ?? null,
  });
  }
 

diff --git a/libs/discord-client/src/discord-client.service.ts b/libs/discord-client/src/discord-client.service.ts
@@ -9,9 +9,7 @@ const rest = new REST({ version: '10' });
 
 @Injectable()
 export class DiscordClientService {
- constructor(private configService: ConfigService) {
- rest.setToken(configService.getOrThrow('DISCORD_TOKEN'));
- }
+ constructor(private configService: ConfigService) {}
 
  async getUser(userId: string): Promise<APIUser> {
  const payload = await rest.get(Routes.user(userId));
@@ -28,6 +26,7 @@ export class DiscordClientService {
  token: string | null;
  }): Promise<APIGuildMember[]> {
  token ??= this.configService.getOrThrow('DISCORD_TOKEN');
+ if (token) rest.setToken(token);
 
  const payload = await rest.get(Routes.guildMembersSearch(guildId), {
  query: new URLSearchParams({ query, limit: '50' }),