Do not start the bot if MODMAIL_API_TOKEN is not valid

Author: kyb3r

CHANGELOG.md

@@ -10,7 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Made the logs command require manage messages permissions to execute. 
     - Before this patch, anyone could use the logs commands.
 
-
 # v2.0.1
 
 Bug fixes and minor improvements.

bot.py

@@ -61,7 +61,7 @@ def __init__(self):
         self.data_task = self.loop.create_task(self.data_loop())
         self.autoupdate_task = self.loop.create_task(self.autoupdate_loop())
         self._add_commands()
-
+    
     def _add_commands(self):
         """Adds commands automatically"""
         self.remove_command('help')
@@ -91,7 +91,7 @@ def run(self):
         try:
             super().run(self.token)
         finally:
-            print(Fore.CYAN + ' Shutting down bot' + Style.RESET_ALL)
+            print(Fore.RED + ' - Shutting down bot' + Style.RESET_ALL)
 
     @property
     def snippets(self):
@@ -142,12 +142,15 @@ async def get_pre(bot, message):
         return [bot.prefix, f'<@{bot.user.id}> ', f'<@!{bot.user.id}> ']
 
     async def on_connect(self):
+        print(line + Fore.RED + Style.BRIGHT)
+        await self.validate_api_token()
         print(line)
         print(Fore.CYAN + 'Connected to gateway.')
         await self.config.refresh()
         status = self.config.get('status')
         if status:
             await self.change_presence(activity=discord.Game(status))
+        
 
     async def on_ready(self):
         """Bot startup, sets uptime."""
@@ -290,6 +293,24 @@ def overwrites(self, ctx):
 
         return overwrites
 
+    async def validate_api_token(self):
+        valid = True 
+        try:
+            token = self.config.modmail_api_token
+        except KeyError:
+            print('MODMAIL_API_TOKEN not found.')
+            print('Set a config variable called MODMAIL_API_TOKEN with a token from https://dashboard.modmail.tk')
+            valid = False
+        else:
+            valid = await self.modmail_api.validate_token()
+            if not valid:
+                print('Invalid MODMAIL_API_TOKEN - get one from https://dashboard.modmail.tk')
+        finally:
+            if not valid:
+                await self.logout()
+            else:
+                print(Style.RESET_ALL + Fore.CYAN + 'Validated API token.' + Style.RESET_ALL)
+        
     async def data_loop(self):
         await self.wait_until_ready()
 

core/api.py

@@ -7,8 +7,10 @@ def __init__(self, app):
         self.session = app.session
         self.headers = None
 
-    async def request(self, url, method='GET', payload=None):
+    async def request(self, url, method='GET', payload=None, return_response=False):
         async with self.session.request(method, url, headers=self.headers, json=payload) as resp:
+            if return_response:
+                return resp
             try:
                 return await resp.json()
             except:
@@ -38,6 +40,10 @@ def __init__(self, bot):
             self.headers = {
                 'Authorization': 'Bearer ' + self.token
             }
+    
+    async def validate_token(self):
+        resp = await self.request(self.base + '/token/verify', return_response=True)
+        return resp.status == 200
 
     def get_user_info(self):
         return self.request(self.github + '/userinfo')