- Correctie reset password en confirm email adress by adapting the prefixed_url_for to use config setting

- Adaptation of DPA and T&Cs
- Refer to privacy statement as DPA, not a privacy statement
- Startup of enforcing signed DPA and T&Cs
- Adaptation of eveai_chat_client to ensure we retrieve correct DPA & T&Cs

eveai_app/views/user_views.py

@@ -6,13 +6,15 @@ from flask_security import roles_accepted, current_user
 from sqlalchemy.exc import SQLAlchemyError, IntegrityError
 import ast
 
-from common.models.user import User, Tenant, Role, TenantDomain, TenantProject, PartnerTenant, TenantMake
+from common.models.user import User, Tenant, Role, TenantDomain, TenantProject, PartnerTenant, TenantMake, \
+    ConsentVersion
 from common.extensions import db, security, minio_client, simple_encryption, cache_manager
 from common.utils.dynamic_field_utils import create_default_config_from_type_config
 from common.utils.security_utils import send_confirmation_email, send_reset_email
 from config.type_defs.service_types import SERVICE_TYPES
 from .user_forms import TenantForm, CreateUserForm, EditUserForm, TenantDomainForm, TenantSelectionForm, \
-    TenantProjectForm, EditTenantProjectForm, TenantMakeForm, EditTenantForm, EditTenantMakeForm
+    TenantProjectForm, EditTenantProjectForm, TenantMakeForm, EditTenantForm, EditTenantMakeForm, ConsentVersionForm, \
+    EditConsentVersionForm
 from common.utils.database import Database
 from common.utils.view_assistants import prepare_table_for_macro, form_validation_failed
 from common.utils.simple_encryption import generate_api_key
@@ -25,7 +27,7 @@ from common.utils.mail_utils import send_email
 
 from eveai_app.views.list_views.user_list_views import get_tenants_list_view, get_users_list_view, \
     get_tenant_domains_list_view, get_tenant_projects_list_view, get_tenant_makes_list_view, \
-    get_tenant_partner_services_list_view
+    get_tenant_partner_services_list_view, get_consent_versions_list_view
 from eveai_app.views.list_views.list_view_utils import render_list_view
 
 user_bp = Blueprint('user_bp', __name__, url_prefix='/user')
@@ -693,6 +695,87 @@ def tenant_partner_services():
     return render_list_view('list_view.html', **config)
 
 
+@user_bp.route('/consent_versions', methods=['GET', 'POST'])
+@roles_accepted('Super User')
+def consent_versions():
+    config = get_consent_versions_list_view()
+    return render_list_view('list_view.html', **config)
+
+
+@user_bp.route('/handle_consent_version_selection', methods=['POST'])
+@roles_accepted('Super User')
+def handle_consent_version_selection():
+    action = request.form['action']
+    if action == 'create_consent_version':
+        return redirect(prefixed_url_for('user_bp.consent_version', for_redirect=True))
+    consent_version_identification = request.form.get('selected_row')
+    consent_version_id = ast.literal_eval(consent_version_identification).get('value')
+
+    if action == 'edit_consent_version':
+        return redirect(prefixed_url_for('user_bp.edit_consent_version', consent_version_id=consent_version_id, for_redirect=True))
+
+    # Altijd teruggaan naar de tenant_makes pagina
+    return redirect(prefixed_url_for('user_bp.consent_versions', for_redirect=True))
+
+
+@user_bp.route('/consent_version', methods=['GET', 'POST'])
+@roles_accepted('Super User')
+def consent_version():
+    form = ConsentVersionForm()
+    if form.validate_on_submit():
+        new_consent_version = ConsentVersion()
+        form.populate_obj(new_consent_version)
+        set_logging_information(new_consent_version, dt.now(tz.utc))
+
+        try:
+            db.session.add(new_consent_version)
+            db.session.commit()
+            flash('Consent Version successfully added!', 'success')
+            current_app.logger.info(f'Consent Version {new_consent_version.consent_type}, version {new_consent_version.consent_version} successfully added ')
+            # Enable step 2 of creation of retriever - add configuration of the retriever (dependent on type)
+            return redirect(prefixed_url_for('user_bp.consent_versions', for_redirect=True))
+        except SQLAlchemyError as e:
+            db.session.rollback()
+            flash(f'Failed to add Consent Version. Error: {e}', 'danger')
+            current_app.logger.error(f'Failed to add Consent Version. Error: {str(e)}')
+
+    return render_template('user/consent_version.html', form=form)
+
+
+@user_bp.route('/consent_version/<int:consent_version_id>', methods=['GET', 'POST'])
+@roles_accepted('Super User')
+def edit_consent_version(consent_version_id):
+    """Edit an existing Consent Version."""
+    # Get the Consent Version or return 404
+    cv = ConsentVersion.query.get_or_404(consent_version_id)
+
+    # Create form instance with the tenant make
+    form = EditConsentVersionForm(request.form, obj=cv)
+
+    if form.validate_on_submit():
+        # Update basic fields
+        form.populate_obj(cv)
+        # Update logging information
+        update_logging_information(cv, dt.now(tz.utc))
+
+        # Save changes to database
+        try:
+            db.session.add(cv)
+            db.session.commit()
+            flash('Consent Version updated successfully!', 'success')
+            current_app.logger.info(f'Consent Version {cv.id} updated successfully')
+        except SQLAlchemyError as e:
+            db.session.rollback()
+            flash(f'Failed to update Consent Version. Error: {str(e)}', 'danger')
+            current_app.logger.error(f'Failed to update Consent Version {consent_version_id}. Error: {str(e)}')
+            return render_template('user/consent_version.html', form=form, consent_version_id=consent_version_id)
+
+        return redirect(prefixed_url_for('user_bp.consent_versions', for_redirect=True))
+    else:
+        form_validation_failed(request, form)
+
+    return render_template('user/edit_consent_version.html', form=form, consent_version_id=consent_version_id)
+
 
 def reset_uniquifier(user):
     security.datastore.set_uniquifier(user)