raphael/calendarwatch_frontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes bugs in database calles

Browse Source
This commit is contained in:
Raphael Maenle
2020-05-27 20:36:05 +02:00
parent 355ba99ca3
commit d17a76f4b8
7 changed files with 10 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/routes.py
View File

@ -174,13 +174,17 @@ def credentials_to_dict(credentials):
def downloader(device):
path = "/home/calendarwatch/userinfo/" + device + "/"
# return flask.send_from_directory(path, "calendarevents.json")
request_user = db.session.query(User).filter(User.id==device).first()
request_user = db.session.query(User).filter(User.userid==device).first()
print(device, flush=True)
if request_user == None:
return jsonify(kind="unregistered")
routine = Routine()
routine.updateCalendar(request_user)
return jsonify(request_user.getJson())
client_token = google.GC.build_credentials(request_user.google_token.token,
request_user.google_token.refresh_token)
calendarjson = routine.updateCalendar(request_user, client_token)
return jsonify(calendarjson)
@app.route("/devicefingerprint.json")
def generateDeviceFingerprint():
@ -202,9 +206,9 @@ def user():
print(request.json, flush=True)
if color != None:
Calendar.updateCalendar(current_user.id, calId, color=color)
current_user.updateCalendar(calId, color=color)
if toggle != None:
Calendar.updateCalendar(current_user.id, calId, toggle=toggle)
current_user.updateCalendar(calId, toggle=toggle)
# toggle specific calendar of user
elif request.method == 'DELETE':