providers: add provider/ prefix for property mappings API (#10874)

authentik/enterprise/providers/google_workspace/models.py

@@ -181,7 +181,7 @@ class GoogleWorkspaceProviderMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-google-workspace-form"
+        return "ak-property-mapping-provider-google-workspace-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/enterprise/providers/microsoft_entra/models.py

@@ -170,7 +170,7 @@ class MicrosoftEntraProviderMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-microsoft-entra-form"
+        return "ak-property-mapping-provider-microsoft-entra-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/enterprise/providers/rac/migrations/0005_alter_racpropertymapping_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.8 on 2024-08-12 12:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentik_providers_rac", "0004_alter_connectiontoken_expires"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="racpropertymapping",
+            options={
+                "verbose_name": "RAC Provider Property Mapping",
+                "verbose_name_plural": "RAC Provider Property Mappings",
+            },
+        ),
+    ]

authentik/enterprise/providers/rac/models.py

@@ -125,7 +125,7 @@ class RACPropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-rac-form"
+        return "ak-property-mapping-provider-rac-form"
 
     @property
     def serializer(self) -> type[Serializer]:
@@ -136,8 +136,8 @@ class RACPropertyMapping(PropertyMapping):
         return RACPropertyMappingSerializer
 
     class Meta:
-        verbose_name = _("RAC Property Mapping")
+        verbose_name = _("RAC Provider Property Mapping")
-        verbose_name_plural = _("RAC Property Mappings")
+        verbose_name_plural = _("RAC Provider Property Mappings")
 
 
 class ConnectionToken(ExpiringModel):

authentik/enterprise/providers/rac/urls.py

@@ -44,7 +44,7 @@ websocket_urlpatterns = [
 
 api_urlpatterns = [
     ("providers/rac", RACProviderViewSet),
-    ("propertymappings/rac", RACPropertyMappingViewSet),
+    ("propertymappings/provider/rac", RACPropertyMappingViewSet),
     ("rac/endpoints", EndpointViewSet),
     ("rac/connection_tokens", ConnectionTokenViewSet),
 ]

authentik/providers/oauth2/models.py

@@ -105,7 +105,7 @@ class ScopeMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-scope-form"
+        return "ak-property-mapping-provider-scope-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/providers/oauth2/urls.py

@@ -62,7 +62,7 @@ urlpatterns = [
 
 api_urlpatterns = [
     ("providers/oauth2", OAuth2ProviderViewSet),
-    ("propertymappings/scope", ScopeMappingViewSet),
+    ("propertymappings/provider/scope", ScopeMappingViewSet),
     ("oauth2/authorization_codes", AuthorizationCodeViewSet),
     ("oauth2/refresh_tokens", RefreshTokenViewSet),
     ("oauth2/access_tokens", AccessTokenViewSet),

authentik/providers/radius/migrations/0004_alter_radiusproviderpropertymapping_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.8 on 2024-08-12 12:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentik_providers_radius", "0003_radiusproviderpropertymapping"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="radiusproviderpropertymapping",
+            options={
+                "verbose_name": "Radius Provider Property Mapping",
+                "verbose_name_plural": "Radius Provider Property Mappings",
+            },
+        ),
+    ]

authentik/providers/radius/models.py

@@ -70,7 +70,7 @@ class RadiusProviderPropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-radius-form"
+        return "ak-property-mapping-provider-radius-form"
 
     @property
     def serializer(self) -> type[Serializer]:
@@ -81,8 +81,8 @@ class RadiusProviderPropertyMapping(PropertyMapping):
         return RadiusProviderPropertyMappingSerializer
 
     def __str__(self):
-        return f"Radius Property Mapping {self.name}"
+        return f"Radius Provider Property Mapping {self.name}"
 
     class Meta:
-        verbose_name = _("Radius Property Mapping")
+        verbose_name = _("Radius Provider Property Mapping")
-        verbose_name_plural = _("Radius Property Mappings")
+        verbose_name_plural = _("Radius Provider Property Mappings")

authentik/providers/radius/urls.py

@@ -7,7 +7,7 @@ from authentik.providers.radius.api.providers import (
 )
 
 api_urlpatterns = [
-    ("propertymappings/radius", RadiusProviderPropertyMappingViewSet),
+    ("propertymappings/provider/radius", RadiusProviderPropertyMappingViewSet),
     ("outposts/radius", RadiusOutpostConfigViewSet, "radiusprovideroutpost"),
     ("providers/radius", RadiusProviderViewSet),
 ]

authentik/providers/saml/migrations/0015_alter_samlpropertymapping_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.8 on 2024-08-12 12:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentik_providers_saml", "0014_alter_samlprovider_digest_algorithm_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="samlpropertymapping",
+            options={
+                "verbose_name": "SAML Provider Property Mapping",
+                "verbose_name_plural": "SAML Provider Property Mappings",
+            },
+        ),
+    ]

authentik/providers/saml/models.py

@@ -191,7 +191,7 @@ class SAMLPropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-saml-form"
+        return "ak-property-mapping-provider-saml-form"
 
     @property
     def serializer(self) -> type[Serializer]:
@@ -204,8 +204,8 @@ class SAMLPropertyMapping(PropertyMapping):
         return f"{self.name} ({name})"
 
     class Meta:
