From 84f3882466a5d808c81e857e5fd7336df08bd0b1 Mon Sep 17 00:00:00 2001
From: Morgan McMillian <morgan@mcmillian.dev>
Date: Tue, 4 Jul 2023 09:33:24 -0700
Subject: [PATCH] replace access_token url parameter with authorization header

issue #66
---
 appservice.py | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/appservice.py b/appservice.py
index a78a19c..e9f80d6 100644
--- a/appservice.py
+++ b/appservice.py
@@ -65,9 +65,11 @@ def query_alias(alias):
         else:
             abort(401)
 
-        url = app.config['MATRIX_HOST'] + '/_matrix/client/api/v1/createRoom?access_token='
-        url += app.config['MATRIX_AS_TOKEN']
-        headers = {"Content-Type":"application/json"}
+        url = app.config['MATRIX_HOST'] + '/_matrix/client/api/v1/createRoom'
+        headers = {
+            "Content-Type": "application/json",
+            "Authorization": "Bearer " + app.config['MATRIX_AS_TOKEN']
+        }
         r = requests.post(url, headers=headers, data=json.dumps(room))
         if r.status_code == 200:
             pnutpy.api.subscribe_channel(channel_id)
@@ -80,6 +82,12 @@ def query_alias(alias):
             db_session.add(rr)
             db_session.commit()
 
+        else:
+            logger.error("Unable to create room")
+            logger.error(r.status_code)
+            logger.error(r.text)
+            abort(400)
+
     except pnutpy.errors.PnutPermissionDenied:
         abort(401)
 
@@ -438,9 +446,11 @@ def create_room(channel, user):
     else:
         abort(401)
 
-    url = app.config['MATRIX_HOST'] + '/_matrix/client/api/v1/createRoom?access_token='
-    url += app.config['MATRIX_AS_TOKEN']
-    headers = {"Content-Type":"application/json"}
+    url = app.config['MATRIX_HOST'] + '/_matrix/client/api/v1/createRoom'
+    headers = {
+        "Content-Type": "application/json",
+        "Authorization": "Bearer " + app.config['MATRIX_AS_TOKEN']
+    }
     r = requests.post(url, headers=headers, data=json.dumps(room))
 
     if r.status_code == 200:
@@ -453,8 +463,12 @@ def create_room(channel, user):
         )
         db_session.add(rr)
         db_session.commit()
-    logger.debug(r.status_code)
-    logger.debug(r)
+
+    else:
+        logger.error("Unable to create room")
+        logger.error(r.status_code)
+        logger.error(r.text)
+        abort(400)
 
 def new_matrix_user(username):
     matrix_api = MatrixHttpApi(app.config['MATRIX_HOST'],