Refactor permission checks in account and login commands

ryandward · Apr 15, 2024 · 8882dd9 · 8882dd9
1 parent c8ee9a5
commit 8882dd9
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/commands/utility/account.ts b/commands/utility/account.ts
@@ -1,4 +1,9 @@
-import { AutocompleteInteraction, CommandInteraction, SlashCommandBuilder } from 'discord.js';
+import {
+  AutocompleteInteraction,
+  CommandInteraction,
+  GuildMember,
+  SlashCommandBuilder,
+} from 'discord.js';
 import { FindManyOptions, ILike } from 'typeorm';
 import { AppDataSource } from '../../app_data.js';
 import { SharedAccounts } from '../../entities/SharedAccounts.js';
@@ -20,7 +25,12 @@ export const data = new SlashCommandBuilder()
   );
 
 export async function autocomplete(interaction: AutocompleteInteraction) {
+  const member = interaction.member as GuildMember;
   try {
+    const hasPermission = member?.roles.cache.some(role => role.name === 'Officer');
+    if (!hasPermission) {
+      throw new Error('You do not have permission to use this command.');
+    }
     const focusedOption = interaction.options.getFocused(true);
     if (!focusedOption) return;
 

diff --git a/commands/utility/login.ts b/commands/utility/login.ts
@@ -1,4 +1,9 @@
-import { AutocompleteInteraction, CommandInteraction, SlashCommandBuilder } from 'discord.js';
+import {
+  AutocompleteInteraction,
+  CommandInteraction,
+  GuildMember,
+  SlashCommandBuilder,
+} from 'discord.js';
 import _ from 'lodash';
 import { FindManyOptions, ILike } from 'typeorm';
 import { AppDataSource } from '../../app_data.js';
@@ -69,7 +74,12 @@ export async function execute(interaction: CommandInteraction): Promise<void> {
   const toonName = _.capitalize(options.get('toon')?.value as string);
   const accountName = options.get('account')?.value as string;
 
+  const member = interaction.member as GuildMember;
   try {
+    const hasPermission = member?.roles.cache.some(role => role.name === 'Officer');
+    if (!hasPermission) {
+      throw new Error('You do not have permission to use this command.');
+    }
     let sharedToon = await AppDataSource.manager.findOne(SharedToons, {
       where: { Name: toonName },
       relations: ['Account'],