-        verbose_name = _("SAML Property Mapping")
+        verbose_name = _("SAML Provider Property Mapping")
-        verbose_name_plural = _("SAML Property Mappings")
+        verbose_name_plural = _("SAML Provider Property Mappings")
 
 
 class SAMLProviderImportModel(CreatableType, Provider):

authentik/providers/saml/urls.py

@@ -44,6 +44,6 @@ urlpatterns = [
 ]
 
 api_urlpatterns = [
-    ("propertymappings/saml", SAMLPropertyMappingViewSet),
+    ("propertymappings/provider/saml", SAMLPropertyMappingViewSet),
     ("providers/saml", SAMLProviderViewSet),
 ]

authentik/providers/scim/migrations/0009_alter_scimmapping_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.0.8 on 2024-08-12 12:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("authentik_providers_scim", "0008_rename_scimgroup_scimprovidergroup_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="scimmapping",
+            options={
+                "verbose_name": "SCIM Provider Mapping",
+                "verbose_name_plural": "SCIM Provider Mappings",
+            },
+        ),
+    ]

authentik/providers/scim/models.py

@@ -133,7 +133,7 @@ class SCIMMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-scim-form"
+        return "ak-property-mapping-provider-scim-form"
 
     @property
     def serializer(self) -> type[Serializer]:
@@ -142,8 +142,8 @@ class SCIMMapping(PropertyMapping):
         return SCIMMappingSerializer
 
     def __str__(self):
-        return f"SCIM Mapping {self.name}"
+        return f"SCIM Provider Mapping {self.name}"
 
     class Meta:
-        verbose_name = _("SCIM Mapping")
+        verbose_name = _("SCIM Provider Mapping")
-        verbose_name_plural = _("SCIM Mappings")
+        verbose_name_plural = _("SCIM Provider Mappings")

authentik/providers/scim/urls.py

@@ -13,5 +13,5 @@ api_urlpatterns = [
     ("providers/scim", SCIMProviderViewSet),
     ("providers/scim_users", SCIMProviderUserViewSet),
     ("providers/scim_groups", SCIMProviderGroupViewSet),
-    ("propertymappings/scim", SCIMMappingViewSet),
+    ("propertymappings/provider/scim", SCIMMappingViewSet),
 ]

authentik/sources/ldap/models.py

@@ -290,7 +290,7 @@ class LDAPSourcePropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-ldap-source-form"
+        return "ak-property-mapping-source-ldap-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/sources/oauth/models.py

@@ -268,7 +268,7 @@ class OAuthSourcePropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-oauth-source-form"
+        return "ak-property-mapping-source-oauth-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/sources/plex/models.py

@@ -123,7 +123,7 @@ class PlexSourcePropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-plex-source-form"
+        return "ak-property-mapping-source-plex-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/sources/saml/models.py

@@ -299,7 +299,7 @@ class SAMLSourcePropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-saml-source-form"
+        return "ak-property-mapping-source-saml-form"
 
     @property
     def serializer(self) -> type[Serializer]:

authentik/sources/scim/models.py

@@ -85,7 +85,7 @@ class SCIMSourcePropertyMapping(PropertyMapping):
 
     @property
     def component(self) -> str:
-        return "ak-property-mapping-scim-source-form"
+        return "ak-property-mapping-source-scim-form"
 
     @property
     def serializer(self) -> type[Serializer]:

schema.yml

@@ -14565,9 +14565,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/rac/:
+  /propertymappings/provider/rac/:
     get:
-      operationId: propertymappings_rac_list
+      operationId: propertymappings_provider_rac_list
       description: RACPropertyMapping Viewset
       parameters:
       - in: query
@@ -14630,7 +14630,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     post:
-      operationId: propertymappings_rac_create
+      operationId: propertymappings_provider_rac_create
       description: RACPropertyMapping Viewset
       tags:
       - propertymappings
@@ -14661,9 +14661,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/rac/{pm_uuid}/:
+  /propertymappings/provider/rac/{pm_uuid}/:
     get:
-      operationId: propertymappings_rac_retrieve
+      operationId: propertymappings_provider_rac_retrieve
       description: RACPropertyMapping Viewset
       parameters:
       - in: path
@@ -14671,7 +14671,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this RAC Property Mapping.
+        description: A UUID string identifying this RAC Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -14697,7 +14697,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     put:
-      operationId: propertymappings_rac_update
+      operationId: propertymappings_provider_rac_update
       description: RACPropertyMapping Viewset
       parameters:
       - in: path
@@ -14705,7 +14705,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this RAC Property Mapping.
+        description: A UUID string identifying this RAC Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -14737,7 +14737,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     patch:
-      operationId: propertymappings_rac_partial_update
+      operationId: propertymappings_provider_rac_partial_update
       description: RACPropertyMapping Viewset
       parameters:
       - in: path
@@ -14745,7 +14745,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this RAC Property Mapping.
+        description: A UUID string identifying this RAC Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -14776,7 +14776,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     delete:
-      operationId: propertymappings_rac_destroy
+      operationId: propertymappings_provider_rac_destroy
       description: RACPropertyMapping Viewset
       parameters:
       - in: path
