providers/oauth2: add user id as "sub" mode

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

authentik/providers/oauth2/models.py

@@ -65,6 +65,7 @@ class SubModes(models.TextChoices):
     """Mode after which 'sub' attribute is generateed, for compatibility reasons"""
 
     HASHED_USER_ID = "hashed_user_id", _("Based on the Hashed User ID")
+    USER_ID = "user_id", _("Based on user ID")
     USER_USERNAME = "user_username", _("Based on the username")
     USER_EMAIL = (
         "user_email",
@@ -485,6 +486,8 @@ class RefreshToken(SerializerModel, ExpiringModel, BaseGrantModel):
         sub = ""
         if self.provider.sub_mode == SubModes.HASHED_USER_ID:
             sub = user.uid
+        elif self.provider.sub_mode == SubModes.USER_ID:
+            sub = user.pk
         elif self.provider.sub_mode == SubModes.USER_EMAIL:
             sub = user.email
         elif self.provider.sub_mode == SubModes.USER_USERNAME:

locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-23 09:41+0000\n"
+"POT-Creation-Date: 2023-01-29 15:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,11 +69,11 @@ msgstr ""
 msgid "Create a SAML Provider by importing its Metadata."
 msgstr ""
 
-#: authentik/core/api/users.py:113
+#: authentik/core/api/users.py:116
 msgid "No leading or trailing slashes allowed."
 msgstr ""
 
-#: authentik/core/api/users.py:116
+#: authentik/core/api/users.py:119
 msgid "No empty segments in user path allowed."
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr ""
 msgid "User's display name."
 msgstr ""
 
-#: authentik/core/models.py:263 authentik/providers/oauth2/models.py:332
+#: authentik/core/models.py:263 authentik/providers/oauth2/models.py:333
 msgid "User"
 msgstr ""
 
@@ -748,180 +748,184 @@ msgid "Based on the Hashed User ID"
 msgstr ""
 
 #: authentik/providers/oauth2/models.py:68
+msgid "Based on user ID"
+msgstr ""
+
+#: authentik/providers/oauth2/models.py:69
 msgid "Based on the username"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:71
+#: authentik/providers/oauth2/models.py:72
 msgid "Based on the User's Email. This is recommended over the UPN method."
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:87
+#: authentik/providers/oauth2/models.py:88
 msgid "Same identifier is used for all providers"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:89
+#: authentik/providers/oauth2/models.py:90
 msgid "Each provider has a different issuer, based on the application slug."
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:96
+#: authentik/providers/oauth2/models.py:97
 msgid "code (Authorization Code Flow)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:97
+#: authentik/providers/oauth2/models.py:98
 msgid "id_token (Implicit Flow)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:98
+#: authentik/providers/oauth2/models.py:99
 msgid "id_token token (Implicit Flow)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:99
+#: authentik/providers/oauth2/models.py:100
 msgid "code token (Hybrid Flow)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:100
+#: authentik/providers/oauth2/models.py:101
 msgid "code id_token (Hybrid Flow)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:101
+#: authentik/providers/oauth2/models.py:102
 msgid "code id_token token (Hybrid Flow)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:107
+#: authentik/providers/oauth2/models.py:108
 msgid "HS256 (Symmetric Encryption)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:108
+#: authentik/providers/oauth2/models.py:109
 msgid "RS256 (Asymmetric Encryption)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:109
+#: authentik/providers/oauth2/models.py:110
 msgid "ES256 (Asymmetric Encryption)"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:115
+#: authentik/providers/oauth2/models.py:116
 msgid "Scope used by the client"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:141
+#: authentik/providers/oauth2/models.py:142
 msgid "Scope Mapping"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:142
+#: authentik/providers/oauth2/models.py:143
 msgid "Scope Mappings"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:152
+#: authentik/providers/oauth2/models.py:153
 msgid "Client Type"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:154
+#: authentik/providers/oauth2/models.py:155
 msgid ""
 "Confidential clients are capable of maintaining the confidentiality of their "
 "credentials. Public clients are incapable"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:161
+#: authentik/providers/oauth2/models.py:162
 msgid "Client ID"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:167
+#: authentik/providers/oauth2/models.py:168
 msgid "Client Secret"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:173
+#: authentik/providers/oauth2/models.py:174
 msgid "Redirect URIs"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:174
+#: authentik/providers/oauth2/models.py:175
 msgid "Enter each URI on a new line."
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:179
+#: authentik/providers/oauth2/models.py:180
 msgid "Include claims in id_token"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:227
+#: authentik/providers/oauth2/models.py:228
 msgid "Signing Key"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:231
+#: authentik/providers/oauth2/models.py:232
 msgid ""
 "Key used to sign the tokens. Only required when JWT Algorithm is set to "
 "RS256."
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:238
+#: authentik/providers/oauth2/models.py:239
 msgid ""
 "Any JWT signed by the JWK of the selected source can be used to authenticate."
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:324
+#: authentik/providers/oauth2/models.py:325
 msgid "OAuth2/OpenID Provider"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:325
+#: authentik/providers/oauth2/models.py:326
 msgid "OAuth2/OpenID Providers"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:334
+#: authentik/providers/oauth2/models.py:335
-#: authentik/providers/oauth2/models.py:554
+#: authentik/providers/oauth2/models.py:557
 msgid "Scopes"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:352
+#: authentik/providers/oauth2/models.py:353
 msgid "Code"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:353
+#: authentik/providers/oauth2/models.py:354
 msgid "Nonce"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:354
+#: authentik/providers/oauth2/models.py:355
 msgid "Is Authentication?"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:355
+#: authentik/providers/oauth2/models.py:356
 msgid "Code Challenge"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:357
+#: authentik/providers/oauth2/models.py:358
 msgid "Code Challenge Method"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:377
+#: authentik/providers/oauth2/models.py:378
 msgid "Authorization Code"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:378
+#: authentik/providers/oauth2/models.py:379
 msgid "Authorization Codes"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:431
+#: authentik/providers/oauth2/models.py:434
 msgid "Access Token"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:432
+#: authentik/providers/oauth2/models.py:435
 msgid "Refresh Token"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:433
+#: authentik/providers/oauth2/models.py:436
 msgid "ID Token"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:442
+#: authentik/providers/oauth2/models.py:445
 msgid "OAuth2 Token"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:443
+#: authentik/providers/oauth2/models.py:446
 msgid "OAuth2 Tokens"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:566
+#: authentik/providers/oauth2/models.py:569
 msgid "Device Token"
 msgstr ""
 
-#: authentik/providers/oauth2/models.py:567
+#: authentik/providers/oauth2/models.py:570
 msgid "Device Tokens"
 msgstr ""
 
@@ -1871,23 +1875,23 @@ msgstr ""
 msgid "authentik: Selection of locales authentik supports"
 msgstr ""
 
-#: authentik/stages/prompt/models.py:101
+#: authentik/stages/prompt/models.py:102
 msgid "Name of the form field, also used to store the value"
 msgstr ""
 
-#: authentik/stages/prompt/models.py:197
+#: authentik/stages/prompt/models.py:198
 msgid "Prompt"
 msgstr ""
 
-#: authentik/stages/prompt/models.py:198
+#: authentik/stages/prompt/models.py:199
 msgid "Prompts"
 msgstr ""
 
-#: authentik/stages/prompt/models.py:226
+#: authentik/stages/prompt/models.py:227
 msgid "Prompt Stage"
 msgstr ""
 
-#: authentik/stages/prompt/models.py:227
+#: authentik/stages/prompt/models.py:228
 msgid "Prompt Stages"
 msgstr ""
 

schema.yml

@@ -4207,7 +4207,9 @@ paths:
   /core/tokens/{identifier}/set_key/:
     post:
       operationId: core_tokens_set_key_create
-      description: Return token key and log access
+      description: |-
+        Set token key. Action is logged as event. `authentik_core.set_token_key` permission
+        is required.
       parameters:
       - in: path
         name: identifier
@@ -14227,6 +14229,7 @@ paths:
           enum:
           - hashed_user_id
           - user_email
+          - user_id
           - user_upn
           - user_username
         description: Configure what data should be used as unique User Identifier.
@@ -37116,6 +37119,7 @@ components:
     SubModeEnum:
       enum:
       - hashed_user_id
+      - user_id
       - user_username
       - user_email
       - user_upn

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

@@ -316,32 +316,35 @@ ${this.instance?.redirectUris}</textarea
                         ?required=${true}
                         name="subMode"
                     >
-                        <select class="pf-c-form-control">
+                        <ak-radio
-                            <option
+                            .options=${[
-                                value="${SubModeEnum.HashedUserId}"
+                                {
-                                ?selected=${this.instance?.subMode === SubModeEnum.HashedUserId}
+                                    label: t`Based on the User's hashed ID`,
+                                    value: SubModeEnum.HashedUserId,
+                                    default: true,
+                                },
+                                {
+                                    label: t`Based on the User's ID`,
+                                    value: SubModeEnum.UserId,
+                                },
+                                {
+                                    label: t`Based on the User's username`,
+                                    value: SubModeEnum.UserUsername,
+                                },
+                                {
+                                    label: t`Based on the User's Email`,
+                                    value: SubModeEnum.UserEmail,
+                                    description: html`${t`This is recommended over the UPN mode.`}`,
+                                },
+                                {
+                                    label: t`Based on the User's UPN`,
+                                    value: SubModeEnum.UserUpn,
+                                    description: html`${t`Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains.`}`,
+                                },
+                            ]}
+                            .value=${this.instance?.subMode}
                         >
-                                ${t`Based on the Hashed User ID`}
+                        </ak-radio>
-                            </option>
-                            <option
-                                value="${SubModeEnum.UserUsername}"
-                                ?selected=${this.instance?.subMode === SubModeEnum.UserUsername}
-                            >
-                                ${t`Based on the username`}
-                            </option>
-                            <option
-                                value="${SubModeEnum.UserEmail}"
-                                ?selected=${this.instance?.subMode === SubModeEnum.UserEmail}
-                            >
-                                ${t`Based on the User's Email. This is recommended over the UPN method.`}
-                            </option>
-                            <option
-                                value="${SubModeEnum.UserUpn}"
-                                ?selected=${this.instance?.subMode === SubModeEnum.UserUpn}
-                            >
-                                ${t`Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains.`}
-                            </option>
-                        </select>
                         <p class="pf-c-form__helper-text">
                             ${t`Configure what data should be used as unique User Identifier. For most cases, the default should be fine.`}
                         </p>

web/src/locales/de.po

@@ -822,20 +822,40 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "Basierend auf der gehashten Benutzer ID"
+#~ msgstr "Basierend auf der gehashten Benutzer ID"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "Basierend auf der E-Mail des Benutzers. Dies wird gegenüber der UPN-Methode empfohlen."
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "Basierend auf dem UPN des Benutzers, funktioniert nur, wenn der Benutzer ein 'upn'-Attribut gesetzt hat. Verwenden Sie diese Methode nur, wenn Sie unterschiedliche UPN- und Mail-Domänen haben."
+#~ msgstr "Basierend auf der E-Mail des Benutzers. Dies wird gegenüber der UPN-Methode empfohlen."
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "Basierend auf dem Benutzernamen"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Basierend auf dem UPN des Benutzers, funktioniert nur, wenn der Benutzer ein 'upn'-Attribut gesetzt hat. Verwenden Sie diese Methode nur, wenn Sie unterschiedliche UPN- und Mail-Domänen haben."
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "Basierend auf dem Benutzernamen"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3326,7 +3346,6 @@ msgid "LDAP details"
 msgstr "LDAP-Details"
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "Beschriftung"
 
@@ -3818,6 +3837,8 @@ msgstr "Meine Anwendungen"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4447,6 +4468,7 @@ msgid "Passwordless flow"
 msgstr "Passwortloser Ablauf"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4993,6 +5015,10 @@ msgstr "Erforderlich"
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "Erforderlich. 150 Zeichen oder weniger. Nur Buchstaben, Zahlen und @/./+/-/_."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "Passwort zurücksetzen"
@@ -6387,6 +6413,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "Dieser Ablauf ist abgeschlossen."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "Dies ist der vollständige Endpunkt, an den POST-Anforderungen gesendet werden."
@@ -6708,6 +6738,10 @@ msgstr "Defekte Outposts"
 msgid "Unique identifier the token is referenced by."
 msgstr "Einzigartige Kennung zur Referenzierung des Token."
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/en.po

@@ -813,20 +813,40 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "Based on the Hashed User ID"
+#~ msgstr "Based on the Hashed User ID"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "Based on the User's Email. This is recommended over the UPN method."
+msgstr "Based on the User's Email"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Based on the User's Email. This is recommended over the UPN method."
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "Based on the username"
+msgstr "Based on the User's ID"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr "Based on the User's UPN"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr "Based on the User's hashed ID"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr "Based on the User's username"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "Based on the username"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3380,7 +3400,6 @@ msgid "LDAP details"
 msgstr "LDAP details"
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "Label"
 
@@ -3875,6 +3894,8 @@ msgstr "My applications"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4523,6 +4544,7 @@ msgid "Passwordless flow"
 msgstr "Passwordless flow"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr "Path"
@@ -5092,6 +5114,10 @@ msgstr "Required."
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "Reset Password"
@@ -6529,6 +6555,10 @@ msgstr "This configuration can be used to authenticate to authentik with other A
 msgid "This flow is completed."
 msgstr "This flow is completed."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr "This is recommended over the UPN mode."
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "This is the full endpoint to send POST requests to."
@@ -6856,6 +6886,10 @@ msgstr "Unhealthy outposts"
 msgid "Unique identifier the token is referenced by."
 msgstr "Unique identifier the token is referenced by."
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr "Unique name of this field, used for selecting fields in prompt stages."
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/es.po

@@ -800,20 +800,40 @@ msgid "Base DN"
 msgstr "DN base"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "Basado en el hash de ID de usuario"
+#~ msgstr "Basado en el hash de ID de usuario"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "Basado en el correo electrónico del usuario. Recomendado en lugar del método UPN."
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "Basado en el UPN del usuario, solo funciona si el usuario tiene un conjunto de atributos «upn». Use este método solo si tiene dominios UPN y Mail diferentes."
+#~ msgstr "Basado en el correo electrónico del usuario. Recomendado en lugar del método UPN."
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "Basado en el nombre de usuario"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Basado en el UPN del usuario, solo funciona si el usuario tiene un conjunto de atributos «upn». Use este método solo si tiene dominios UPN y Mail diferentes."
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "Basado en el nombre de usuario"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3302,7 +3322,6 @@ msgid "LDAP details"
 msgstr ""
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "Etiqueta"
 
@@ -3794,6 +3813,8 @@ msgstr "Mis aplicaciones"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4423,6 +4444,7 @@ msgid "Passwordless flow"
 msgstr "Flujo sin contraseña"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4969,6 +4991,10 @@ msgstr "Necesario."
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "Obligatorio. 150 caracteres o menos. Solo letras, dígitos y @/./+/-/_."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "Restablecer contraseña"
@@ -6363,6 +6389,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "Este flujo se ha completado."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "Este es el punto final completo al que enviar solicitudes POST."
@@ -6684,6 +6714,10 @@ msgstr "Puestos avanzados insalubres"
 msgid "Unique identifier the token is referenced by."
 msgstr "Identificador único por el que se hace referencia al token."
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/fr_FR.po

@@ -805,20 +805,40 @@ msgid "Base DN"
 msgstr "DN racine"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "Basé sur le hash de l'ID utilisateur"
+#~ msgstr "Basé sur le hash de l'ID utilisateur"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "Basé sur l’adresse email de l’utilisateur. Ceci est recommandé par rapport à la méthode UPN."
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "Basé sur l'UPN utilisateur, possible uniquement si l'utilisateur possède un attribut \"upn\" renseigné. Utiliser cette méthode seulement si les domaines UPN et courriel sont différents."
+#~ msgstr "Basé sur l’adresse email de l’utilisateur. Ceci est recommandé par rapport à la méthode UPN."
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "Basé sur le nom d'utilisateur"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Basé sur l'UPN utilisateur, possible uniquement si l'utilisateur possède un attribut \"upn\" renseigné. Utiliser cette méthode seulement si les domaines UPN et courriel sont différents."
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "Basé sur le nom d'utilisateur"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3303,7 +3323,6 @@ msgid "LDAP details"
 msgstr ""
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "Libellé"
 
@@ -3795,6 +3814,8 @@ msgstr "Mes applications"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4424,6 +4445,7 @@ msgid "Passwordless flow"
 msgstr "Flux sans mots de passe"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4970,6 +4992,10 @@ msgstr "Obligatoire."
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "Obligatoire. 150 caractères ou moins. Lettres, chiffres et @/./+/-/_ uniquement."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "Réinitialiser le mot de passe"
@@ -6354,6 +6380,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "Ce flux est terminé."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr ""
@@ -6675,6 +6705,10 @@ msgstr "Avant-postes malades"
 msgid "Unique identifier the token is referenced by."
 msgstr "Identifiant unique par lequel le jeton est référencé."
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/pl.po

@@ -804,20 +804,40 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "Na podstawie zahaszowanego identyfikatora użytkownika"
+#~ msgstr "Na podstawie zahaszowanego identyfikatora użytkownika"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "Na podstawie adresu e-mail użytkownika. Jest to zalecane zamiast metody UPN."
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "Na podstawie UPN użytkownika działa tylko wtedy, gdy użytkownik ma ustawiony atrybut „upn”. Użyj tej metody tylko wtedy, gdy masz różne  UPN i Mail domeny."
+#~ msgstr "Na podstawie adresu e-mail użytkownika. Jest to zalecane zamiast metody UPN."
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "Na podstawie nazwy użytkownika"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Na podstawie UPN użytkownika działa tylko wtedy, gdy użytkownik ma ustawiony atrybut „upn”. Użyj tej metody tylko wtedy, gdy masz różne  UPN i Mail domeny."
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "Na podstawie nazwy użytkownika"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3310,7 +3330,6 @@ msgid "LDAP details"
 msgstr "Szczegóły LDAP"
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "Etykieta"
 
@@ -3802,6 +3821,8 @@ msgstr "Moje aplikacje"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4431,6 +4452,7 @@ msgid "Passwordless flow"
 msgstr "Przepływ bezhasłowy"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4979,6 +5001,10 @@ msgstr "Wymagany."
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "Wymagane. 150 znaków lub mniej. Tylko litery, cyfry i @/./+/-/_."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "Zresetuj hasło"
@@ -6373,6 +6399,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "Ten przepływ jest zakończony."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "To jest pełny punkt końcowy, do którego wysyłane są żądania POST."
@@ -6694,6 +6724,10 @@ msgstr "Niezdrowe placówki"
 msgid "Unique identifier the token is referenced by."
 msgstr "Unikalny identyfikator, do którego odwołuje się token."
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/pseudo-LOCALE.po

@@ -805,21 +805,41 @@ msgid "Base DN"
 msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
+#~ msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's Email"
 msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
+#~ msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's ID"
 msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+msgid "Based on the User's UPN"
 msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
 msgstr ""
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr ""
+
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
 msgstr ""
@@ -3362,7 +3382,6 @@ msgid "LDAP details"
 msgstr ""
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr ""
 
@@ -3857,6 +3876,8 @@ msgstr ""
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4505,6 +4526,7 @@ msgid "Passwordless flow"
 msgstr ""
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -5072,6 +5094,10 @@ msgstr ""
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr ""
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr ""
@@ -6499,6 +6525,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr ""
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr ""
@@ -6826,6 +6856,10 @@ msgstr ""
 msgid "Unique identifier the token is referenced by."
 msgstr ""
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/tr.po

@@ -800,20 +800,40 @@ msgid "Base DN"
 msgstr "Taban DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "Karma Kullanıcı Kimliğine Dayalı"
+#~ msgstr "Karma Kullanıcı Kimliğine Dayalı"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "Kullanıcının E-postasına dayanır. Bu UPN yöntemi üzerinde önerilir."
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "Kullanıcının UPN'sine göre, yalnızca kullanıcı 'upn' özniteliği kümesi varsa çalışır. Bu yöntemi yalnızca farklı UPN ve Mail etki alanlarınız varsa kullanın."
+#~ msgstr "Kullanıcının E-postasına dayanır. Bu UPN yöntemi üzerinde önerilir."
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "Kullanıcı adına göre"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "Kullanıcının UPN'sine göre, yalnızca kullanıcı 'upn' özniteliği kümesi varsa çalışır. Bu yöntemi yalnızca farklı UPN ve Mail etki alanlarınız varsa kullanın."
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "Kullanıcı adına göre"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3302,7 +3322,6 @@ msgid "LDAP details"
 msgstr ""
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "Etiket"
 
@@ -3794,6 +3813,8 @@ msgstr "Uygulamalarım"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4423,6 +4444,7 @@ msgid "Passwordless flow"
 msgstr "Parolasız akış"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4969,6 +4991,10 @@ msgstr "Zorunlu."
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "Gerekli. 150 karakter veya daha az. Harfler, rakamlar ve yalnızca @/./+/-/_."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "Parolayı Sıfırla"
@@ -6363,6 +6389,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "Bu akış tamamlandı."
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "Bu, POST istekleri göndermek için tam bitiş noktasıdır."
@@ -6684,6 +6714,10 @@ msgstr "Sağlıksız üsler"
 msgid "Unique identifier the token is referenced by."
 msgstr "Belirteç tarafından başvurulan benzersiz tanımlayıcı."
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/zh-Hans.po

@@ -806,20 +806,40 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "基于经过哈希处理的用户 ID"
+#~ msgstr "基于经过哈希处理的用户 ID"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "基于用户的电子邮箱。建议在 UPN 方法上使用。"
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "基于用户的 UPN，仅当用户设置了 'upn' 属性时才有效。仅当您有不同的 UPN 和 Mail 域时才使用此方法。"
+#~ msgstr "基于用户的电子邮箱。建议在 UPN 方法上使用。"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "基于用户名"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "基于用户的 UPN，仅当用户设置了 'upn' 属性时才有效。仅当您有不同的 UPN 和 Mail 域时才使用此方法。"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "基于用户名"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3310,7 +3330,6 @@ msgid "LDAP details"
 msgstr "LDAP 详情"
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "标签"
 
@@ -3802,6 +3821,8 @@ msgstr "我的应用"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4431,6 +4452,7 @@ msgid "Passwordless flow"
 msgstr "无密码流程"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4977,6 +4999,10 @@ msgstr "必需。"
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "必填。不超过 150 个字符。仅限字母、数字和 @/./+/-/_ 。"
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "重置密码"
@@ -6371,6 +6397,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "此流程已完成。"
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "这是向其发送 POST 请求的完整终端节点。"
@@ -6692,6 +6722,10 @@ msgstr "不健康的前哨"
 msgid "Unique identifier the token is referenced by."
 msgstr "引用令牌的唯一标识符。"
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/zh-Hant.po

@@ -806,20 +806,40 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "基于经过哈希处理的用户 ID"
+#~ msgstr "基于经过哈希处理的用户 ID"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "基于用户的电子邮件。 建议在 UPN 方法上使用此方法。"
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "根据用户的UPN，仅当用户设置了 “upn” 属性时才有效。仅当您有不同的 UPN 和 Mail 域时才使用此方法。"
+#~ msgstr "基于用户的电子邮件。 建议在 UPN 方法上使用此方法。"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "基于用户名"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "根据用户的UPN，仅当用户设置了 “upn” 属性时才有效。仅当您有不同的 UPN 和 Mail 域时才使用此方法。"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "基于用户名"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3310,7 +3330,6 @@ msgid "LDAP details"
 msgstr "LDAP 详情"
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "标签"
 
@@ -3802,6 +3821,8 @@ msgstr "我的应用"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4431,6 +4452,7 @@ msgid "Passwordless flow"
 msgstr "无密码流"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4977,6 +4999,10 @@ msgstr "必需。"
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "必填。不超过 150 个字符。仅限字母、数字和 @/./+/-/_ 。"
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "重置密码"
@@ -6371,6 +6397,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "此流程已完成。"
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "这是向其发送 POST 请求的完整终端节点。"
@@ -6692,6 +6722,10 @@ msgstr "不健康的 Outposts"
 msgid "Unique identifier the token is referenced by."
 msgstr "引用令牌的唯一标识符。"
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"

web/src/locales/zh_TW.po

@@ -806,20 +806,40 @@ msgid "Base DN"
 msgstr "Base DN"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the Hashed User ID"
+#~ msgid "Based on the Hashed User ID"
-msgstr "基于经过哈希处理的用户 ID"
+#~ msgstr "基于经过哈希处理的用户 ID"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's Email. This is recommended over the UPN method."
+msgid "Based on the User's Email"
-msgstr "基于用户的电子邮件。 建议在 UPN 方法上使用此方法。"
+msgstr ""
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgid "Based on the User's Email. This is recommended over the UPN method."
-msgstr "根据用户的UPN，仅当用户设置了 “upn” 属性时才有效。仅当您有不同的 UPN 和 Mail 域时才使用此方法。"
+#~ msgstr "基于用户的电子邮件。 建议在 UPN 方法上使用此方法。"
 
 #: src/admin/providers/oauth2/OAuth2ProviderForm.ts
-msgid "Based on the username"
+msgid "Based on the User's ID"
-msgstr "基于用户名"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's UPN"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the User's UPN, only works if user has a 'upn' attribute set. Use this method only if you have different UPN and Mail domains."
+#~ msgstr "根据用户的UPN，仅当用户设置了 “upn” 属性时才有效。仅当您有不同的 UPN 和 Mail 域时才使用此方法。"
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's hashed ID"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Based on the User's username"
+msgstr ""
+
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+#~ msgid "Based on the username"
+#~ msgstr "基于用户名"
 
 #: src/admin/admin-overview/cards/VersionStatusCard.ts
 msgid "Based on {0}"
@@ -3310,7 +3330,6 @@ msgid "LDAP details"
 msgstr "LDAP 详情"
 
 #: src/admin/stages/prompt/PromptForm.ts
-#: src/admin/stages/prompt/PromptListPage.ts
 msgid "Label"
 msgstr "标签"
 
@@ -3802,6 +3821,8 @@ msgstr "我的应用"
 #: src/admin/stages/invitation/InvitationListPage.ts
 #: src/admin/stages/invitation/InvitationStageForm.ts
 #: src/admin/stages/password/PasswordStageForm.ts
+#: src/admin/stages/prompt/PromptForm.ts
+#: src/admin/stages/prompt/PromptListPage.ts
 #: src/admin/stages/prompt/PromptStageForm.ts
 #: src/admin/stages/user_delete/UserDeleteStageForm.ts
 #: src/admin/stages/user_login/UserLoginStageForm.ts
@@ -4431,6 +4452,7 @@ msgid "Passwordless flow"
 msgstr "无密码流"
 
 #: src/admin/blueprints/BlueprintForm.ts
+#: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/users/UserForm.ts
 msgid "Path"
 msgstr ""
@@ -4977,6 +4999,10 @@ msgstr "必需。"
 #~ msgid "Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."
 #~ msgstr "必填。不超过 150 个字符。仅限字母、数字和 @/./+/-/_ 。"
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "Requires the user to have a 'upn' attribute set, and falls back to hashed user ID. Use this mode only if you have different UPN and Mail domains."
+msgstr ""
+
 #: src/admin/users/UserViewPage.ts
 msgid "Reset Password"
 msgstr "重置密码"
@@ -6371,6 +6397,10 @@ msgstr ""
 msgid "This flow is completed."
 msgstr "此流程已完成。"
 
+#: src/admin/providers/oauth2/OAuth2ProviderForm.ts
+msgid "This is recommended over the UPN mode."
+msgstr ""
+
 #: src/admin/stages/authenticator_sms/AuthenticatorSMSStageForm.ts
 msgid "This is the full endpoint to send POST requests to."
 msgstr "这是向其发送 POST 请求的完整终端节点。"
@@ -6692,6 +6722,10 @@ msgstr "不健康的 Outposts"
 msgid "Unique identifier the token is referenced by."
 msgstr "引用令牌的唯一标识符。"
 
+#: src/admin/stages/prompt/PromptForm.ts
+msgid "Unique name of this field, used for selecting fields in prompt stages."
+msgstr ""
+
 #: src/admin/blueprints/BlueprintListPage.ts
 #: src/admin/system-tasks/SystemTaskListPage.ts
 msgid "Unknown"