Merge pull request #716 from AnswerDotAI/erikgaas/fix_discord_client

Fix Discord Client

Author: jph00

fasthtml/oauth.py

@@ -69,6 +69,7 @@ class DiscordAppClient(_AppClient):
     base_url = "https://discord.com/oauth2/authorize"
     token_url = "https://discord.com/api/oauth2/token"
     revoke_url = "https://discord.com/api/oauth2/token/revoke"
+    info_url = "https://discord.com/api/users/@me"
     id_key = 'id'
 
     def __init__(self, client_id, client_secret, is_user=False, perms=0, scope=None, **kwargs):
@@ -77,14 +78,18 @@ def __init__(self, client_id, client_secret, is_user=False, perms=0, scope=None,
         self.perms = perms
         super().__init__(client_id, client_secret, scope=scope, **kwargs)
 
-    def login_link(self):
+    def login_link(self, redirect_uri=None, scope=None, state=None):
+        use_scope = scope or self.scope
         d = dict(response_type='code', client_id=self.client_id,
-                 integration_type=self.integration_type, scope=self.scope) #, permissions=self.perms, prompt='consent')
+                 integration_type=self.integration_type, scope=use_scope)
+        if state: d['state'] = state
+        if redirect_uri: d['redirect_uri'] = redirect_uri
         return f'{self.base_url}?' + urlencode(d)
 
-    def parse_response(self, code):
+    def parse_response(self, code, redirect_uri=None):
         headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-        data = dict(grant_type='authorization_code', code=code)#, redirect_uri=self.redirect_uri)
+        data = dict(grant_type='authorization_code', code=code)
+        if redirect_uri: data['redirect_uri'] = redirect_uri
         r = httpx.post(self.token_url, data=data, headers=headers, auth=(self.client_id, self.client_secret))
         r.raise_for_status()
         self.parse_request_body_response(r.text)

nbs/api/08_oauth.ipynb

@@ -161,6 +161,7 @@
     "    base_url = \"https://discord.com/oauth2/authorize\"\n",
     "    token_url = \"https://discord.com/api/oauth2/token\"\n",
     "    revoke_url = \"https://discord.com/api/oauth2/token/revoke\"\n",
+    "    info_url = \"https://discord.com/api/users/@me\"\n",
     "    id_key = 'id'\n",
     "\n",
     "    def __init__(self, client_id, client_secret, is_user=False, perms=0, scope=None, **kwargs):\n",
@@ -169,14 +170,18 @@
     "        self.perms = perms\n",
     "        super().__init__(client_id, client_secret, scope=scope, **kwargs)\n",
     "\n",
-    "    def login_link(self):\n",
+    "    def login_link(self, redirect_uri=None, scope=None, state=None):\n",
+    "        use_scope = scope or self.scope\n",
     "        d = dict(response_type='code', client_id=self.client_id,\n",
-    "                 integration_type=self.integration_type, scope=self.scope) #, permissions=self.perms, prompt='consent')\n",
+    "                 integration_type=self.integration_type, scope=use_scope)\n",
+    "        if state: d['state'] = state\n",
+    "        if redirect_uri: d['redirect_uri'] = redirect_uri\n",
     "        return f'{self.base_url}?' + urlencode(d)\n",
     "\n",
-    "    def parse_response(self, code):\n",
+    "    def parse_response(self, code, redirect_uri=None):\n",
     "        headers = {'Content-Type': 'application/x-www-form-urlencoded'}\n",
-    "        data = dict(grant_type='authorization_code', code=code)#, redirect_uri=self.redirect_uri)\n",
+    "        data = dict(grant_type='authorization_code', code=code)\n",
+    "        if redirect_uri: data['redirect_uri'] = redirect_uri\n",
     "        r = httpx.post(self.token_url, data=data, headers=headers, auth=(self.client_id, self.client_secret))\n",
     "        r.raise_for_status()\n",
     "        self.parse_request_body_response(r.text)"