Accept username/discriminator from the bot and remove it from oauth

4 files changed, 7 insertions, 15 deletions

diff --git a/app_test.py b/app_test.py
index 264f6c33..458ab22e 100644
--- a/app_test.py
+++ b/app_test.py
@@ -197,8 +197,8 @@ class ApiEndpoints(SiteTest):
         """ Check insert user """
         os.environ['BOT_API_KEY'] = 'abcdefg'
         headers = {'X-API-Key': 'abcdefg', 'Content-Type': 'application/json'}
-        single_data = json.dumps({'user_id': 1234, 'roles': [5678]})
-        list_data = json.dumps([{'user_id': 1234, 'roles': [5678]}])
+        single_data = json.dumps({'user_id': 1234, 'roles': [5678], "username": "test", "discriminator": "0000"})
+        list_data = json.dumps([{'user_id': 1234, 'roles': [5678], "username": "test", "discriminator": "0000"}])
 
         response = self.client.get('/user', app.config['API_SUBDOMAIN'], headers=headers)
         self.assertEqual(response.status_code, 405)
diff --git a/pysite/oauth.py b/pysite/oauth.py
index ef86aa8a..7a5764ac 100644
--- a/pysite/oauth.py
+++ b/pysite/oauth.py
@@ -59,12 +59,7 @@ class OauthBackend(BaseBackend):
 
         self.db.insert(
             "users",
-            {
-                "user_id": int(user_data["id"]),
-                "username": user_data["username"],
-                "discriminator": user_data["discriminator"],
-                "email": user_data["email"]
-            },
+            {"email": user_data["email"]},
             conflict="update"
         )
 
diff --git a/pysite/route_manager.py b/pysite/route_manager.py
index 44aea989..fb032470 100644
--- a/pysite/route_manager.py
+++ b/pysite/route_manager.py
@@ -95,7 +95,7 @@ class RouteManager:
         from geventwebsocket.handler import WebSocketHandler
 
         server = WSGIServer(
-            ("0.0.0.0", int(os.environ.get("WEBPAGE_PORT", 8080))),  # noqa: S104
+            ("0.0.0.0", int(os.environ.get("WEBPAGE_PORT", 8080))),  # noqa: B104, S104
             self.app, handler_class=WebSocketHandler
         )
         server.serve_forever()
diff --git a/pysite/views/api/bot/user.py b/pysite/views/api/bot/user.py
index a69af0fb..4b66cff0 100644
--- a/pysite/views/api/bot/user.py
+++ b/pysite/views/api/bot/user.py
@@ -12,15 +12,12 @@ from pysite.mixins import DBMixin
 SCHEMA = Schema([
     {
         "user_id": int,
-        "roles": [int]
+        "roles": [int],
+        "username": str,
+        "discriminator": str
     }
 ])
 
-REQUIRED_KEYS = [
-    "user_id",
-    "roles"
-]
-
 
 class UserView(APIView, DBMixin):
     path = "/user"