Prepare app for working behind a proxy (nginx).

Adapt user form

eveai_app/views/basic_views.py

@@ -1,4 +1,4 @@
-from flask import request, redirect, url_for, flash, render_template, Blueprint, session
+from flask import request, redirect, url_for, flash, render_template, Blueprint, session, current_app
 from flask_security import roles_required, roles_accepted
 
 from .basic_forms import SessionDefaultsForm
@@ -6,6 +6,17 @@ from .basic_forms import SessionDefaultsForm
 basic_bp = Blueprint('basic_bp', __name__)
 
 
+@basic_bp.before_request
+def log_before_request():
+    current_app.logger.debug(f"Before request (basic_bp): {request.method} {request.url}")
+
+
+@basic_bp.after_request
+def log_after_request(response):
+    current_app.logger.debug(f"After request  (basic_bp): {request.method} {request.url} - Status: {response.status}")
+    return response
+
+
 @basic_bp.route('/', methods=['GET', ])
 def index():
     return render_template('index.html')
@@ -20,4 +31,3 @@ def session_defaults():
         session['default_language'] = form.default_language.data
 
     return render_template('basic/session_defaults.html', form=form)
-

eveai_app/views/document_views.py

@@ -1,6 +1,6 @@
 import os
 from datetime import datetime as dt, timezone as tz
-from flask import request, redirect, url_for, flash, render_template, Blueprint, session, current_app
+from flask import request, redirect, flash, render_template, Blueprint, session, current_app
 from flask_security import roles_accepted, current_user
 from sqlalchemy import desc
 from sqlalchemy.orm import joinedload
@@ -17,10 +17,22 @@ from common.extensions import db
 from .document_forms import AddDocumentForm, AddURLForm
 from common.utils.middleware import mw_before_request
 from common.utils.celery_utils import current_celery
+from common.utils.nginx_utils import prefixed_url_for
 
 document_bp = Blueprint('document_bp', __name__, url_prefix='/document')
 
 
+@document_bp.before_request
+def log_before_request():
+    current_app.logger.debug(f"Before request (document_bp): {request.method} {request.url}")
+
+
+@document_bp.after_request
+def log_after_request(response):
+    current_app.logger.debug(f"After request  (document_bp): {request.method} {request.url} - Status: {response.status}")
+    return response
+
+
 @document_bp.before_request
 def before_request():
     mw_before_request()
@@ -48,7 +60,7 @@ def add_document():
                                 f'Document Version {new_doc_vers.id}. '
                                 f'Embedding creation task: {task.id}')
 
-        return redirect(url_for('document_bp.documents'))
+        return redirect(prefixed_url_for('document_bp.documents'))
 
     return render_template('document/add_document.html', form=form)
 
@@ -85,7 +97,7 @@ def add_url():
                                 f'Document Version {new_doc_vers.id}. '
                                 f'Embedding creation task: {task.id}')
 
-        return redirect(url_for('document_bp.documents'))
+        return redirect(prefixed_url_for('document_bp.documents'))
 
     return render_template('document/add_url.html', form=form)
 
@@ -114,7 +126,7 @@ def process_version(version_id):
     if not version.processing:
         print(f'Placeholder for processing version: {version_id}')
 
-    return redirect(url_for('documents'))
+    return redirect(prefixed_url_for('documents'))
 
 
 def set_logging_information(obj, timestamp):
@@ -241,7 +253,7 @@ def upload_file_for_version(doc_vers, file, extension):
         db.session.rollback()
         flash('Error saving document.', 'error')
         current_app.logger.error(
-            f'Error saving document for tenant {session["tenant"]["id"]} while uploading file: {error}')
+            f'Error saving document for tenant {session["tenant"]["id"]} while uploading file: {e}')
 
     current_app.logger.info(f'Succesfully saved document for tenant {session['tenant']['id']} for '
                             f'document version {doc_vers.id} while uploading file.')

eveai_app/views/security_views.py

