Merge pull request #210 from zitadel/idp-auto-linking

fix: add Idp auto linking parameters
zitadel · Dec 20, 2024 · cc93a3f · cc93a3f
2 parents bfe1a97 + 71095ff
commit cc93a3f
Show file tree

Hide file tree

Showing 116 changed files with 165 additions and 1 deletion.
diff --git a/docs/data-sources/idp_azure_ad.md b/docs/data-sources/idp_azure_ad.md
@@ -26,6 +26,7 @@ data "zitadel_idp_azure_ad" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `email_verified` (Boolean) automatically mark emails as verified

diff --git a/docs/data-sources/idp_github.md b/docs/data-sources/idp_github.md
@@ -26,6 +26,7 @@ data "zitadel_idp_github" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/idp_github_es.md b/docs/data-sources/idp_github_es.md
@@ -27,6 +27,7 @@ data "zitadel_idp_github_es" "default" {
 ### Read-Only
 
 - `authorization_endpoint` (String) the providers authorization endpoint
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/idp_gitlab.md b/docs/data-sources/idp_gitlab.md
@@ -26,6 +26,7 @@ data "zitadel_idp_gitlab" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/idp_gitlab_self_hosted.md b/docs/data-sources/idp_gitlab_self_hosted.md
@@ -26,6 +26,7 @@ data "zitadel_idp_gitlab_self_hosted" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/idp_google.md b/docs/data-sources/idp_google.md
@@ -26,6 +26,7 @@ data "zitadel_idp_google" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/idp_ldap.md b/docs/data-sources/idp_ldap.md
@@ -26,6 +26,7 @@ data "zitadel_idp_ldap" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `avatar_url_attribute` (String) User attribute for the avatar url
 - `base_dn` (String) Base DN for LDAP connections
 - `bind_dn` (String) Bind DN for LDAP connections

diff --git a/docs/data-sources/idp_oauth.md b/docs/data-sources/idp_oauth.md
@@ -27,6 +27,7 @@ data "zitadel_idp_oauth" "default" {
 ### Read-Only
 
 - `authorization_endpoint` (String) The authorization endpoint
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `id_attribute` (String) The id attribute

diff --git a/docs/data-sources/idp_saml.md b/docs/data-sources/idp_saml.md
@@ -26,6 +26,7 @@ data "zitadel_idp_saml" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `binding` (String) The binding
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account
 - `is_auto_update` (Boolean) enabled if a the ZITADEL account fields are updated automatically on each login

diff --git a/docs/data-sources/org_idp_azure_ad.md b/docs/data-sources/org_idp_azure_ad.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_azure_ad" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `email_verified` (Boolean) automatically mark emails as verified

diff --git a/docs/data-sources/org_idp_github.md b/docs/data-sources/org_idp_github.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_github" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/org_idp_github_es.md b/docs/data-sources/org_idp_github_es.md
@@ -32,6 +32,7 @@ data "zitadel_org_idp_github_es" "default" {
 ### Read-Only
 
 - `authorization_endpoint` (String) the providers authorization endpoint
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/org_idp_gitlab.md b/docs/data-sources/org_idp_gitlab.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_gitlab" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/org_idp_gitlab_self_hosted.md b/docs/data-sources/org_idp_gitlab_self_hosted.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_gitlab_self_hosted" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/org_idp_google.md b/docs/data-sources/org_idp_google.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_google" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/data-sources/org_idp_ldap.md b/docs/data-sources/org_idp_ldap.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_ldap" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `avatar_url_attribute` (String) User attribute for the avatar url
 - `base_dn` (String) Base DN for LDAP connections
 - `bind_dn` (String) Bind DN for LDAP connections

diff --git a/docs/data-sources/org_idp_oauth.md b/docs/data-sources/org_idp_oauth.md
@@ -32,6 +32,7 @@ data "zitadel_org_idp_oauth" "default" {
 ### Read-Only
 
 - `authorization_endpoint` (String) The authorization endpoint
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `id_attribute` (String) The id attribute

diff --git a/docs/data-sources/org_idp_saml.md b/docs/data-sources/org_idp_saml.md
@@ -31,6 +31,7 @@ data "zitadel_org_idp_saml" "default" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `binding` (String) The binding
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account
 - `is_auto_update` (Boolean) enabled if a the ZITADEL account fields are updated automatically on each login

diff --git a/docs/data-sources/org_oidc_idp.md b/docs/data-sources/org_oidc_idp.md
@@ -35,6 +35,7 @@ output "org_oidc_idp" {
 
 ### Read-Only
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enabled if a new account in ZITADEL are created automatically on login with an external account

diff --git a/docs/resources/idp_azure_ad.md b/docs/resources/idp_azure_ad.md
@@ -23,6 +23,7 @@ resource "zitadel_idp_azure_ad" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -31,6 +32,7 @@ resource "zitadel_idp_azure_ad" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `email_verified` (Boolean) automatically mark emails as verified

diff --git a/docs/resources/idp_github.md b/docs/resources/idp_github.md
@@ -21,6 +21,7 @@ resource "zitadel_idp_github" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -29,6 +30,7 @@ resource "zitadel_idp_github" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enable if a new account in ZITADEL should be created automatically on login with an external account

diff --git a/docs/resources/idp_github_es.md b/docs/resources/idp_github_es.md
@@ -24,6 +24,7 @@ resource "zitadel_idp_github_es" "default" {
   is_creation_allowed    = true
   is_auto_creation       = false
   is_auto_update         = true
+  auto_linking           = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -33,6 +34,7 @@ resource "zitadel_idp_github_es" "default" {
 ### Required
 
 - `authorization_endpoint` (String) the providers authorization endpoint
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enable if a new account in ZITADEL should be created automatically on login with an external account

diff --git a/docs/resources/idp_gitlab.md b/docs/resources/idp_gitlab.md
@@ -21,6 +21,7 @@ resource "zitadel_idp_gitlab" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -29,6 +30,7 @@ resource "zitadel_idp_gitlab" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enable if a new account in ZITADEL should be created automatically on login with an external account

diff --git a/docs/resources/idp_gitlab_self_hosted.md b/docs/resources/idp_gitlab_self_hosted.md
@@ -22,6 +22,7 @@ resource "zitadel_idp_gitlab_self_hosted" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -30,6 +31,7 @@ resource "zitadel_idp_gitlab_self_hosted" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enable if a new account in ZITADEL should be created automatically on login with an external account

diff --git a/docs/resources/idp_google.md b/docs/resources/idp_google.md
@@ -21,6 +21,7 @@ resource "zitadel_idp_google" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -29,6 +30,7 @@ resource "zitadel_idp_google" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `is_auto_creation` (Boolean) enable if a new account in ZITADEL should be created automatically on login with an external account

diff --git a/docs/resources/idp_ldap.md b/docs/resources/idp_ldap.md
@@ -30,6 +30,7 @@ resource "zitadel_idp_ldap" "default" {
   is_creation_allowed  = true
   is_auto_creation     = false
   is_auto_update       = true
+  auto_linking         = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -38,6 +39,7 @@ resource "zitadel_idp_ldap" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `base_dn` (String) Base DN for LDAP connections
 - `bind_dn` (String) Bind DN for LDAP connections
 - `bind_password` (String, Sensitive) Bind password for LDAP connections

diff --git a/docs/resources/idp_oauth.md b/docs/resources/idp_oauth.md
@@ -25,6 +25,7 @@ resource "zitadel_idp_oauth" "default" {
   is_creation_allowed    = true
   is_auto_creation       = false
   is_auto_update         = true
+  auto_linking           = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -34,6 +35,7 @@ resource "zitadel_idp_oauth" "default" {
 ### Required
 
 - `authorization_endpoint` (String) The authorization endpoint
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `id_attribute` (String) The id attribute

diff --git a/docs/resources/idp_saml.md b/docs/resources/idp_saml.md
@@ -20,6 +20,7 @@ resource "zitadel_idp_saml" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
   metadata_xml        = <<EOM
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://saml.example.com/entityid" validUntil="2034-05-15T14:21:58.979Z">
@@ -60,6 +61,7 @@ EOM
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `is_auto_creation` (Boolean) enable if a new account in ZITADEL should be created automatically on login with an external account
 - `is_auto_update` (Boolean) enable if a the ZITADEL account fields should be updated automatically on each login
 - `is_creation_allowed` (Boolean) enable if users should be able to create a new account in ZITADEL when using an external account

diff --git a/docs/resources/org_idp_azure_ad.md b/docs/resources/org_idp_azure_ad.md
@@ -24,6 +24,7 @@ resource "zitadel_org_idp_azure_ad" "default" {
   is_creation_allowed = true
   is_auto_creation    = false
   is_auto_update      = true
+  auto_linking        = "AUTO_LINKING_OPTION_USERNAME"
 }
 ```
 
@@ -32,6 +33,7 @@ resource "zitadel_org_idp_azure_ad" "default" {
 
 ### Required
 
+- `auto_linking` (String) Enable if users should get prompted to link an existing ZITADEL user to an external account if the selected attribute matches, supported values: AUTO_LINKING_OPTION_UNSPECIFIED, AUTO_LINKING_OPTION_USERNAME, AUTO_LINKING_OPTION_EMAIL
 - `client_id` (String) client id generated by the identity provider
 - `client_secret` (String, Sensitive) client secret generated by the identity provider
 - `email_verified` (Boolean) automatically mark emails as verified