diff --git a/api.py b/api.py index e9d521ad371dc46f74fcdebaa03dd9e7ae6e18c1..8f5630ce340b19225a816d8715f15cbd2e66e9fc 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 f9158e2afb256acaeef7495bfa64e8d3e0944f09..3d75d80f7c719bbabfa6cdcb13f713e73934b4d5 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__':