@@ -0,0 +1,52 @@
+# views/security_views.py
+from flask import Blueprint, render_template, redirect, request, flash, current_app
+from flask_security import current_user, login_required, login_user, logout_user
+from flask_security.utils import verify_and_update_password, get_message, do_flash, config_value
+from flask_security.forms import LoginForm
+from urllib.parse import urlparse
+import datetime as dt
+
+from common.models.user import User
+from common.utils.nginx_utils import prefixed_url_for
+
+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}")
+
+
+@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}")
+    return response
+
+
+@security_bp.route('/login', methods=['GET', 'POST'])
+def login():
+    if current_user.is_authenticated:
+        return redirect(prefixed_url_for('basic_bp.index'))
+
+    form = LoginForm()
+
+    if form.validate_on_submit():
+        current_app.logger.debug(f'Validating login form: {form.email.data}')
+        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')
+            return redirect(prefixed_url_for('security_bp.login'))
+        login_user(user, remember=form.remember.data)
+
+        return redirect(prefixed_url_for('user_bp.tenant_overview'))
+
+    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'))

eveai_app/views/user_forms.py

@@ -48,8 +48,8 @@ class BaseUserForm(FlaskForm):
     email = EmailField('Email', validators=[DataRequired(), Email()])
     first_name = StringField('First Name', validators=[DataRequired(), Length(max=80)])
     last_name = StringField('Last Name', validators=[DataRequired(), Length(max=80)])
-    is_active = BooleanField('Is Active', id='flexSwitchCheckDefault')
-    valid_to = DateField('Valid to', id='datepicker')
+    is_active = BooleanField('Is Active', id='flexSwitchCheckDefault', default=True)
+    valid_to = DateField('Valid to', id='form-control datepicker', validators=[Optional()])
     tenant_id = IntegerField('Tenant ID', validators=[NumberRange(min=0)])
     roles = SelectMultipleField('Roles', coerce=int)
 

eveai_app/views/user_views.py

@@ -1,7 +1,7 @@
 # from . import user_bp
 import uuid
 from datetime import datetime as dt, timezone as tz
-from flask import request, redirect, url_for, flash, render_template, Blueprint, session, current_app, jsonify
+from flask import request, redirect, flash, render_template, Blueprint, session, current_app, jsonify
 from flask_security import hash_password, roles_required, roles_accepted, current_user
 from sqlalchemy.exc import SQLAlchemyError
 import ast
@@ -12,10 +12,22 @@ from .user_forms import TenantForm, CreateUserForm, EditUserForm, TenantDomainFo
 from common.utils.database import Database
 from common.utils.view_assistants import prepare_table_for_macro
 from common.utils.key_encryption import generate_api_key
+from common.utils.nginx_utils import prefixed_url_for
 
 user_bp = Blueprint('user_bp', __name__, url_prefix='/user')
 
 
+@user_bp.before_request
+def log_before_request():
+    current_app.logger.debug(f"Before request (user_bp): {request.method} {request.url}")
+
+
+@user_bp.after_request
+def log_after_request(response):
+    current_app.logger.debug(f"After request  (user_bp): {request.method} {request.url} - Status: {response.status}")
+    return response
+
+
 @user_bp.route('/tenant', methods=['GET', 'POST'])
 @roles_required('Super User')
 def tenant():
@@ -59,7 +71,7 @@ def tenant():
         flash(f"Successfully created tenant {new_tenant.id} in Database")
         current_app.logger.info(f"Creating schema for tenant {new_tenant.id}")
         Database(new_tenant.id).create_tenant_schema()
-        return redirect(url_for('basic_bp.index'))
+        return redirect(prefixed_url_for('basic_bp.index'))
 
     return render_template('user/tenant.html', form=form)
 
@@ -107,22 +119,24 @@ def edit_tenant(tenant_id):
 @roles_accepted('Super User', 'Tenant Admin')
 def user():
     form = CreateUserForm()
+    form.tenant_id.data = session.get('tenant').get('id')    # It is only possible to create users for the session tenant
     if form.validate_on_submit():
+        current_app.logger.info(f"Adding User for tenant {session['tenant']['id']} ")
         if form.password.data != form.confirm_password.data:
-            flash('Passwords do not match.')
+            flash('Passwords do not match.', 'danger')
+            return render_template('user/user.html', form=form)
 
         # Handle the required attributes
         hashed_password = hash_password(form.password.data)
-        new_user = User(
-            user_name=form.user_name.data,
-            email=form.email.data,
-            password=hashed_password,
-            first_name=form.first_name.data,
-            last_name=form.last_name.data,
-            is_active=form.is_active.data,
-            valid_to=form.valid_to.data,
-            tenant_id=form.tenant_id.data
-        )
+        new_user = User(user_name=form.user_name.data,
+                        email=form.email.data,
+                        password=hashed_password,
+                        first_name=form.first_name.data,
+                        last_name=form.last_name.data,
+                        is_active=form.is_active.data,
+                        valid_to=form.valid_to.data,
+                        tenant_id=form.tenant_id.data
+                        )
 
         new_user.fs_uniquifier = str(uuid.uuid4())
         timestamp = dt.now(tz.utc)
