move more stuff out of lib

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

tests/e2e/test_flows_recovery.py

@@ -9,9 +9,9 @@ from selenium.webdriver.support.wait import WebDriverWait
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import User
 from authentik.core.tests.utils import create_test_admin_user
+from authentik.crypto.generators import generate_id
 from authentik.flows.models import Flow
 from authentik.lib.config import CONFIG
-from authentik.lib.generators import generate_id
 from authentik.stages.identification.models import IdentificationStage
 from tests.e2e.utils import SeleniumTestCase, retry
 

tests/e2e/test_flows_stage_setup.py

@@ -5,8 +5,8 @@ from selenium.webdriver.common.keys import Keys
 
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import User
+from authentik.crypto.generators import generate_key
 from authentik.flows.models import Flow, FlowDesignation
-from authentik.lib.generators import generate_key
 from authentik.stages.password.models import PasswordStage
 from tests.e2e.utils import SeleniumTestCase, retry
 

tests/e2e/test_provider_ldap.py

@@ -10,9 +10,9 @@ from ldap3.core.exceptions import LDAPInvalidCredentialsResult
 from authentik.blueprints.tests import apply_blueprint, reconcile_app
 from authentik.core.models import Application, User
 from authentik.core.tests.utils import create_test_user
+from authentik.crypto.generators import generate_id
 from authentik.events.models import Event, EventAction
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id
 from authentik.outposts.apps import MANAGED_OUTPOST
 from authentik.outposts.models import Outpost, OutpostConfig, OutpostType
 from authentik.providers.ldap.models import APIAccessMode, LDAPProvider

tests/e2e/test_provider_oauth2_github.py

@@ -8,8 +8,8 @@ from selenium.webdriver.support import expected_conditions as ec
 
 from authentik.blueprints.tests import apply_blueprint, reconcile_app
 from authentik.core.models import Application
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
 from authentik.policies.expression.models import ExpressionPolicy
 from authentik.policies.models import PolicyBinding
 from authentik.providers.oauth2.models import (

tests/e2e/test_provider_oauth2_grafana.py

@@ -15,8 +15,8 @@ from authentik.common.oauth.constants import (
 )
 from authentik.core.models import Application
 from authentik.core.tests.utils import create_test_cert
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
 from authentik.policies.expression.models import ExpressionPolicy
 from authentik.policies.models import PolicyBinding
 from authentik.providers.oauth2.models import (

tests/e2e/test_provider_oidc.py

@@ -15,8 +15,8 @@ from authentik.common.oauth.constants import (
 )
 from authentik.core.models import Application
 from authentik.core.tests.utils import create_test_cert
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
 from authentik.policies.expression.models import ExpressionPolicy
 from authentik.policies.models import PolicyBinding
 from authentik.providers.oauth2.models import (

tests/e2e/test_provider_oidc_implicit.py

@@ -15,8 +15,8 @@ from authentik.common.oauth.constants import (
 )
 from authentik.core.models import Application
 from authentik.core.tests.utils import create_test_cert
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
 from authentik.policies.expression.models import ExpressionPolicy
 from authentik.policies.models import PolicyBinding
 from authentik.providers.oauth2.models import (

tests/e2e/test_provider_proxy.py

@@ -13,8 +13,8 @@ from selenium.webdriver.common.by import By
 
 from authentik.blueprints.tests import apply_blueprint, reconcile_app
 from authentik.core.models import Application
+from authentik.crypto.generators import generate_id
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id
 from authentik.outposts.models import DockerServiceConnection, Outpost, OutpostConfig, OutpostType
 from authentik.outposts.tasks import outpost_connection_discovery
 from authentik.providers.proxy.models import ProxyProvider

tests/e2e/test_provider_proxy_forward.py

@@ -9,8 +9,8 @@ from selenium.webdriver.common.by import By
 
 from authentik.blueprints.tests import apply_blueprint, reconcile_app
 from authentik.core.models import Application
+from authentik.crypto.generators import generate_id
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id
 from authentik.outposts.models import Outpost, OutpostType
 from authentik.providers.proxy.models import ProxyMode, ProxyProvider
 from tests.e2e.utils import SeleniumTestCase, retry

tests/e2e/test_provider_radius.py

@@ -9,8 +9,8 @@ from pyrad.packet import AccessAccept, AccessReject, AccessRequest
 
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import Application, User
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
 from authentik.outposts.models import Outpost, OutpostConfig, OutpostType
 from authentik.providers.radius.models import RadiusProvider
 from tests.e2e.utils import SeleniumTestCase, retry

tests/e2e/test_source_ldap_samba.py

@@ -5,7 +5,7 @@ from ldap3.core.exceptions import LDAPSessionTerminatedByServerError
 
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import Group, User
-from authentik.lib.generators import generate_id, generate_key
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.sources.ldap.auth import LDAPBackend
 from authentik.sources.ldap.models import LDAPSource, LDAPSourcePropertyMapping
 from authentik.sources.ldap.sync.groups import GroupLDAPSynchronizer

tests/e2e/test_source_oauth_oauth1.py

@@ -10,8 +10,8 @@ from selenium.webdriver.support.wait import WebDriverWait
 
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import User
+from authentik.crypto.generators import generate_id, generate_key
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id, generate_key
 from authentik.sources.oauth.models import OAuthSource
 from authentik.sources.oauth.types.registry import SourceType, registry
 from authentik.sources.oauth.views.callback import OAuthCallback

tests/e2e/test_source_oauth_oauth2.py

@@ -12,8 +12,8 @@ from selenium.webdriver.support.wait import WebDriverWait
 
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import User
+from authentik.crypto.generators import generate_id
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id
 from authentik.sources.oauth.models import OAuthSource
 from authentik.stages.identification.models import IdentificationStage
 from tests.e2e.utils import SeleniumTestCase, retry

tests/e2e/test_source_saml.py

@@ -11,9 +11,9 @@ from selenium.webdriver.support.wait import WebDriverWait
 
 from authentik.blueprints.tests import apply_blueprint
 from authentik.core.models import User
+from authentik.crypto.generators import generate_id
 from authentik.crypto.models import CertificateKeyPair
 from authentik.flows.models import Flow
-from authentik.lib.generators import generate_id
 from authentik.sources.saml.models import SAMLBindingTypes, SAMLSource
 from authentik.stages.identification.models import IdentificationStage
 from tests.e2e.utils import SeleniumTestCase, retry

tests/e2e/test_source_scim.py

@@ -5,7 +5,7 @@ from time import sleep
 
 from docker.types import Healthcheck
 
-from authentik.lib.generators import generate_id
+from authentik.crypto.generators import generate_id
 from authentik.lib.utils.http import get_http_session
 from authentik.sources.scim.models import SCIMSource
 from tests.e2e.utils import SeleniumTestCase, retry

tests/e2e/utils.py

@@ -35,7 +35,7 @@ from structlog.stdlib import get_logger
 from authentik.core.api.users import UserSerializer
 from authentik.core.models import User
 from authentik.core.tests.utils import create_test_admin_user
-from authentik.lib.generators import generate_id
+from authentik.crypto.generators import generate_id
 
 RETRIES = int(environ.get("RETRIES", "3"))
 IS_CI = "CI" in environ