@@ -14784,7 +14784,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this RAC Property Mapping.
+        description: A UUID string identifying this RAC Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -14805,9 +14805,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/rac/{pm_uuid}/used_by/:
+  /propertymappings/provider/rac/{pm_uuid}/used_by/:
     get:
-      operationId: propertymappings_rac_used_by_list
+      operationId: propertymappings_provider_rac_used_by_list
       description: Get a list of all objects that use this object
       parameters:
       - in: path
@@ -14815,7 +14815,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this RAC Property Mapping.
+        description: A UUID string identifying this RAC Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -14842,9 +14842,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/radius/:
+  /propertymappings/provider/radius/:
     get:
-      operationId: propertymappings_radius_list
+      operationId: propertymappings_provider_radius_list
       description: RadiusProviderPropertyMapping Viewset
       parameters:
       - in: query
@@ -14911,7 +14911,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     post:
-      operationId: propertymappings_radius_create
+      operationId: propertymappings_provider_radius_create
       description: RadiusProviderPropertyMapping Viewset
       tags:
       - propertymappings
@@ -14942,9 +14942,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/radius/{pm_uuid}/:
+  /propertymappings/provider/radius/{pm_uuid}/:
     get:
-      operationId: propertymappings_radius_retrieve
+      operationId: propertymappings_provider_radius_retrieve
       description: RadiusProviderPropertyMapping Viewset
       parameters:
       - in: path
@@ -14952,7 +14952,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this Radius Property Mapping.
+        description: A UUID string identifying this Radius Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -14978,7 +14978,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     put:
-      operationId: propertymappings_radius_update
+      operationId: propertymappings_provider_radius_update
       description: RadiusProviderPropertyMapping Viewset
       parameters:
       - in: path
@@ -14986,7 +14986,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this Radius Property Mapping.
+        description: A UUID string identifying this Radius Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15018,7 +15018,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     patch:
-      operationId: propertymappings_radius_partial_update
+      operationId: propertymappings_provider_radius_partial_update
       description: RadiusProviderPropertyMapping Viewset
       parameters:
       - in: path
@@ -15026,7 +15026,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this Radius Property Mapping.
+        description: A UUID string identifying this Radius Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15057,7 +15057,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     delete:
-      operationId: propertymappings_radius_destroy
+      operationId: propertymappings_provider_radius_destroy
       description: RadiusProviderPropertyMapping Viewset
       parameters:
       - in: path
@@ -15065,7 +15065,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this Radius Property Mapping.
+        description: A UUID string identifying this Radius Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15086,9 +15086,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/radius/{pm_uuid}/used_by/:
+  /propertymappings/provider/radius/{pm_uuid}/used_by/:
     get:
-      operationId: propertymappings_radius_used_by_list
+      operationId: propertymappings_provider_radius_used_by_list
       description: Get a list of all objects that use this object
       parameters:
       - in: path
@@ -15096,7 +15096,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this Radius Property Mapping.
+        description: A UUID string identifying this Radius Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15123,9 +15123,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/saml/:
+  /propertymappings/provider/saml/:
     get:
-      operationId: propertymappings_saml_list
+      operationId: propertymappings_provider_saml_list
       description: SAMLPropertyMapping Viewset
       parameters:
       - in: query
@@ -15200,7 +15200,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     post:
-      operationId: propertymappings_saml_create
+      operationId: propertymappings_provider_saml_create
       description: SAMLPropertyMapping Viewset
       tags:
       - propertymappings
@@ -15231,9 +15231,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/saml/{pm_uuid}/:
+  /propertymappings/provider/saml/{pm_uuid}/:
     get:
-      operationId: propertymappings_saml_retrieve
+      operationId: propertymappings_provider_saml_retrieve
       description: SAMLPropertyMapping Viewset
       parameters:
       - in: path
@@ -15241,7 +15241,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SAML Property Mapping.
+        description: A UUID string identifying this SAML Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15267,7 +15267,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     put:
-      operationId: propertymappings_saml_update
+      operationId: propertymappings_provider_saml_update
       description: SAMLPropertyMapping Viewset
       parameters:
       - in: path
@@ -15275,7 +15275,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SAML Property Mapping.
+        description: A UUID string identifying this SAML Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15307,7 +15307,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     patch:
-      operationId: propertymappings_saml_partial_update
+      operationId: propertymappings_provider_saml_partial_update
       description: SAMLPropertyMapping Viewset
       parameters:
       - in: path
@@ -15315,7 +15315,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SAML Property Mapping.
+        description: A UUID string identifying this SAML Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15346,7 +15346,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     delete:
-      operationId: propertymappings_saml_destroy
+      operationId: propertymappings_provider_saml_destroy
       description: SAMLPropertyMapping Viewset
       parameters:
       - in: path
@@ -15354,7 +15354,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SAML Property Mapping.
+        description: A UUID string identifying this SAML Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15375,9 +15375,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/saml/{pm_uuid}/used_by/:
+  /propertymappings/provider/saml/{pm_uuid}/used_by/:
     get:
-      operationId: propertymappings_saml_used_by_list
+      operationId: propertymappings_provider_saml_used_by_list
       description: Get a list of all objects that use this object
       parameters:
       - in: path
@@ -15385,7 +15385,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SAML Property Mapping.
+        description: A UUID string identifying this SAML Provider Property Mapping.
         required: true
       tags:
       - propertymappings
