Update login

Removed not needed parameters for task status
pull/2744/head
Ozzie Isaacs 1 year ago
parent b9c942befc
commit 13c0d30a8f

@ -28,10 +28,10 @@ from flask_login.signals import user_loaded_from_cookie
class MyLoginManager(LoginManager): class MyLoginManager(LoginManager):
def _session_protection_failed(self): def _session_protection_failed(self):
_session = session._get_current_object() sess = session._get_current_object()
ident = self._session_identifier_generator() ident = self._session_identifier_generator()
if(_session and not (len(_session) == 1 if(sess and not (len(sess) == 1
and _session.get('csrf_token', None))) and ident != _session.get('_id', None): and sess.get('csrf_token', None))) and ident != sess.get('_id', None):
return super(). _session_protection_failed() return super(). _session_protection_failed()
return False return False

@ -101,10 +101,12 @@ def admin_required(f):
@admi.before_app_request @admi.before_app_request
def before_request(): def before_request():
if not ub.check_user_session(current_user.id, flask_session.get('_id')) and 'opds' not in request.path: if not ub.check_user_session(current_user.id,
flask_session.get('_id')) and 'opds' not in request.path \
and config.config_session == 1:
logout_user() logout_user()
g.constants = constants g.constants = constants
g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION','') g.google_site_verification = os.getenv('GOOGLE_SITE_VERIFICATION', '')
g.allow_registration = config.config_public_reg g.allow_registration = config.config_public_reg
g.allow_anonymous = config.config_anonbrowse g.allow_anonymous = config.config_anonbrowse
g.allow_upload = config.config_uploading g.allow_upload = config.config_uploading

@ -43,9 +43,7 @@ def get_email_status_json():
@login_required @login_required
def get_tasks_status(): def get_tasks_status():
# if current user admin, show all email, otherwise only own emails # if current user admin, show all email, otherwise only own emails
tasks = WorkerThread.get_instance().tasks return render_title_template('tasks.html', title=_("Tasks"), page="tasks")
answer = render_task_status(tasks)
return render_title_template('tasks.html', entries=answer, title=_("Tasks"), page="tasks")
# helper function to apply localize status information in tasklist entries # helper function to apply localize status information in tasklist entries

Loading…
Cancel
Save