diff --git a/internal/auth/repository/eventsourcing/handler/idp_providers.go b/internal/auth/repository/eventsourcing/handler/idp_providers.go index 999af8216d..2465db6639 100644 --- a/internal/auth/repository/eventsourcing/handler/idp_providers.go +++ b/internal/auth/repository/eventsourcing/handler/idp_providers.go @@ -3,20 +3,19 @@ package handler import ( "context" - "github.com/caos/zitadel/internal/domain" - "github.com/caos/zitadel/internal/eventstore/v1" - query2 "github.com/caos/zitadel/internal/query" - "github.com/caos/logging" - "github.com/caos/zitadel/internal/config/systemdefaults" - org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model" + "github.com/caos/zitadel/internal/config/systemdefaults" + "github.com/caos/zitadel/internal/domain" + v1 "github.com/caos/zitadel/internal/eventstore/v1" es_models "github.com/caos/zitadel/internal/eventstore/v1/models" "github.com/caos/zitadel/internal/eventstore/v1/query" "github.com/caos/zitadel/internal/eventstore/v1/spooler" iam_model "github.com/caos/zitadel/internal/iam/model" "github.com/caos/zitadel/internal/iam/repository/eventsourcing/model" iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/model" + org_es_model "github.com/caos/zitadel/internal/org/repository/eventsourcing/model" + query2 "github.com/caos/zitadel/internal/query" ) const ( @@ -166,7 +165,16 @@ func (i *IDPProvider) fillConfigData(provider *iam_view_model.IDPProviderView, c } else if config.JWTIDP != nil { provider.IDPConfigType = int32(domain.IDPConfigTypeJWT) } - provider.IDPState = int32(config.State) + switch config.State { + case domain.IDPConfigStateActive: + provider.IDPState = int32(iam_model.IDPConfigStateActive) + case domain.IDPConfigStateInactive: + provider.IDPState = int32(iam_model.IDPConfigStateActive) + case domain.IDPConfigStateRemoved: + provider.IDPState = int32(iam_model.IDPConfigStateRemoved) + default: + provider.IDPState = int32(iam_model.IDPConfigStateActive) + } } func (i *IDPProvider) OnError(event *es_models.Event, err error) error { diff --git a/internal/ui/login/static/i18n/de.yaml b/internal/ui/login/static/i18n/de.yaml index 98f13e307a..1275928003 100644 --- a/internal/ui/login/static/i18n/de.yaml +++ b/internal/ui/login/static/i18n/de.yaml @@ -207,6 +207,7 @@ RegistrationUser: LanguageLabel: Sprache German: Deutsch English: English + Italian: Italiano GenderLabel: Geschlecht Female: weiblich Male: männlich @@ -234,6 +235,7 @@ ExternalRegistrationUserOverview: LanguageLabel: Sprache German: Deutsch English: English + Italian: Italiano TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz TosConfirm: Ich akzeptiere die TosLinkText: AGBs @@ -286,6 +288,9 @@ ExternalNotFoundOption: TosLinkText: AGBs TosConfirmAnd: und die PrivacyLinkText: Datenschutzerklärung + German: Deutsch + English: English + Italian: Italiano Footer: PoweredBy: Powered By diff --git a/internal/ui/login/static/i18n/en.yaml b/internal/ui/login/static/i18n/en.yaml index 2719669df6..5956643fcb 100644 --- a/internal/ui/login/static/i18n/en.yaml +++ b/internal/ui/login/static/i18n/en.yaml @@ -207,6 +207,7 @@ RegistrationUser: LanguageLabel: Language German: Deutsch English: English + Italian: Italiano GenderLabel: Gender Female: Female Male: Male @@ -234,6 +235,7 @@ ExternalRegistrationUserOverview: LanguageLabel: Language German: Deutsch English: English + Italian: Italiano TosAndPrivacyLabel: Terms and conditions TosConfirm: I accept the TosLinkText: TOS @@ -287,6 +289,9 @@ ExternalNotFoundOption: TosLinkText: TOS TosConfirmAnd: and the PrivacyLinkText: privacy policy + German: Deutsch + English: English + Italian: Italiano Footer: PoweredBy: Powered By diff --git a/internal/ui/login/static/i18n/it.yaml b/internal/ui/login/static/i18n/it.yaml index fb4c9a04b2..d2b107e7db 100644 --- a/internal/ui/login/static/i18n/it.yaml +++ b/internal/ui/login/static/i18n/it.yaml @@ -205,8 +205,9 @@ RegistrationUser: FirstnameLabel: Nome LastnameLabel: Cognome LanguageLabel: Lingua - German: Tedesco - English: Inglese + German: Deutsch + English: English + Italian: Italiano GenderLabel: Genere Female: Femminile Male: Maschile @@ -232,8 +233,9 @@ ExternalRegistrationUserOverview: NicknameLabel: Soprannome PhoneLabel: Numero di telefono LanguageLabel: Lingua - German: Tedesco - English: Inglese + German: Deutsch + English: English + Italian: Italiano TosAndPrivacyLabel: Termini di servizio TosConfirm: Accetto i TosLinkText: Termini di servizio @@ -287,6 +289,9 @@ ExternalNotFoundOption: TosLinkText: Termini di servizio TosConfirmAnd: e PrivacyLinkText: l'informativa sulla privacy + German: Deutsch + English: English + Italian: Italiano Footer: PoweredBy: Alimentato da diff --git a/internal/ui/login/static/templates/external_not_found_option.html b/internal/ui/login/static/templates/external_not_found_option.html index a76c33da31..31ff06632a 100644 --- a/internal/ui/login/static/templates/external_not_found_option.html +++ b/internal/ui/login/static/templates/external_not_found_option.html @@ -64,6 +64,8 @@ + @@ -116,4 +118,4 @@ -{{template "main-bottom" .}} \ No newline at end of file +{{template "main-bottom" .}} diff --git a/internal/ui/login/static/templates/external_register_overview.html b/internal/ui/login/static/templates/external_register_overview.html index c836c1fe03..2797eadc39 100644 --- a/internal/ui/login/static/templates/external_register_overview.html +++ b/internal/ui/login/static/templates/external_register_overview.html @@ -64,6 +64,8 @@ + diff --git a/internal/ui/login/static/templates/register.html b/internal/ui/login/static/templates/register.html index 05f4370d68..4130660cc4 100644 --- a/internal/ui/login/static/templates/register.html +++ b/internal/ui/login/static/templates/register.html @@ -58,6 +58,8 @@ +