@@ -15412,9 +15412,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/scim/:
+  /propertymappings/provider/scim/:
     get:
-      operationId: propertymappings_scim_list
+      operationId: propertymappings_provider_scim_list
       description: SCIMMapping Viewset
       parameters:
       - in: query
@@ -15481,7 +15481,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     post:
-      operationId: propertymappings_scim_create
+      operationId: propertymappings_provider_scim_create
       description: SCIMMapping Viewset
       tags:
       - propertymappings
@@ -15512,9 +15512,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/scim/{pm_uuid}/:
+  /propertymappings/provider/scim/{pm_uuid}/:
     get:
-      operationId: propertymappings_scim_retrieve
+      operationId: propertymappings_provider_scim_retrieve
       description: SCIMMapping Viewset
       parameters:
       - in: path
@@ -15522,7 +15522,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SCIM Mapping.
+        description: A UUID string identifying this SCIM Provider Mapping.
         required: true
       tags:
       - propertymappings
@@ -15548,7 +15548,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     put:
-      operationId: propertymappings_scim_update
+      operationId: propertymappings_provider_scim_update
       description: SCIMMapping Viewset
       parameters:
       - in: path
@@ -15556,7 +15556,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SCIM Mapping.
+        description: A UUID string identifying this SCIM Provider Mapping.
         required: true
       tags:
       - propertymappings
@@ -15588,7 +15588,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     patch:
-      operationId: propertymappings_scim_partial_update
+      operationId: propertymappings_provider_scim_partial_update
       description: SCIMMapping Viewset
       parameters:
       - in: path
@@ -15596,7 +15596,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SCIM Mapping.
+        description: A UUID string identifying this SCIM Provider Mapping.
         required: true
       tags:
       - propertymappings
@@ -15627,7 +15627,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     delete:
-      operationId: propertymappings_scim_destroy
+      operationId: propertymappings_provider_scim_destroy
       description: SCIMMapping Viewset
       parameters:
       - in: path
@@ -15635,7 +15635,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SCIM Mapping.
+        description: A UUID string identifying this SCIM Provider Mapping.
         required: true
       tags:
       - propertymappings
@@ -15656,9 +15656,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/scim/{pm_uuid}/used_by/:
+  /propertymappings/provider/scim/{pm_uuid}/used_by/:
     get:
-      operationId: propertymappings_scim_used_by_list
+      operationId: propertymappings_provider_scim_used_by_list
       description: Get a list of all objects that use this object
       parameters:
       - in: path
@@ -15666,7 +15666,7 @@ paths:
         schema:
           type: string
           format: uuid
-        description: A UUID string identifying this SCIM Mapping.
+        description: A UUID string identifying this SCIM Provider Mapping.
         required: true
       tags:
       - propertymappings
@@ -15693,9 +15693,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/scope/:
+  /propertymappings/provider/scope/:
     get:
-      operationId: propertymappings_scope_list
+      operationId: propertymappings_provider_scope_list
       description: ScopeMapping Viewset
       parameters:
       - in: query
@@ -15766,7 +15766,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     post:
-      operationId: propertymappings_scope_create
+      operationId: propertymappings_provider_scope_create
       description: ScopeMapping Viewset
       tags:
       - propertymappings
@@ -15797,9 +15797,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/scope/{pm_uuid}/:
+  /propertymappings/provider/scope/{pm_uuid}/:
     get:
-      operationId: propertymappings_scope_retrieve
+      operationId: propertymappings_provider_scope_retrieve
       description: ScopeMapping Viewset
       parameters:
       - in: path
@@ -15833,7 +15833,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     put:
-      operationId: propertymappings_scope_update
+      operationId: propertymappings_provider_scope_update
       description: ScopeMapping Viewset
       parameters:
       - in: path
@@ -15873,7 +15873,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     patch:
-      operationId: propertymappings_scope_partial_update
+      operationId: propertymappings_provider_scope_partial_update
       description: ScopeMapping Viewset
       parameters:
       - in: path
@@ -15912,7 +15912,7 @@ paths:
                 $ref: '#/components/schemas/GenericError'
           description: ''
     delete:
-      operationId: propertymappings_scope_destroy
+      operationId: propertymappings_provider_scope_destroy
       description: ScopeMapping Viewset
       parameters:
       - in: path
@@ -15941,9 +15941,9 @@ paths:
               schema:
                 $ref: '#/components/schemas/GenericError'
           description: ''
-  /propertymappings/scope/{pm_uuid}/used_by/:
+  /propertymappings/provider/scope/{pm_uuid}/used_by/:
     get:
-      operationId: propertymappings_scope_used_by_list
+      operationId: propertymappings_provider_scope_used_by_list
       description: Get a list of all objects that use this object
       parameters:
       - in: path

web/src/admin/applications/wizard/methods/saml/ak-application-wizard-authentication-by-saml-configuration.ts

