mirror of
https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git
synced 2025-06-23 06:20:34 +00:00
Only reveal hashids to the ui
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
from flask import request
|
||||
from app import hashids
|
||||
from flask_login import current_user
|
||||
from flask_socketio import join_room
|
||||
from .. import socketio
|
||||
@ -6,68 +6,23 @@ from ..decorators import socketio_login_required
|
||||
from ..models import User
|
||||
|
||||
|
||||
'''
|
||||
' A list containing session ids of Socket.IO sessions, to keep track
|
||||
' of all connected sessions, which can be used to determine the runtimes of
|
||||
' associated background tasks.
|
||||
'''
|
||||
sessions = []
|
||||
|
||||
|
||||
###############################################################################
|
||||
# Socket.IO event handlers #
|
||||
###############################################################################
|
||||
@socketio.on('connect')
|
||||
@socketio.on('users.user.get')
|
||||
@socketio_login_required
|
||||
def socketio_connect():
|
||||
'''
|
||||
' The Socket.IO module creates a session id (sid) for each request.
|
||||
' On connect the sid is saved in the sessions list.
|
||||
'''
|
||||
sessions.append(request.sid)
|
||||
# return {'code': 200, 'msg': 'OK'}
|
||||
|
||||
|
||||
@socketio.on('disconnect')
|
||||
def socketio_disconnect():
|
||||
'''
|
||||
' On disconnect the session id gets removed from the sessions list.
|
||||
'''
|
||||
try:
|
||||
sessions.remove(request.sid)
|
||||
except ValueError:
|
||||
pass
|
||||
# return {'code': 200, 'msg': 'OK'}
|
||||
|
||||
|
||||
@socketio.on('start_user_session')
|
||||
@socketio_login_required
|
||||
def socketio_start_user_session(user_id):
|
||||
user = User.query.get(user_id)
|
||||
if user is None:
|
||||
response = {'code': 404, 'msg': 'Not found'}
|
||||
socketio.emit('start_user_session', response, room=request.sid)
|
||||
elif not (user == current_user or current_user.is_administrator):
|
||||
response = {'code': 403, 'msg': 'Forbidden'}
|
||||
socketio.emit('start_user_session', response, room=request.sid)
|
||||
else:
|
||||
response = {'code': 200, 'msg': 'OK'}
|
||||
socketio.emit('start_user_session', response, room=request.sid)
|
||||
socketio.emit('user_{}_init'.format(user.id), user.to_dict(),
|
||||
room=request.sid)
|
||||
room = 'user_{}'.format(user.id)
|
||||
join_room(room)
|
||||
|
||||
|
||||
@socketio.on('users.request')
|
||||
@socketio_login_required
|
||||
def socketio_start_session(user_id):
|
||||
def users_user_get(user_hashid):
|
||||
user_id = hashids.decode(user_hashid)[0]
|
||||
user = User.query.get(user_id)
|
||||
if user is None:
|
||||
response = {'code': 404, 'msg': 'Not found'}
|
||||
elif not (user == current_user or current_user.is_administrator):
|
||||
response = {'code': 403, 'msg': 'Forbidden'}
|
||||
else:
|
||||
response = {'code': 200, 'msg': 'OK', 'payload': user.to_dict()}
|
||||
join_room('users.{}'.format(user.id))
|
||||
response = {
|
||||
'code': 200,
|
||||
'msg': 'OK',
|
||||
'payload': user.to_dict(backrefs=True, relationships=True)
|
||||
}
|
||||
join_room(f'users.{user.hashid}')
|
||||
return response
|
||||
|
@ -1,4 +1,5 @@
|
||||
from datetime import datetime
|
||||
from flask import current_app
|
||||
from .. import db, mail, socketio
|
||||
from ..email import create_message
|
||||
from ..models import Corpus, CorpusFile, Job, JobInput, JobResult, QueryResult
|
||||
@ -14,10 +15,9 @@ from ..models import Corpus, CorpusFile, Job, JobInput, JobResult, QueryResult
|
||||
@db.event.listens_for(JobResult, 'after_delete')
|
||||
@db.event.listens_for(QueryResult, 'after_delete')
|
||||
def ressource_after_delete(mapper, connection, ressource):
|
||||
event = 'user_{}_patch'.format(ressource.user_id)
|
||||
jsonpatch = [{'op': 'remove', 'path': ressource.jsonpatch_path}]
|
||||
room = 'user_{}'.format(ressource.user_id)
|
||||
socketio.emit(event, jsonpatch, room=room)
|
||||
room = f'users.{ressource.user_hashid}'
|
||||
socketio.emit('users.patch', jsonpatch, room=room)
|
||||
|
||||
|
||||
@db.event.listens_for(Corpus, 'after_insert')
|
||||
@ -27,16 +27,12 @@ def ressource_after_delete(mapper, connection, ressource):
|
||||
@db.event.listens_for(JobResult, 'after_insert')
|
||||
@db.event.listens_for(QueryResult, 'after_insert')
|
||||
def ressource_after_insert_handler(mapper, connection, ressource):
|
||||
event = 'user_{}_patch'.format(ressource.user_id)
|
||||
value = ressource.to_dict(backrefs=False, relationships=False)
|
||||
jsonpatch = [
|
||||
{
|
||||
'op': 'add',
|
||||
'path': ressource.jsonpatch_path,
|
||||
'value': ressource.to_dict(include_relationships=False)
|
||||
}
|
||||
{'op': 'add', 'path': ressource.jsonpatch_path, 'value': value}
|
||||
]
|
||||
room = 'user_{}'.format(ressource.user_id)
|
||||
socketio.emit(event, jsonpatch, room=room)
|
||||
room = f'users.{ressource.user_hashid}'
|
||||
socketio.emit('users.patch', jsonpatch, room=room)
|
||||
|
||||
|
||||
@db.event.listens_for(Corpus, 'after_update')
|
||||
@ -63,26 +59,25 @@ def ressource_after_update_handler(mapper, connection, ressource):
|
||||
jsonpatch.append(
|
||||
{
|
||||
'op': 'replace',
|
||||
'path': '{}/{}'.format(ressource.jsonpatch_path, attr.key),
|
||||
'path': f'{ressource.jsonpatch_path}/{attr.key}',
|
||||
'value': new_value
|
||||
}
|
||||
)
|
||||
# Job status update notification if it changed and wanted by the user
|
||||
if isinstance(ressource, Job) and attr.key == 'status':
|
||||
if ressource.creator.setting_job_status_mail_notifications == 'none': # noqa
|
||||
if ressource.user.setting_job_status_mail_notifications == 'none': # noqa
|
||||
pass
|
||||
elif (ressource.creator.setting_job_status_mail_notifications == 'end' # noqa
|
||||
elif (ressource.user.setting_job_status_mail_notifications == 'end' # noqa
|
||||
and ressource.status not in ['complete', 'failed']):
|
||||
pass
|
||||
else:
|
||||
msg = create_message(
|
||||
ressource.creator.email,
|
||||
'Status update for your Job "{}"'.format(ressource.title),
|
||||
ressource.user.email,
|
||||
f'Status update for your Job "{ressource.title}"',
|
||||
'tasks/email/notification',
|
||||
job=ressource
|
||||
)
|
||||
mail.send(msg)
|
||||
if jsonpatch:
|
||||
event = 'user_{}_patch'.format(ressource.user_id)
|
||||
room = 'user_{}'.format(ressource.user_id)
|
||||
socketio.emit(event, jsonpatch, room=room)
|
||||
room = f'users.{ressource.user_hashid}'
|
||||
socketio.emit('users.patch', jsonpatch, room=room)
|
||||
|
Reference in New Issue
Block a user