From 325fb692c409f3c6b18781da18702020700563f5 Mon Sep 17 00:00:00 2001
From: jonasled <jonas@jonasled.de>
Date: Mon, 27 Jan 2020 12:15:56 +0100
Subject: [PATCH] fixed API QR
---
api.py | 7 ++++---
main.py | 4 ++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/api.py b/api.py
index e9d521a..8f5630c 100644
--- a/api.py
+++ b/api.py
@@ -1,7 +1,8 @@
from flask import jsonify, render_template
import sqlite3
+from makeqr import makeQR
-def apiGet(request, url_scheme):
+def apiGet(request, url_scheme, s, sAPI):
try:
userID = sAPI.dumps(s.loads(request.cookies.get('userID')))
except:
@@ -9,10 +10,11 @@ def apiGet(request, url_scheme):
return render_template("apiDocs.html", apikey=userID, domain=request.headers['Host'], url_scheme=url_scheme)
-def apiPost(request, domain):
+def apiPost(request, url_scheme, domain, sAPI):
username = "error"
try:
username = sAPI.loads(request.form['apikey'])
+ print(username)
except:
pass
@@ -55,7 +57,6 @@ def apiPost(request, domain):
'INSERT INTO WEB_URL (LONG_URL, SHORT_URL, USERNAME) VALUES (?, ?, ?)',
[longURL, short, username]
)
-
try:
request.form['qr']
qr64 = "data:image/jpeg;base64," + makeQR(url_scheme + "://" + short)
diff --git a/main.py b/main.py
index f9158e2..3d75d80 100644
--- a/main.py
+++ b/main.py
@@ -170,12 +170,12 @@ def makeQrCode():
@app.route('/user/api', methods=['POST'])
def api():
- return apiPost(request, domain)
+ return apiPost(request, url_scheme, domain, sAPI)
@app.route('/user/api', methods=['GET'])
def apiDocs():
- return apiGet(request, url_scheme)
+ return apiGet(request, url_scheme, s, sAPI)
if __name__ == '__main__':
--
GitLab