diff --git a/authentik/enterprise/providers/scim/tests/test_api.py b/authentik/enterprise/providers/scim/tests/test_api.py index bc005238b4..900a6b206f 100644 --- a/authentik/enterprise/providers/scim/tests/test_api.py +++ b/authentik/enterprise/providers/scim/tests/test_api.py @@ -46,7 +46,7 @@ class TestSCIMOAuthAPI(APITestCase): { "name": generate_id(), "url": "http://localhost", - "auth_mode": "oauth_silent", + "auth_mode": "oauth", "auth_oauth": str(self.source.pk), }, ) @@ -63,7 +63,7 @@ class TestSCIMOAuthAPI(APITestCase): { "name": generate_id(), "url": "http://localhost", - "auth_mode": "oauth_silent", + "auth_mode": "oauth", "auth_oauth": str(self.source.pk), }, ) diff --git a/authentik/providers/scim/migrations/0019_scimprovider_group_filters_and_more.py b/authentik/providers/scim/migrations/0019_scimprovider_group_filters_and_more.py index d697283783..3a0f82e245 100644 --- a/authentik/providers/scim/migrations/0019_scimprovider_group_filters_and_more.py +++ b/authentik/providers/scim/migrations/0019_scimprovider_group_filters_and_more.py @@ -102,4 +102,16 @@ class Migration(migrations.Migration): verbose_name="SCIM Compatibility Mode", ), ), + migrations.AlterField( + model_name="scimprovider", + name="auth_mode", + field=models.TextField( + choices=[ + ("token", "Token"), + ("oauth_silent", "OAuth (Silent)"), + ("oauth_interactive", "OAuth (interactive)"), + ], + default="token", + ), + ), ] diff --git a/authentik/providers/scim/migrations/0020_alter_scimprovider_auth_mode.py b/authentik/providers/scim/migrations/0020_alter_scimprovider_auth_mode.py deleted file mode 100644 index 024797fd43..0000000000 --- a/authentik/providers/scim/migrations/0020_alter_scimprovider_auth_mode.py +++ /dev/null @@ -1,36 +0,0 @@ -# Generated by Django 5.2.14 on 2026-05-05 22:11 - -from django.db import migrations, models -from django.apps.registry import Apps - -from django.db.backends.base.schema import BaseDatabaseSchemaEditor - - -def update_oauth(apps: Apps, schema_editor: BaseDatabaseSchemaEditor): - db_alias = schema_editor.connection.alias - - SCIMProvider = apps.get("authentik_providers_scim", "scimprovider") - - SCIMProvider.objects.using(db_alias).filter(auth_mode="oauth").update(auth_mode="oauth_silent") - - -class Migration(migrations.Migration): - - dependencies = [ - ("authentik_providers_scim", "0019_scimprovider_group_filters_and_more"), - ] - - operations = [ - migrations.AlterField( - model_name="scimprovider", - name="auth_mode", - field=models.TextField( - choices=[ - ("token", "Token"), - ("oauth_silent", "OAuth (Silent)"), - ("oauth_interactive", "OAuth (interactive)"), - ], - default="token", - ), - ), - ] diff --git a/authentik/providers/scim/models.py b/authentik/providers/scim/models.py index a7ae02d118..3fe265f1ac 100644 --- a/authentik/providers/scim/models.py +++ b/authentik/providers/scim/models.py @@ -72,7 +72,7 @@ class SCIMAuthenticationMode(models.TextChoices): """SCIM authentication modes""" TOKEN = "token", _("Token") - OAUTH_SILENT = "oauth_silent", _("OAuth (Silent)") + OAUTH_SILENT = "oauth", _("OAuth (Silent)") OAUTH_INTERACTIVE = "oauth_interactive", _("OAuth (interactive)") diff --git a/blueprints/schema.json b/blueprints/schema.json index 57a4632092..606ed92033 100644 --- a/blueprints/schema.json +++ b/blueprints/schema.json @@ -11203,7 +11203,7 @@ "type": "string", "enum": [ "token", - "oauth_silent", + "oauth", "oauth_interactive" ], "title": "Auth mode" diff --git a/packages/client-ts/src/models/SCIMAuthenticationModeEnum.ts b/packages/client-ts/src/models/SCIMAuthenticationModeEnum.ts index 5d9d0668db..97580c7bd4 100644 --- a/packages/client-ts/src/models/SCIMAuthenticationModeEnum.ts +++ b/packages/client-ts/src/models/SCIMAuthenticationModeEnum.ts @@ -18,7 +18,7 @@ */ export const SCIMAuthenticationModeEnum = { Token: "token", - OauthSilent: "oauth_silent", + Oauth: "oauth", OauthInteractive: "oauth_interactive", UnknownDefaultOpenApi: "11184809", } as const; diff --git a/schema.yml b/schema.yml index e9cab586ae..32b72040bc 100644 --- a/schema.yml +++ b/schema.yml @@ -54864,7 +54864,7 @@ components: SCIMAuthenticationModeEnum: enum: - token - - oauth_silent + - oauth - oauth_interactive type: string SCIMMapping: