gitea-admin/gh-christianlouis-docuelevate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resolve merge conflicts with main branch

Browse Source 
Merge origin/main into feature branch, resolving 3 conflicts:
- app/api/__init__.py: add classification_rules_router alongside new
  routers from main (audit_logs, i18n, mobile, compliance, translation)
- app/models.py: keep ClassificationRuleModel alongside new models from
  main (MobileDevice, ComplianceTemplate, PipelineRoutingRule)
- tests/conftest.py: import both ClassificationRuleModel and new models
  from main (AuditLog, ComplianceTemplate)

Also renumber migration from 027 to 037 to chain from the latest
migration on main (036_add_document_translation_fields).

Co-authored-by: christianlouis <361235+christianlouis@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-03-16 22:33:59 +00:00
parent 23498e0a98
commit 651b48658c
318 changed files with 317516 additions and 2858 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_config_validators.py
+17 -1
View File
@@ -196,8 +196,12 @@ class TestValidateAuthConfig:
mock_settings.authentik_client_id = None
mock_settings.authentik_client_secret = None
mock_settings.authentik_config_url = None
mock_settings.social_auth_google_enabled = False
mock_settings.social_auth_microsoft_enabled = False
mock_settings.social_auth_apple_enabled = False
mock_settings.social_auth_dropbox_enabled = False
result = validate_auth_config()
assert "Neither simple authentication nor OIDC are properly configured" in result
assert "Neither simple authentication, OIDC, nor social login are properly configured" in result
def test_auth_enabled_oidc_missing_provider_name(self):
"""Test validation when OIDC is configured but provider name is missing."""
@@ -210,6 +214,10 @@ class TestValidateAuthConfig:
mock_settings.authentik_client_secret = "client_secret"
mock_settings.authentik_config_url = "https://example.com"
mock_settings.oauth_provider_name = None
mock_settings.social_auth_google_enabled = False
mock_settings.social_auth_microsoft_enabled = False
mock_settings.social_auth_apple_enabled = False
mock_settings.social_auth_dropbox_enabled = False
result = validate_auth_config()
assert "OAUTH_PROVIDER_NAME is not configured but OIDC is enabled" in result
@@ -223,6 +231,10 @@ class TestValidateAuthConfig:
mock_settings.authentik_client_id = None
mock_settings.authentik_client_secret = None
mock_settings.authentik_config_url = None
mock_settings.social_auth_google_enabled = False
mock_settings.social_auth_microsoft_enabled = False
mock_settings.social_auth_apple_enabled = False
mock_settings.social_auth_dropbox_enabled = False
result = validate_auth_config()
assert len(result) == 0
@@ -237,6 +249,10 @@ class TestValidateAuthConfig:
mock_settings.authentik_client_secret = "client_secret"
mock_settings.authentik_config_url = "https://example.com"
mock_settings.oauth_provider_name = "Authentik"
mock_settings.social_auth_google_enabled = False
mock_settings.social_auth_microsoft_enabled = False
mock_settings.social_auth_apple_enabled = False
mock_settings.social_auth_dropbox_enabled = False
result = validate_auth_config()
assert len(result) == 0