- eveai_app adapted to handle removal of complex rewrite rules in nginx.conf, which cannot be achieved in Ingress

eveai_app/views/security_views.py

@@ -34,7 +34,7 @@ def log_after_request(response):
 @security_bp.route('/login', methods=['GET', 'POST'])
 def login():
     if current_user.is_authenticated:
-        return redirect(prefixed_url_for('basic_bp.index'))
+        return redirect(prefixed_url_for('basic_bp.index', for_redirect=True))
 
     form = LoginForm()
 
@@ -55,9 +55,9 @@ def login():
                     current_app.logger.info(f'Login successful! Current User is {current_user.email}')
                     db.session.commit()
                     if current_user.has_roles('Super User'):
-                        return redirect(prefixed_url_for('user_bp.tenants'))
+                        return redirect(prefixed_url_for('user_bp.tenants', for_redirect=True))
                     else:
-                        return redirect(prefixed_url_for('user_bp.tenant_overview'))
+                        return redirect(prefixed_url_for('user_bp.tenant_overview', for_redirect=True))
                 else:
                     flash('Invalid username or password', 'danger')
                     current_app.logger.error(f'Invalid username or password for given email: {user.email}')
@@ -68,7 +68,7 @@ def login():
         except CSRFError:
             current_app.logger.warning('CSRF token mismatch during login attempt')
             flash('Your session has expired. Please try logging in again.', 'danger')
-            return redirect(prefixed_url_for('security_bp.login'))
+            return redirect(prefixed_url_for('security_bp.login', for_redirect=True))
 
     if request.method == 'GET':
         csrf_token = generate_csrf()
@@ -80,7 +80,7 @@ def login():
 @login_required
 def logout():
     logout_user()
-    return redirect(prefixed_url_for('basic_bp.index'))
+    return redirect(prefixed_url_for('basic_bp.index', for_redirect=True))
 
 
 @security_bp.route('/confirm_email/<token>', methods=['GET', 'POST'])
@@ -89,12 +89,12 @@ def confirm_email(token):
         email = confirm_token(token)
     except Exception as e:
         flash('The confirmation link is invalid or has expired.', 'danger')
-        return redirect(prefixed_url_for('basic_bp.confirm_email_fail'))
+        return redirect(prefixed_url_for('basic_bp.confirm_email_fail', for_redirect=True))
 
     user = User.query.filter_by(email=email).first_or_404()
     if user.active:
         flash('Account already confirmed. Please login.', 'success')
-        return redirect(prefixed_url_for('security_bp.login'))
+        return redirect(prefixed_url_for('security_bp.login', for_redirect=True))
     else:
         user.active = True
         user.updated_at = dt.now(tz.utc)
@@ -105,10 +105,10 @@ def confirm_email(token):
             db.session.commit()
         except SQLAlchemyError as e:
             db.session.rollback()
-            return redirect(prefixed_url_for('basic_bp.confirm_email_fail'))
+            return redirect(prefixed_url_for('basic_bp.confirm_email_fail', for_redirect=True))
 
         send_reset_email(user)
-        return redirect(prefixed_url_for('basic_bp.confirm_email_ok'))
+        return redirect(prefixed_url_for('basic_bp.confirm_email_ok', for_redirect=True))
 
 
 @security_bp.route('/forgot_password', methods=['GET', 'POST'])
@@ -119,7 +119,7 @@ def forgot_password():
         if user:
             send_reset_email(user)
         flash('An email with instructions to reset your password has been sent.', 'info')
-        return redirect(prefixed_url_for('security_bp.login'))
+        return redirect(prefixed_url_for('security_bp.login', for_redirect=True))
     return render_template('security/forgot_password.html', form=form)
 
 
@@ -130,7 +130,7 @@ def reset_password(token):
     except Exception as e:
         flash('The reset link is invalid or has expired.', 'danger')
         current_app.logger.error(f'Invalid reset link detected: {token} - error: {e}')
-        return redirect(prefixed_url_for('security_bp.reset_password_request'))
+        return redirect(prefixed_url_for('security_bp.reset_password_request', for_redirect=True))
 
     user = User.query.filter_by(email=email).first_or_404()
     form = ResetPasswordForm()
@@ -139,7 +139,7 @@ def reset_password(token):
         user.updated_at = dt.now(tz.utc)
         db.session.commit()
         flash('Your password has been updated.', 'success')
-        return redirect(prefixed_url_for('security_bp.login'))
+        return redirect(prefixed_url_for('security_bp.login', for_redirect=True))
     return render_template('security/reset_password.html', reset_password_form=form)