@@ -40,7 +40,7 @@ export class ApplicationWizardProviderSamlConfiguration extends BaseProviderPane
     constructor() {
         super();
         new PropertymappingsApi(DEFAULT_CONFIG)
-            .propertymappingsSamlList({
+            .propertymappingsProviderSamlList({
                 ordering: "saml_name",
             })
             .then((propertyMappings: PaginatedSAMLPropertyMappingList) => {

web/src/admin/applications/wizard/methods/saml/saml-property-mappings-search.ts

@@ -9,18 +9,20 @@ import { property, query } from "lit/decorators.js";
 
 import {
     PropertymappingsApi,
-    PropertymappingsSamlListRequest,
+    PropertymappingsProviderSamlListRequest,
     SAMLPropertyMapping,
 } from "@goauthentik/api";
 
 async function fetchObjects(query?: string): Promise<SAMLPropertyMapping[]> {
-    const args: PropertymappingsSamlListRequest = {
+    const args: PropertymappingsProviderSamlListRequest = {
         ordering: "saml_name",
     };
     if (query !== undefined) {
         args.search = query;
     }
-    const items = await new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlList(args);
+    const items = await new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlList(
+        args,
+    );
     return items.results;
 }
 

web/src/admin/applications/wizard/methods/scim/ak-application-wizard-authentication-by-scim.ts

@@ -27,7 +27,7 @@ export class ApplicationWizardAuthenticationBySCIM extends BaseProviderPanel {
     constructor() {
         super();
         new PropertymappingsApi(DEFAULT_CONFIG)
-            .propertymappingsScimList({
+            .propertymappingsProviderScimList({
                 ordering: "managed",
             })
             .then((propertyMappings: PaginatedSCIMMappingList) => {

web/src/admin/property-mappings/PropertyMappingListPage.ts

@@ -1,16 +1,16 @@
-import "@goauthentik/admin/property-mappings/PropertyMappingGoogleWorkspaceForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingLDAPSourceForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingMicrosoftEntraForm";
 import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
-import "@goauthentik/admin/property-mappings/PropertyMappingOAuthSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingPlexSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingRACForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderRACForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingRadiusForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderRadiusForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderSAMLForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSAMLSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderSCIMForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSCIMForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderScopeForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSCIMSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceLDAPForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceOAuthForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourcePlexForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceSAMLForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceSCIMForm";
 import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
 import "@goauthentik/admin/property-mappings/PropertyMappingWizard";
 import "@goauthentik/admin/rbac/ObjectPermissionModal";

web/src/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { GoogleWorkspaceProviderMapping, PropertymappingsApi } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-google-workspace-form")
+@customElement("ak-property-mapping-provider-google-workspace-form")
-export class PropertyMappingGoogleWorkspaceForm extends BasePropertyMappingForm<GoogleWorkspaceProviderMapping> {
+export class PropertyMappingProviderGoogleWorkspaceForm extends BasePropertyMappingForm<GoogleWorkspaceProviderMapping> {
     loadInstance(pk: string): Promise<GoogleWorkspaceProviderMapping> {
         return new PropertymappingsApi(
             DEFAULT_CONFIG,
@@ -37,6 +37,6 @@ export class PropertyMappingGoogleWorkspaceForm extends BasePropertyMappingForm<
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-google-workspace-form": PropertyMappingGoogleWorkspaceForm;
+        "ak-property-mapping-provider-google-workspace-form": PropertyMappingProviderGoogleWorkspaceForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { MicrosoftEntraProviderMapping, PropertymappingsApi } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-microsoft-entra-form")
+@customElement("ak-property-mapping-provider-microsoft-entra-form")
-export class PropertyMappingMicrosoftEntraForm extends BasePropertyMappingForm<MicrosoftEntraProviderMapping> {
+export class PropertyMappingProviderMicrosoftEntraForm extends BasePropertyMappingForm<MicrosoftEntraProviderMapping> {
     loadInstance(pk: string): Promise<MicrosoftEntraProviderMapping> {
         return new PropertymappingsApi(
             DEFAULT_CONFIG,
@@ -37,6 +37,6 @@ export class PropertyMappingMicrosoftEntraForm extends BasePropertyMappingForm<M
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-microsoft-entra-form": PropertyMappingMicrosoftEntraForm;
+        "ak-property-mapping-provider-microsoft-entra-form": PropertyMappingProviderMicrosoftEntraForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingProviderRACForm.ts

@@ -32,10 +32,10 @@ export const staticSettingOptions: RadioOption<string | undefined>[] = [
     },
 ];
 
-@customElement("ak-property-mapping-rac-form")
+@customElement("ak-property-mapping-provider-rac-form")
-export class PropertyMappingRACForm extends ModelForm<RACPropertyMapping, string> {
+export class PropertyMappingProviderRACForm extends ModelForm<RACPropertyMapping, string> {
     loadInstance(pk: string): Promise<RACPropertyMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacRetrieve({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacRetrieve({
             pmUuid: pk,
         });
     }
@@ -50,12 +50,12 @@ export class PropertyMappingRACForm extends ModelForm<RACPropertyMapping, string
 
     async send(data: RACPropertyMapping): Promise<RACPropertyMapping> {
         if (this.instance) {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacUpdate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacUpdate({
                 pmUuid: this.instance.pk,
                 rACPropertyMappingRequest: data,
             });
         } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacCreate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRacCreate({
                 rACPropertyMappingRequest: data,
             });
         }
@@ -177,6 +177,6 @@ export class PropertyMappingRACForm extends ModelForm<RACPropertyMapping, string
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-rac-form": PropertyMappingRACForm;
+        "ak-property-mapping-provider-rac-form": PropertyMappingProviderRACForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingProviderRadiusForm.ts

@@ -7,22 +7,22 @@ import { customElement } from "lit/decorators.js";
 
 import { PropertymappingsApi, RadiusProviderPropertyMapping } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-radius-form")
+@customElement("ak-property-mapping-provider-radius-form")
-export class PropertyMappingRadiusForm extends BasePropertyMappingForm<RadiusProviderPropertyMapping> {
+export class PropertyMappingProviderRadiusForm extends BasePropertyMappingForm<RadiusProviderPropertyMapping> {
     loadInstance(pk: string): Promise<RadiusProviderPropertyMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRadiusRetrieve({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusRetrieve({
             pmUuid: pk,
         });
     }
 
     async send(data: RadiusProviderPropertyMapping): Promise<RadiusProviderPropertyMapping> {
         if (this.instance) {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRadiusUpdate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusUpdate({
                 pmUuid: this.instance.pk,
                 radiusProviderPropertyMappingRequest: data,
             });
         } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRadiusCreate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderRadiusCreate({
                 radiusProviderPropertyMappingRequest: data,
             });
         }
@@ -31,6 +31,6 @@ export class PropertyMappingRadiusForm extends BasePropertyMappingForm<RadiusPro
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-radius-form": PropertyMappingRadiusForm;
+        "ak-property-mapping-provider-radius-form": PropertyMappingProviderRadiusForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingProviderSAMLForm.ts

@@ -10,22 +10,22 @@ import { ifDefined } from "lit/directives/if-defined.js";
 
 import { PropertymappingsApi, SAMLPropertyMapping } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-saml-form")
+@customElement("ak-property-mapping-provider-saml-form")
-export class PropertyMappingSAMLForm extends BasePropertyMappingForm<SAMLPropertyMapping> {
+export class PropertyMappingProviderSAMLForm extends BasePropertyMappingForm<SAMLPropertyMapping> {
     loadInstance(pk: string): Promise<SAMLPropertyMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlRetrieve({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlRetrieve({
             pmUuid: pk,
         });
     }
 
     async send(data: SAMLPropertyMapping): Promise<SAMLPropertyMapping> {
         if (this.instance) {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlUpdate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlUpdate({
                 pmUuid: this.instance.pk,
                 sAMLPropertyMappingRequest: data,
             });
         } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlCreate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderSamlCreate({
                 sAMLPropertyMappingRequest: data,
             });
         }
@@ -64,6 +64,6 @@ export class PropertyMappingSAMLForm extends BasePropertyMappingForm<SAMLPropert
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-saml-form": PropertyMappingSAMLForm;
+        "ak-property-mapping-provider-saml-form": PropertyMappingProviderSAMLForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingProviderSCIMForm.ts

@@ -7,22 +7,22 @@ import { customElement } from "lit/decorators.js";
 
 import { PropertymappingsApi, SCIMMapping } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-scim-form")
+@customElement("ak-property-mapping-provider-scim-form")
-export class PropertyMappingSCIMForm extends BasePropertyMappingForm<SCIMMapping> {
+export class PropertyMappingProviderSCIMForm extends BasePropertyMappingForm<SCIMMapping> {
     loadInstance(pk: string): Promise<SCIMMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimRetrieve({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimRetrieve({
             pmUuid: pk,
         });
     }
 
     async send(data: SCIMMapping): Promise<SCIMMapping> {
         if (this.instance) {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimUpdate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimUpdate({
                 pmUuid: this.instance.pk,
                 sCIMMappingRequest: data,
             });
         } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimCreate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScimCreate({
                 sCIMMappingRequest: data,
             });
         }
@@ -31,6 +31,6 @@ export class PropertyMappingSCIMForm extends BasePropertyMappingForm<SCIMMapping
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-scim-form": PropertyMappingSCIMForm;
+        "ak-property-mapping-provider-scim-form": PropertyMappingProviderSCIMForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingProviderScopeForm.ts

@@ -10,22 +10,22 @@ import { ifDefined } from "lit/directives/if-defined.js";
 
 import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-scope-form")
+@customElement("ak-property-mapping-provider-scope-form")
-export class PropertyMappingScopeForm extends BasePropertyMappingForm<ScopeMapping> {
+export class PropertyMappingProviderScopeForm extends BasePropertyMappingForm<ScopeMapping> {
     loadInstance(pk: string): Promise<ScopeMapping> {
-        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeRetrieve({
+        return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeRetrieve({
             pmUuid: pk,
         });
     }
 
     async send(data: ScopeMapping): Promise<ScopeMapping> {
         if (this.instance) {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeUpdate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeUpdate({
                 pmUuid: this.instance.pk,
                 scopeMappingRequest: data,
             });
         } else {
-            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScopeCreate({
+            return new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsProviderScopeCreate({
                 scopeMappingRequest: data,
             });
         }
@@ -64,6 +64,6 @@ export class PropertyMappingScopeForm extends BasePropertyMappingForm<ScopeMappi
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-scope-form": PropertyMappingScopeForm;
+        "ak-property-mapping-provider-scope-form": PropertyMappingProviderScopeForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingSourceLDAPForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { LDAPSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-ldap-source-form")
+@customElement("ak-property-mapping-source-ldap-form")
-export class PropertyMappingLDAPSourceForm extends BasePropertyMappingForm<LDAPSourcePropertyMapping> {
+export class PropertyMappingSourceLDAPForm extends BasePropertyMappingForm<LDAPSourcePropertyMapping> {
     docLink(): string {
         return "/docs/sources/property-mappings/expression?utm_source=authentik";
     }
@@ -35,6 +35,6 @@ export class PropertyMappingLDAPSourceForm extends BasePropertyMappingForm<LDAPS
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-ldap-source-form": PropertyMappingLDAPSourceForm;
+        "ak-property-mapping-source-ldap-form": PropertyMappingSourceLDAPForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingSourceOAuthForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { OAuthSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-oauth-source-form")
+@customElement("ak-property-mapping-source-oauth-form")
-export class PropertyMappingOAuthSourceForm extends BasePropertyMappingForm<OAuthSourcePropertyMapping> {
+export class PropertyMappingSourceOAuthForm extends BasePropertyMappingForm<OAuthSourcePropertyMapping> {
     docLink(): string {
         return "/docs/sources/property-mappings/expression?utm_source=authentik";
     }
@@ -35,6 +35,6 @@ export class PropertyMappingOAuthSourceForm extends BasePropertyMappingForm<OAut
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-oauth-source-form": PropertyMappingOAuthSourceForm;
+        "ak-property-mapping-source-oauth-form": PropertyMappingSourceOAuthForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingSourcePlexForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { PlexSourcePropertyMapping, PropertymappingsApi } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-plex-source-form")
+@customElement("ak-property-mapping-source-plex-form")
-export class PropertyMappingPlexSourceForm extends BasePropertyMappingForm<PlexSourcePropertyMapping> {
+export class PropertyMappingSourcePlexForm extends BasePropertyMappingForm<PlexSourcePropertyMapping> {
     docLink(): string {
         return "/docs/sources/property-mappings/expression?utm_source=authentik";
     }
@@ -35,6 +35,6 @@ export class PropertyMappingPlexSourceForm extends BasePropertyMappingForm<PlexS
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-plex-source-form": PropertyMappingPlexSourceForm;
+        "ak-property-mapping-source-plex-form": PropertyMappingSourcePlexForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingSourceSAMLForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { PropertymappingsApi, SAMLSourcePropertyMapping } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-saml-source-form")
+@customElement("ak-property-mapping-source-saml-form")
-export class PropertyMappingSAMLSourceForm extends BasePropertyMappingForm<SAMLSourcePropertyMapping> {
+export class PropertyMappingSourceSAMLForm extends BasePropertyMappingForm<SAMLSourcePropertyMapping> {
     docLink(): string {
         return "/docs/sources/property-mappings/expression?utm_source=authentik";
     }
@@ -35,6 +35,6 @@ export class PropertyMappingSAMLSourceForm extends BasePropertyMappingForm<SAMLS
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-saml-source-form": PropertyMappingSAMLSourceForm;
+        "ak-property-mapping-source-saml-form": PropertyMappingSourceSAMLForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingSourceSCIMForm.ts

@@ -7,8 +7,8 @@ import { customElement } from "lit/decorators.js";
 
 import { PropertymappingsApi, SCIMSourcePropertyMapping } from "@goauthentik/api";
 
-@customElement("ak-property-mapping-scim-source-form")
+@customElement("ak-property-mapping-source-scim-form")
-export class PropertyMappingSCIMSourceForm extends BasePropertyMappingForm<SCIMSourcePropertyMapping> {
+export class PropertyMappingSourceSCIMForm extends BasePropertyMappingForm<SCIMSourcePropertyMapping> {
     docLink(): string {
         return "/docs/sources/property-mappings/expression?utm_source=authentik";
     }
@@ -35,6 +35,6 @@ export class PropertyMappingSCIMSourceForm extends BasePropertyMappingForm<SCIMS
 
 declare global {
     interface HTMLElementTagNameMap {
-        "ak-property-mapping-scim-source-form": PropertyMappingSCIMSourceForm;
+        "ak-property-mapping-source-scim-form": PropertyMappingSourceSCIMForm;
     }
 }

web/src/admin/property-mappings/PropertyMappingWizard.ts

@@ -1,12 +1,16 @@
-import "@goauthentik/admin/property-mappings/PropertyMappingLDAPSourceForm";
 import "@goauthentik/admin/property-mappings/PropertyMappingNotification";
-import "@goauthentik/admin/property-mappings/PropertyMappingOAuthSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderGoogleWorkspaceForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingPlexSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderMicrosoftEntraForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingRACForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderRACForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSAMLForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderRadiusForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSAMLSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderSAMLForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingSCIMSourceForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderSCIMForm";
-import "@goauthentik/admin/property-mappings/PropertyMappingScopeForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingProviderScopeForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceLDAPForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceOAuthForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourcePlexForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceSAMLForm";
+import "@goauthentik/admin/property-mappings/PropertyMappingSourceSCIMForm";
 import "@goauthentik/admin/property-mappings/PropertyMappingTestForm";
 import { DEFAULT_CONFIG } from "@goauthentik/common/api/config";
 import { AKElement } from "@goauthentik/elements/Base";

web/src/admin/providers/oauth2/Oauth2PropertyMappings.ts

@@ -6,7 +6,7 @@ import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api";
 export async function oauth2PropertyMappingsProvider(page = 1, search = "") {
     const propertyMappings = await new PropertymappingsApi(
         DEFAULT_CONFIG,
-    ).propertymappingsScopeList({
+    ).propertymappingsProviderScopeList({
         ordering: "scope_name",
         pageSize: 20,
         search: search.trim(),

web/src/admin/providers/proxy/ProxyProviderPropertyMappings.ts

@@ -6,7 +6,7 @@ import { PropertymappingsApi, ScopeMapping } from "@goauthentik/api";
 export async function proxyPropertyMappingsProvider(page = 1, search = "") {
     const propertyMappings = await new PropertymappingsApi(
         DEFAULT_CONFIG,
-    ).propertymappingsScopeList({
+    ).propertymappingsProviderScopeList({
         ordering: "scope_name",
         pageSize: 20,
         search: search.trim(),

web/src/admin/providers/rac/RACPropertyMappings.ts

@@ -4,7 +4,9 @@ import { DualSelectPair } from "@goauthentik/elements/ak-dual-select/types.js";
 import { PropertymappingsApi } from "@goauthentik/api";
 
 export async function racPropertyMappingsProvider(page = 1, search = "") {
-    const propertyMappings = await new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsRacList({
+    const propertyMappings = await new PropertymappingsApi(
+        DEFAULT_CONFIG,
+    ).propertymappingsProviderRacList({
         ordering: "name",
         pageSize: 20,
         search: search.trim(),

web/src/admin/providers/radius/RadiusProviderForm.ts

@@ -23,7 +23,7 @@ import {
 export async function radiusPropertyMappingsProvider(page = 1, search = "") {
     const propertyMappings = await new PropertymappingsApi(
         DEFAULT_CONFIG,
-    ).propertymappingsRadiusList({
+    ).propertymappingsProviderRadiusList({
         ordering: "name",
         pageSize: 20,
         search: search.trim(),

web/src/admin/providers/saml/SAMLProviderForm.ts

@@ -22,7 +22,7 @@ import { ifDefined } from "lit/directives/if-defined.js";
 import {
     FlowsInstancesListDesignationEnum,
     PropertymappingsApi,
-    PropertymappingsSamlListRequest,
+    PropertymappingsProviderSamlListRequest,
     ProvidersApi,
     SAMLPropertyMapping,
     SAMLProvider,
@@ -30,14 +30,14 @@ import {
 } from "@goauthentik/api";
 
 export async function samlPropertyMappingsProvider(page = 1, search = "") {
-    const propertyMappings = await new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsSamlList(
+    const propertyMappings = await new PropertymappingsApi(
-        {
+        DEFAULT_CONFIG,
-            ordering: "saml_name",
+    ).propertymappingsProviderSamlList({
-            pageSize: 20,
+        ordering: "saml_name",
-            search: search.trim(),
+        pageSize: 20,
-            page,
+        search: search.trim(),
-        },
+        page,
-    );
+    });
     return {
         pagination: propertyMappings.pagination,
         options: propertyMappings.results.map((m) => [m.pk, m.name, m.name, m]),
@@ -226,7 +226,7 @@ export class SAMLProviderFormPage extends BaseProviderForm<SAMLProvider> {
                             .fetchObjects=${async (
                                 query?: string,
                             ): Promise<SAMLPropertyMapping[]> => {
-                                const args: PropertymappingsSamlListRequest = {
+                                const args: PropertymappingsProviderSamlListRequest = {
                                     ordering: "saml_name",
                                 };
                                 if (query !== undefined) {
@@ -234,7 +234,7 @@ export class SAMLProviderFormPage extends BaseProviderForm<SAMLProvider> {
                                 }
                                 const items = await new PropertymappingsApi(
                                     DEFAULT_CONFIG,
-                                ).propertymappingsSamlList(args);
+                                ).propertymappingsProviderSamlList(args);
                                 return items.results;
                             }}
                             .renderElement=${(item: SAMLPropertyMapping): string => {

web/src/admin/providers/scim/SCIMProviderForm.ts

@@ -24,14 +24,14 @@ import {
 } from "@goauthentik/api";
 
 export async function scimPropertyMappingsProvider(page = 1, search = "") {
-    const propertyMappings = await new PropertymappingsApi(DEFAULT_CONFIG).propertymappingsScimList(
+    const propertyMappings = await new PropertymappingsApi(
-        {
+        DEFAULT_CONFIG,
-            ordering: "managed",
+    ).propertymappingsProviderScimList({
-            pageSize: 20,
+        ordering: "managed",
-            search: search.trim(),
+        pageSize: 20,
-            page,
+        search: search.trim(),
-        },
+        page,
-    );
+    });
     return {
         pagination: propertyMappings.pagination,
         options: propertyMappings.results.map((m) => [m.pk, m.name, m.name, m]),