diff --git a/apps/api/project.json b/apps/api/project.json
index 775689f70..ca2d99cb8 100644
--- a/apps/api/project.json
+++ b/apps/api/project.json
@@ -9,7 +9,8 @@
"{workspaceRoot}/backend/**/*.go",
"{workspaceRoot}/proto/**/*.go",
"{workspaceRoot}/pkg/**/*.go",
- "{workspaceRoot}/main.go"
+ "{workspaceRoot}/main.go",
+ "{workspaceRoot}/internal/**/*.yaml"
],
"runtime": [
"sources",
diff --git a/console/src/assets/i18n/bg.json b/console/src/assets/i18n/bg.json
index a2ad69947..e09fd1653 100644
--- a/console/src/assets/i18n/bg.json
+++ b/console/src/assets/i18n/bg.json
@@ -2337,7 +2337,7 @@
"DISPLAYNAMEATTRIBUTE": "Атрибут за показвано име",
"EMAILATTRIBUTEATTRIBUTE": "Имейл атрибут",
"EMAILVERIFIEDATTRIBUTE": "Атрибут за проверен имейл",
- "FIRSTNAMEATTRIBUTE": "Атрибут собствено име",
+ "FIRSTNAMEATTRIBUTE": "Атрибут име",
"LASTNAMEATTRIBUTE": "Атрибут фамилия",
"NICKNAMEATTRIBUTE": "Атрибут псевдоним",
"PHONEATTRIBUTE": "Атрибут на телефона",
diff --git a/console/src/assets/i18n/de.json b/console/src/assets/i18n/de.json
index 863e1a9e4..ebde4d4b7 100644
--- a/console/src/assets/i18n/de.json
+++ b/console/src/assets/i18n/de.json
@@ -2325,8 +2325,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "Email attribute",
"EMAILVERIFIEDATTRIBUTE": "Email verified attribute",
- "FIRSTNAMEATTRIBUTE": "Firstname attribute",
- "LASTNAMEATTRIBUTE": "Lastname attribute",
+ "FIRSTNAMEATTRIBUTE": "Vorname-Attribut",
+ "LASTNAMEATTRIBUTE": "Nachname-Attribut",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/console/src/assets/i18n/en.json b/console/src/assets/i18n/en.json
index 962c00e4e..15db8f895 100644
--- a/console/src/assets/i18n/en.json
+++ b/console/src/assets/i18n/en.json
@@ -971,8 +971,8 @@
"CHANGEUSERNAME": "modify",
"CHANGEUSERNAME_TITLE": "Change username",
"CHANGEUSERNAME_DESC": "Enter the new name in the field below.",
- "FIRSTNAME": "Given Name",
- "LASTNAME": "Family Name",
+ "FIRSTNAME": "First Name",
+ "LASTNAME": "Last Name",
"NICKNAME": "Nickname",
"DISPLAYNAME": "Display Name",
"PREFERREDLOGINNAME": "Preferred login name",
@@ -1864,8 +1864,8 @@
"IU": "Invite User"
},
"CHIPS": {
- "firstname": "Given name",
- "lastname": "Family name",
+ "firstname": "First name",
+ "lastname": "Last name",
"code": "Code",
"preferredLoginName": "Preferred Login Name",
"displayName": "Displayname",
@@ -2336,8 +2336,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "Email attribute",
"EMAILVERIFIEDATTRIBUTE": "Email verified attribute",
- "FIRSTNAMEATTRIBUTE": "Given name attribute",
- "LASTNAMEATTRIBUTE": "Family name attribute",
+ "FIRSTNAMEATTRIBUTE": "First name attribute",
+ "LASTNAMEATTRIBUTE": "Last name attribute",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/console/src/assets/i18n/es.json b/console/src/assets/i18n/es.json
index 2e67a7f63..24317318c 100644
--- a/console/src/assets/i18n/es.json
+++ b/console/src/assets/i18n/es.json
@@ -2325,8 +2325,8 @@
"DISPLAYNAMEATTRIBUTE": "Atributo Displayname",
"EMAILATTRIBUTEATTRIBUTE": "Atributo Email",
"EMAILVERIFIEDATTRIBUTE": "Atributo Email verificado",
- "FIRSTNAMEATTRIBUTE": "Atributo Firstname",
- "LASTNAMEATTRIBUTE": "Atributo Lastname",
+ "FIRSTNAMEATTRIBUTE": "Atributo del nombre",
+ "LASTNAMEATTRIBUTE": "Atributo del apellido",
"NICKNAMEATTRIBUTE": "Atributo Nickname",
"PHONEATTRIBUTE": "Atributo Phone",
"PHONEVERIFIEDATTRIBUTE": "Atributo phone verificado",
diff --git a/console/src/assets/i18n/fr.json b/console/src/assets/i18n/fr.json
index 785717d32..9573268fb 100644
--- a/console/src/assets/i18n/fr.json
+++ b/console/src/assets/i18n/fr.json
@@ -971,7 +971,7 @@
"CHANGEUSERNAME_TITLE": "Modifier le nom d'utilisateur",
"CHANGEUSERNAME_DESC": "Entrez le nouveau nom dans le champ ci-dessous.",
"FIRSTNAME": "Prénom",
- "LASTNAME": "Nom de famille",
+ "LASTNAME": "Nom",
"NICKNAME": "Surnom",
"DISPLAYNAME": "Nom d'affichage",
"PREFERREDLOGINNAME": "Nom de connexion préféré",
@@ -1861,7 +1861,7 @@
},
"CHIPS": {
"firstname": "Prénom",
- "lastname": "Nom de famille",
+ "lastname": "Nom",
"code": "Code",
"preferredLoginName": "Nom de connexion préféré",
"displayName": "Nom d'affichage",
@@ -2329,8 +2329,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "E-mail attribute",
"EMAILVERIFIEDATTRIBUTE": "E-mail verified attribute",
- "FIRSTNAMEATTRIBUTE": "Firstname attribute",
- "LASTNAMEATTRIBUTE": "Lastname attribute",
+ "FIRSTNAMEATTRIBUTE": "Attribut du prénom",
+ "LASTNAMEATTRIBUTE": "Attribut du nom",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/console/src/assets/i18n/id.json b/console/src/assets/i18n/id.json
index a0f0585af..9d7adc547 100644
--- a/console/src/assets/i18n/id.json
+++ b/console/src/assets/i18n/id.json
@@ -970,8 +970,8 @@
"CHANGEUSERNAME": "memodifikasi",
"CHANGEUSERNAME_TITLE": "Ubah nama pengguna",
"CHANGEUSERNAME_DESC": "Masukkan nama baru pada kolom di bawah.",
- "FIRSTNAME": "Nama Pemberian",
- "LASTNAME": "Nama keluarga",
+ "FIRSTNAME": "Nama depan",
+ "LASTNAME": "Nama belakang",
"NICKNAME": "Nama panggilan",
"DISPLAYNAME": "Nama Tampilan",
"PREFERREDLOGINNAME": "Nama login pilihan",
@@ -1858,8 +1858,8 @@
"IU": "Mengundang Pengguna"
},
"CHIPS": {
- "firstname": "Nama yang diberikan",
- "lastname": "Nama keluarga",
+ "firstname": "Nama depan",
+ "lastname": "Nama belakang",
"code": "Kode",
"preferredLoginName": "Nama Login Pilihan",
"displayName": "Nama tampilan",
@@ -2330,8 +2330,8 @@
"DISPLAYNAMEATTRIBUTE": "Atribut nama tampilan",
"EMAILATTRIBUTEATTRIBUTE": "Atribut email",
"EMAILVERIFIEDATTRIBUTE": "Atribut terverifikasi email",
- "FIRSTNAMEATTRIBUTE": "Atribut nama yang diberikan",
- "LASTNAMEATTRIBUTE": "Atribut nama keluarga",
+ "FIRSTNAMEATTRIBUTE": "Atribut nama depan",
+ "LASTNAMEATTRIBUTE": "Atribut nama belakang",
"NICKNAMEATTRIBUTE": "Atribut nama panggilan",
"PHONEATTRIBUTE": "Atribut telepon",
"PHONEVERIFIEDATTRIBUTE": "Atribut terverifikasi telepon",
diff --git a/console/src/assets/i18n/it.json b/console/src/assets/i18n/it.json
index 802031e24..a7da9da81 100644
--- a/console/src/assets/i18n/it.json
+++ b/console/src/assets/i18n/it.json
@@ -2329,8 +2329,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "Email attribute",
"EMAILVERIFIEDATTRIBUTE": "Email verified attribute",
- "FIRSTNAMEATTRIBUTE": "Firstname attribute",
- "LASTNAMEATTRIBUTE": "Lastname attribute",
+ "FIRSTNAMEATTRIBUTE": "Attributi del nome",
+ "LASTNAMEATTRIBUTE": "Attributi del cognome",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/console/src/assets/i18n/ja.json b/console/src/assets/i18n/ja.json
index 992197f01..e645798be 100644
--- a/console/src/assets/i18n/ja.json
+++ b/console/src/assets/i18n/ja.json
@@ -2332,8 +2332,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "Email attribute",
"EMAILVERIFIEDATTRIBUTE": "Email verified attribute",
- "FIRSTNAMEATTRIBUTE": "Firstname attribute",
- "LASTNAMEATTRIBUTE": "Lastname attribute",
+ "FIRSTNAMEATTRIBUTE": "名の属性",
+ "LASTNAMEATTRIBUTE": "姓の属性",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/console/src/assets/i18n/mk.json b/console/src/assets/i18n/mk.json
index 5bf3c0729..46af7bb05 100644
--- a/console/src/assets/i18n/mk.json
+++ b/console/src/assets/i18n/mk.json
@@ -970,7 +970,7 @@
"CHANGEUSERNAME": "промени",
"CHANGEUSERNAME_TITLE": "Промени корисничко име",
"CHANGEUSERNAME_DESC": "Внесете го новото име во полето подолу.",
- "FIRSTNAME": "Име",
+ "FIRSTNAME": "Прво име",
"LASTNAME": "Презиме",
"NICKNAME": "Прекар",
"DISPLAYNAME": "Име за приказ",
@@ -1861,7 +1861,7 @@
"IU": "Покана за корисникот"
},
"CHIPS": {
- "firstname": "Име",
+ "firstname": "Прво име",
"lastname": "Презиме",
"code": "Код",
"preferredLoginName": "Посакувано корисничко име",
@@ -2327,7 +2327,7 @@
"DISPLAYNAMEATTRIBUTE": "Атрибут за име за приказ",
"EMAILATTRIBUTEATTRIBUTE": "Атрибут за е-пошта",
"EMAILVERIFIEDATTRIBUTE": "Атрибут за верифицирана е-пошта",
- "FIRSTNAMEATTRIBUTE": "Атрибут за име",
+ "FIRSTNAMEATTRIBUTE": "Атрибут за прво име",
"LASTNAMEATTRIBUTE": "Атрибут за презиме",
"NICKNAMEATTRIBUTE": "Атрибут за прекар",
"PHONEATTRIBUTE": "Атрибут за телефонски број",
diff --git a/console/src/assets/i18n/pl.json b/console/src/assets/i18n/pl.json
index e42ad63e1..512ff165c 100644
--- a/console/src/assets/i18n/pl.json
+++ b/console/src/assets/i18n/pl.json
@@ -2328,8 +2328,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "Email attribute",
"EMAILVERIFIEDATTRIBUTE": "Email verified attribute",
- "FIRSTNAMEATTRIBUTE": "Firstname attribute",
- "LASTNAMEATTRIBUTE": "Lastname attribute",
+ "FIRSTNAMEATTRIBUTE": "Atrybut imienia",
+ "LASTNAMEATTRIBUTE": "Atrybut nazwiska",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/console/src/assets/i18n/tr.json b/console/src/assets/i18n/tr.json
index ebc3e2268..e5a89d45e 100644
--- a/console/src/assets/i18n/tr.json
+++ b/console/src/assets/i18n/tr.json
@@ -2335,8 +2335,8 @@
"DISPLAYNAMEATTRIBUTE": "Görünen ad özniteliği",
"EMAILATTRIBUTEATTRIBUTE": "E-posta özniteliği",
"EMAILVERIFIEDATTRIBUTE": "E-posta doğrulandı özniteliği",
- "FIRSTNAMEATTRIBUTE": "Ad özniteliği",
- "LASTNAMEATTRIBUTE": "Soyad özniteliği",
+ "FIRSTNAMEATTRIBUTE": "Ad özelliği",
+ "LASTNAMEATTRIBUTE": "Soyad özelliği",
"NICKNAMEATTRIBUTE": "Takma ad özniteliği",
"PHONEATTRIBUTE": "Telefon özniteliği",
"PHONEVERIFIEDATTRIBUTE": "Telefon doğrulandı özniteliği",
diff --git a/console/src/assets/i18n/zh.json b/console/src/assets/i18n/zh.json
index 8e54db5c3..75647aa99 100644
--- a/console/src/assets/i18n/zh.json
+++ b/console/src/assets/i18n/zh.json
@@ -971,7 +971,7 @@
"CHANGEUSERNAME_TITLE": "修改用户名称",
"CHANGEUSERNAME_DESC": "在下面的字段中输入新名称。",
"FIRSTNAME": "名字",
- "LASTNAME": "姓",
+ "LASTNAME": "姓氏",
"NICKNAME": "昵称",
"DISPLAYNAME": "展示名称",
"PREFERREDLOGINNAME": "首选登录名",
@@ -1863,8 +1863,8 @@
"IU": "邀请用户"
},
"CHIPS": {
- "firstname": "名",
- "lastname": "姓",
+ "firstname": "名字",
+ "lastname": "姓氏",
"code": "Code",
"preferredLoginName": "首选登录名",
"displayName": "展示名称",
@@ -2340,8 +2340,8 @@
"DISPLAYNAMEATTRIBUTE": "Displayname attribute",
"EMAILATTRIBUTEATTRIBUTE": "Email attribute",
"EMAILVERIFIEDATTRIBUTE": "Email verified attribute",
- "FIRSTNAMEATTRIBUTE": "Firstname attribute",
- "LASTNAMEATTRIBUTE": "Lastname attribute",
+ "FIRSTNAMEATTRIBUTE": "姓名属性",
+ "LASTNAMEATTRIBUTE": "姓氏属性",
"NICKNAMEATTRIBUTE": "Nickname attribute",
"PHONEATTRIBUTE": "Phone attribute",
"PHONEVERIFIEDATTRIBUTE": "Phone verified attribute",
diff --git a/docs/docs/apis/actions/external-authentication.md b/docs/docs/apis/actions/external-authentication.md
index 33afb3d34..c25c5ee96 100644
--- a/docs/docs/apis/actions/external-authentication.md
+++ b/docs/docs/apis/actions/external-authentication.md
@@ -44,9 +44,9 @@ The first parameter contains the following fields
- `appendMetadata(string, Any)`
The first parameter represents the key and the second a value which will be stored
- `setFirstName(string)`
- Sets the given name
+ Sets the first name
- `setLastName(string)`
- Sets the family name
+ Sets the last name
- `setNickName(string)`
Sets the nickname
- `setDisplayName(string)`
@@ -87,9 +87,9 @@ The trigger is represented by the following Ids in the API: `TRIGGER_TYPE_PRE_CR
- `metadata`
Array of [*metadata*](./objects#metadata-with-value-as-bytes). This function is deprecated, please use `api.v1.user.appendMetadata`
- `setFirstName(string)`
- Sets the given name
+ Sets the first name
- `setLastName(string)`
- Sets the family name
+ Sets the last name
- `setNickName(string)`
Sets the nick name
- `setDisplayName(string)`
diff --git a/docs/docs/apis/openidoauth/claims.md b/docs/docs/apis/openidoauth/claims.md
index a6ce3d499..5c002e7b6 100644
--- a/docs/docs/apis/openidoauth/claims.md
+++ b/docs/docs/apis/openidoauth/claims.md
@@ -57,9 +57,9 @@ Please check below the matrix for an overview where which scope is asserted.
| email_verified | `true` | Boolean if the email was verified by ZITADEL |
| events | `{ "http://schemas.openid.net/event/backchannel-logout": {} }` | Security Events such as Back-Channel Logout |
| exp | `1311281970` | Time the token expires (as unix time) |
-| family_name | `Runner` | The subjects family name |
+| family_name | `Runner` | Last name of the subject |
| gender | `other` | Gender of the subject |
-| given_name | `Road` | Given name of the subject |
+| given_name | `Road` | First name of the subject |
| iat | `1311280970` | Time of the token was issued at (as unix time) |
| iss | `$CUSTOM-DOMAIN` | Issuing domain of a token |
| jti | `69234237813329048` | Unique id of the token |
diff --git a/docs/docs/guides/integrate/identity-providers/azure-ad-oidc.mdx b/docs/docs/guides/integrate/identity-providers/azure-ad-oidc.mdx
index abedb14b9..07e308036 100644
--- a/docs/docs/guides/integrate/identity-providers/azure-ad-oidc.mdx
+++ b/docs/docs/guides/integrate/identity-providers/azure-ad-oidc.mdx
@@ -53,7 +53,7 @@ To allow ZITADEL to get the information from the authenticating user you have to
1. Click on Token configuration in the side menu
2. Click on "+ Add optional claim"
-3. Add email, family_name, given_name and preferred_username to the id token
+3. Add email, family_name (last name of the user), given_name (first name of the user) and preferred_username to the id token

diff --git a/docs/docs/guides/integrate/identity-providers/onelogin-saml.mdx b/docs/docs/guides/integrate/identity-providers/onelogin-saml.mdx
index 48b446753..0bc864963 100644
--- a/docs/docs/guides/integrate/identity-providers/onelogin-saml.mdx
+++ b/docs/docs/guides/integrate/identity-providers/onelogin-saml.mdx
@@ -129,8 +129,8 @@ To provision users correctly in ZITADEL, configure which attributes OneLogin sen
3. Add or edit parameters so that at least the following are sent and **included in the SAML assertion**:
- `email` → mapped to the user’s email address (for example **Email**).
- - `firstName` → mapped to the user’s given name (for example **First Name**).
- - `lastName` → mapped to the user’s family name (for example **Last Name**).
+ - `firstName` → mapped to the user’s first name (for example **First Name**).
+ - `lastName` → mapped to the user’s last name (for example **Last Name**).
4. Ensure the **NameID** is set to a unique identifier (commonly the user’s email address), if your OneLogin connector requires it.
5. Save your changes.
diff --git a/docs/docs/guides/integrate/identity-providers/pingfederate-saml.mdx b/docs/docs/guides/integrate/identity-providers/pingfederate-saml.mdx
index e49bc98a1..847a8f3cc 100644
--- a/docs/docs/guides/integrate/identity-providers/pingfederate-saml.mdx
+++ b/docs/docs/guides/integrate/identity-providers/pingfederate-saml.mdx
@@ -39,7 +39,7 @@ After the ZITADEL SAML provider exists, we’ll return to PingFederate and finis
2. Make sure **SAML 2.0** Browser SSO is enabled for this connection.
3. Proceed to **Assertion Creation**:
- Keep the default **NameID** attribute.
- - Add additional attributes you want to send to ZITADEL (you need at least `email`, `given_name`, `family_name`, and you can send optional attributes like `display_name`).
+ - Add additional attributes you want to send to ZITADEL (you need at least `email`, `given_name` (first name of the user), `family_name` (last name of the user), and you can send optional attributes like `display_name`).
4. In **Attribute Mapping**, map the contract attributes to your directory/user store fields.
### Export PingFederate IdP metadata
diff --git a/docs/docs/guides/integrate/onboarding/end-users.mdx b/docs/docs/guides/integrate/onboarding/end-users.mdx
index d8cf46e2c..49ab42196 100644
--- a/docs/docs/guides/integrate/onboarding/end-users.mdx
+++ b/docs/docs/guides/integrate/onboarding/end-users.mdx
@@ -87,7 +87,7 @@ urn:zitadel:iam:org:id:{id}
```
If the user chooses to register a local account, the register form will be shown.
-All the mandatory fields like given name, family name, e-mail and password have to be filled.
+All the mandatory fields like first name, last name, e-mail and password have to be filled.
You can only setup authentication with the built-in form.
Basic data