phillip/karaoqueue
1
0
Fork 0
mirror of https://github.com/PhoenixTwoFive/karaoqueue.git synced 2025-07-04 09:11:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement EventID to scope ClientIDs and Entry IDs

Browse Source 
Implement an EventID saved in settings. Currently this is used to scope
clientIDs and entryIDs to an event. The client checks the event currently going on on
the server, and discards its localstorage (containing the clientID) if
it has changed
This commit is contained in:
Phillip Kühne
2023-04-26 18:08:03 +02:00
parent adebf35d08
commit 865df5d588
5 changed files with 96 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
backend/app.py
View File

@ -138,6 +138,7 @@ def songs():
@basic_auth.required
def update_songs():
database.delete_all_entries()
helpers.reset_current_event_id(app)
status = database.import_songs(
helpers.get_songs(helpers.get_catalog_url()))
print(status)
@ -149,7 +150,6 @@ def update_songs():
def get_song_completions(input_string=""):
input_string = request.args.get('search', input_string)
if input_string != "":
print(input_string)
result = [list(x) for x in database.get_song_completions(input_string=input_string)]
return jsonify(result)
@ -157,10 +157,29 @@ def get_song_completions(input_string=""):
return 400
@app.route("/api/entries/delete/<entry_id>")
@app.route("/api/entries/delete/<entry_id>", methods=['GET'])
@nocache
@basic_auth.required
def delete_entry(entry_id):
def delete_entry_admin(entry_id):
if database.delete_entry(entry_id):
return Response('{"status": "OK"}', mimetype='text/json')
else:
return Response('{"status": "FAIL"}', mimetype='text/json')
@app.route("/api/entries/delete/<entry_id>", methods=['POST'])
@nocache
def delete_entry_user(entry_id):
if not request.json:
print(request.data)
abort(400)
client_id = request.json['client_id']
if not helpers.is_valid_uuid(client_id):
print(request.data)
abort(400)
if database.get_raw_entry(entry_id)['client_id'] != client_id: # type: ignore
print(request.data)
abort(403)
if database.delete_entry(entry_id):
return Response('{"status": "OK"}', mimetype='text/json')
else:
@ -235,6 +254,7 @@ def clear_played_songs():
@basic_auth.required
def delete_all_entries():
if database.delete_all_entries():
helpers.reset_current_event_id(app)
return Response('{"status": "OK"}', mimetype='text/json')
else:
return Response('{"status": "FAIL"}', mimetype='text/json')
@ -246,6 +266,12 @@ def admin():
return redirect("/", code=303)
@app.route("/api/events/current")
@nocache
def get_current_event():
return Response('{"status": "OK", "event": "' + helpers.get_current_event_id(app) + '"}', mimetype='text/json')
@app.before_first_request
def activate_job():
helpers.load_dbconfig(app)