- Introduction of dynamic Retrievers & Specialists
- Introduction of dynamic Processors - Introduction of caching system - Introduction of a better template manager - Adaptation of ModelVariables to support dynamic Processors / Retrievers / Specialists - Start adaptation of chat client
This commit is contained in:
@@ -22,20 +22,11 @@ security_bp = Blueprint('security_bp', __name__)
|
||||
|
||||
@security_bp.before_request
|
||||
def log_before_request():
|
||||
current_app.logger.debug(f"Before request (security_bp): {request.method} {request.url}")
|
||||
if current_user and current_user.is_authenticated:
|
||||
current_app.logger.debug(f"After request (security_bp): Current User: {current_user.email}")
|
||||
else:
|
||||
current_app.logger.debug(f"After request (security_bp): No user logged in")
|
||||
pass
|
||||
|
||||
|
||||
@security_bp.after_request
|
||||
def log_after_request(response):
|
||||
current_app.logger.debug(f"After request (security_bp): {request.method} {request.url} - Status: {response.status}")
|
||||
if current_user and current_user.is_authenticated:
|
||||
current_app.logger.debug(f"After request (security_bp): Current User: {current_user.email}")
|
||||
else:
|
||||
current_app.logger.debug(f"After request (security_bp): No user logged in")
|
||||
return response
|
||||
|
||||
|
||||
@@ -47,13 +38,12 @@ def login():
|
||||
form = LoginForm()
|
||||
|
||||
if request.method == 'POST':
|
||||
current_app.logger.debug(f"Starting login procedure for {form.email.data}")
|
||||
try:
|
||||
if form.validate_on_submit():
|
||||
user = User.query.filter_by(email=form.email.data).first()
|
||||
if user is None or not verify_and_update_password(form.password.data, user):
|
||||
flash('Invalid username or password', 'danger')
|
||||
current_app.logger.debug(f'Failed to login user')
|
||||
current_app.logger.error(f'Failed to login user')
|
||||
return redirect(prefixed_url_for('security_bp.login'))
|
||||
|
||||
if login_user(user):
|
||||
@@ -65,10 +55,10 @@ def login():
|
||||
return redirect(prefixed_url_for('user_bp.tenant_overview'))
|
||||
else:
|
||||
flash('Invalid username or password', 'danger')
|
||||
current_app.logger.debug(f'Failed to login user {user.email}')
|
||||
current_app.logger.error(f'Failed to login user {user.email}')
|
||||
abort(401)
|
||||
else:
|
||||
current_app.logger.debug(f'Invalid login form: {form.errors}')
|
||||
current_app.logger.error(f'Invalid login form: {form.errors}')
|
||||
|
||||
except CSRFError:
|
||||
current_app.logger.warning('CSRF token mismatch during login attempt')
|
||||
@@ -77,19 +67,14 @@ def login():
|
||||
|
||||
if request.method == 'GET':
|
||||
csrf_token = generate_csrf()
|
||||
current_app.logger.debug(f'Generated new CSRF token: {csrf_token}')
|
||||
|
||||
# current_app.logger.debug(f"Login route completed - Session ID: {session.sid}")
|
||||
current_app.logger.debug(f"Login route completed - Session data: {session}")
|
||||
return render_template('security/login_user.html', login_user_form=form)
|
||||
|
||||
|
||||
@security_bp.route('/logout', methods=['GET', 'POST'])
|
||||
@login_required
|
||||
def logout():
|
||||
current_app.logger.debug('Logging out')
|
||||
logout_user()
|
||||
current_app.logger.debug('After Logout')
|
||||
return redirect(prefixed_url_for('basic_bp.index'))
|
||||
|
||||
|
||||
@@ -99,17 +84,13 @@ def confirm_email(token):
|
||||
email = confirm_token(token)
|
||||
except Exception as e:
|
||||
flash('The confirmation link is invalid or has expired.', 'danger')
|
||||
current_app.logger.debug(f'Invalid confirmation link detected: {token} - error: {e}')
|
||||
return redirect(prefixed_url_for('basic_bp.confirm_email_fail'))
|
||||
|
||||
user = User.query.filter_by(email=email).first_or_404()
|
||||
current_app.logger.debug(f'Trying to confirm email for user {user.email}')
|
||||
if user.active:
|
||||
flash('Account already confirmed. Please login.', 'success')
|
||||
current_app.logger.debug(f'Account for user {user.email} was already activated')
|
||||
return redirect(prefixed_url_for('security_bp.login'))
|
||||
else:
|
||||
current_app.logger.debug(f'Trying to confirm email for user {user.email}')
|
||||
user.active = True
|
||||
user.updated_at = dt.now(tz.utc)
|
||||
user.confirmed_at = dt.now(tz.utc)
|
||||
@@ -119,10 +100,8 @@ def confirm_email(token):
|
||||
db.session.commit()
|
||||
except SQLAlchemyError as e:
|
||||
db.session.rollback()
|
||||
current_app.logger.debug(f'Failed to confirm email for user {user.email}: {e}')
|
||||
return redirect(prefixed_url_for('basic_bp.confirm_email_fail'))
|
||||
|
||||
current_app.logger.debug(f'Account for user {user.email} was confirmed.')
|
||||
send_reset_email(user)
|
||||
return redirect(prefixed_url_for('basic_bp.confirm_email_ok'))
|
||||
|
||||
@@ -145,7 +124,7 @@ def reset_password(token):
|
||||
email = confirm_token(token)
|
||||
except Exception as e:
|
||||
flash('The reset link is invalid or has expired.', 'danger')
|
||||
current_app.logger.debug(f'Invalid reset link detected: {token} - error: {e}')
|
||||
current_app.logger.error(f'Invalid reset link detected: {token} - error: {e}')
|
||||
return redirect(prefixed_url_for('security_bp.reset_password_request'))
|
||||
|
||||
user = User.query.filter_by(email=email).first_or_404()
|
||||
|
||||
Reference in New Issue
Block a user