@@ -131,8 +145,8 @@ def user():
 
         # Handle the relations
         tenant_id = request.form.get('tenant_id')
-        the_tenant = Tenant.query.get(tenant_id)
-        new_user.tenant = the_tenant
+        # the_tenant = Tenant.query.get(tenant_id)
+        # new_user.tenant = the_tenant
 
         # Add roles
         for role_id in form.roles.data:
@@ -144,11 +158,13 @@ def user():
         try:
             db.session.add(new_user)
             db.session.commit()
-            flash('User added successfully.')
-            # return redirect(url_for('user/user'))
+            current_app.logger.debug(f'User {new_user.id} with name {new_user.user_name} added to database')
+            flash('User added successfully.', 'success')
+            return redirect(prefixed_url_for('user_bp.view_users'))
         except Exception as e:
+            current_app.logger.error(f'Failed to add user with name {new_user.user_name}. Error: {str(e)}')
             db.session.rollback()
-            flash(f'Failed to add user. Error: {str(e)}')
+            flash(f'Failed to add user. Email or user name already exists.', 'danger')
 
     return render_template('user/user.html', form=form)
 
@@ -184,7 +200,7 @@ def edit_user(user_id):
         db.session.commit()
         flash('User updated successfully.', 'success')
         return redirect(
-            url_for('user_bp.edit_user', user_id=user.id))  # Assuming there's a user profile view to redirect to
+            prefixed_url_for('user_bp.edit_user', user_id=user.id))  # Assuming there's a user profile view to redirect to
 
     form.roles.data = [role.id for role in user.roles]
     return render_template('user/edit_user.html', form=form, user_id=user_id)
@@ -214,13 +230,13 @@ def handle_tenant_selection():
 
     match action:
         case 'view_users':
-            return redirect(url_for('user_bp.view_users', tenant_id=tenant_id))
+            return redirect(prefixed_url_for('user_bp.view_users', tenant_id=tenant_id))
         case 'edit_tenant':
-            return redirect(url_for('user_bp.edit_tenant', tenant_id=tenant_id))
+            return redirect(prefixed_url_for('user_bp.edit_tenant', tenant_id=tenant_id))
         case 'select_tenant':
-            return redirect(url_for('basic_bp.session_defaults'))
+            return redirect(prefixed_url_for('basic_bp.session_defaults'))
     # Add more conditions for other actions
-    return redirect(url_for('select_tenant'))
+    return redirect(prefixed_url_for('select_tenant'))
 
 
 @user_bp.route('/view_users/<int:tenant_id>')
@@ -244,9 +260,9 @@ def handle_user_action():
     action = request.form['action']
 
     if action == 'edit_user':
-        return redirect(url_for('user_bp.edit_user', user_id=user_id))
+        return redirect(prefixed_url_for('user_bp.edit_user', user_id=user_id))
     # Add more conditions for other actions
-    return redirect(url_for('view_users'))
+    return redirect(prefixed_url_for('view_users'))
 
 
 @user_bp.route('/view_tenant_domains/<int:tenant_id>')
@@ -270,9 +286,9 @@ def handle_tenant_domain_action():
     action = request.form['action']
 
     if action == 'edit_tenant_domain':
-        return redirect(url_for('user_bp.edit_tenant_domain', tenant_domain_id=tenant_domain_id))
+        return redirect(prefixed_url_for('user_bp.edit_tenant_domain', tenant_domain_id=tenant_domain_id))
     # Add more conditions for other actions
-    return redirect(url_for('view_tenant_domains'))
+    return redirect(prefixed_url_for('view_tenant_domains'))
 
 
 @user_bp.route('/tenant_domain', methods=['GET', 'POST'])
@@ -320,7 +336,7 @@ def edit_tenant_domain(tenant_domain_id):
                                      f'for tenant {session["tenant"]["id"]}'
                                      f'Error: {str(e)}')
         return redirect(
-            url_for('user_bp.view_tenant_domains', tenant_id=session['tenant']['id']))  # Assuming there's a user profile view to redirect to
+            prefixed_url_for('user_bp.view_tenant_domains', tenant_id=session['tenant']['id']))  # Assuming there's a user profile view to redirect to
 
     return render_template('user/edit_tenant_domain.html', form=form, tenant_domain_id=tenant_domain_id)