mirror of
https://github.com/zitadel/zitadel.git
synced 2024-12-13 19:44:21 +00:00
fix: set correct state of idp in old view (#3148)
* fix: set correct state of idp in old view * add italian to language selection in login
This commit is contained in:
parent
bf6cb59b87
commit
f96f62a1ab
@ -3,20 +3,19 @@ package handler
|
|||||||
import (
|
import (
|
||||||
"context"
|
"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/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"
|
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/query"
|
||||||
"github.com/caos/zitadel/internal/eventstore/v1/spooler"
|
"github.com/caos/zitadel/internal/eventstore/v1/spooler"
|
||||||
iam_model "github.com/caos/zitadel/internal/iam/model"
|
iam_model "github.com/caos/zitadel/internal/iam/model"
|
||||||
"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
|
"github.com/caos/zitadel/internal/iam/repository/eventsourcing/model"
|
||||||
iam_view_model "github.com/caos/zitadel/internal/iam/repository/view/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 (
|
const (
|
||||||
@ -166,7 +165,16 @@ func (i *IDPProvider) fillConfigData(provider *iam_view_model.IDPProviderView, c
|
|||||||
} else if config.JWTIDP != nil {
|
} else if config.JWTIDP != nil {
|
||||||
provider.IDPConfigType = int32(domain.IDPConfigTypeJWT)
|
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 {
|
func (i *IDPProvider) OnError(event *es_models.Event, err error) error {
|
||||||
|
@ -207,6 +207,7 @@ RegistrationUser:
|
|||||||
LanguageLabel: Sprache
|
LanguageLabel: Sprache
|
||||||
German: Deutsch
|
German: Deutsch
|
||||||
English: English
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
GenderLabel: Geschlecht
|
GenderLabel: Geschlecht
|
||||||
Female: weiblich
|
Female: weiblich
|
||||||
Male: männlich
|
Male: männlich
|
||||||
@ -234,6 +235,7 @@ ExternalRegistrationUserOverview:
|
|||||||
LanguageLabel: Sprache
|
LanguageLabel: Sprache
|
||||||
German: Deutsch
|
German: Deutsch
|
||||||
English: English
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz
|
TosAndPrivacyLabel: Allgemeine Geschäftsbedingungen und Datenschutz
|
||||||
TosConfirm: Ich akzeptiere die
|
TosConfirm: Ich akzeptiere die
|
||||||
TosLinkText: AGBs
|
TosLinkText: AGBs
|
||||||
@ -286,6 +288,9 @@ ExternalNotFoundOption:
|
|||||||
TosLinkText: AGBs
|
TosLinkText: AGBs
|
||||||
TosConfirmAnd: und die
|
TosConfirmAnd: und die
|
||||||
PrivacyLinkText: Datenschutzerklärung
|
PrivacyLinkText: Datenschutzerklärung
|
||||||
|
German: Deutsch
|
||||||
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
|
|
||||||
Footer:
|
Footer:
|
||||||
PoweredBy: Powered By
|
PoweredBy: Powered By
|
||||||
|
@ -207,6 +207,7 @@ RegistrationUser:
|
|||||||
LanguageLabel: Language
|
LanguageLabel: Language
|
||||||
German: Deutsch
|
German: Deutsch
|
||||||
English: English
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
GenderLabel: Gender
|
GenderLabel: Gender
|
||||||
Female: Female
|
Female: Female
|
||||||
Male: Male
|
Male: Male
|
||||||
@ -234,6 +235,7 @@ ExternalRegistrationUserOverview:
|
|||||||
LanguageLabel: Language
|
LanguageLabel: Language
|
||||||
German: Deutsch
|
German: Deutsch
|
||||||
English: English
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
TosAndPrivacyLabel: Terms and conditions
|
TosAndPrivacyLabel: Terms and conditions
|
||||||
TosConfirm: I accept the
|
TosConfirm: I accept the
|
||||||
TosLinkText: TOS
|
TosLinkText: TOS
|
||||||
@ -287,6 +289,9 @@ ExternalNotFoundOption:
|
|||||||
TosLinkText: TOS
|
TosLinkText: TOS
|
||||||
TosConfirmAnd: and the
|
TosConfirmAnd: and the
|
||||||
PrivacyLinkText: privacy policy
|
PrivacyLinkText: privacy policy
|
||||||
|
German: Deutsch
|
||||||
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
|
|
||||||
Footer:
|
Footer:
|
||||||
PoweredBy: Powered By
|
PoweredBy: Powered By
|
||||||
|
@ -205,8 +205,9 @@ RegistrationUser:
|
|||||||
FirstnameLabel: Nome
|
FirstnameLabel: Nome
|
||||||
LastnameLabel: Cognome
|
LastnameLabel: Cognome
|
||||||
LanguageLabel: Lingua
|
LanguageLabel: Lingua
|
||||||
German: Tedesco
|
German: Deutsch
|
||||||
English: Inglese
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
GenderLabel: Genere
|
GenderLabel: Genere
|
||||||
Female: Femminile
|
Female: Femminile
|
||||||
Male: Maschile
|
Male: Maschile
|
||||||
@ -232,8 +233,9 @@ ExternalRegistrationUserOverview:
|
|||||||
NicknameLabel: Soprannome
|
NicknameLabel: Soprannome
|
||||||
PhoneLabel: Numero di telefono
|
PhoneLabel: Numero di telefono
|
||||||
LanguageLabel: Lingua
|
LanguageLabel: Lingua
|
||||||
German: Tedesco
|
German: Deutsch
|
||||||
English: Inglese
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
TosAndPrivacyLabel: Termini di servizio
|
TosAndPrivacyLabel: Termini di servizio
|
||||||
TosConfirm: Accetto i
|
TosConfirm: Accetto i
|
||||||
TosLinkText: Termini di servizio
|
TosLinkText: Termini di servizio
|
||||||
@ -287,6 +289,9 @@ ExternalNotFoundOption:
|
|||||||
TosLinkText: Termini di servizio
|
TosLinkText: Termini di servizio
|
||||||
TosConfirmAnd: e
|
TosConfirmAnd: e
|
||||||
PrivacyLinkText: l'informativa sulla privacy
|
PrivacyLinkText: l'informativa sulla privacy
|
||||||
|
German: Deutsch
|
||||||
|
English: English
|
||||||
|
Italian: Italiano
|
||||||
|
|
||||||
Footer:
|
Footer:
|
||||||
PoweredBy: Alimentato da
|
PoweredBy: Alimentato da
|
||||||
|
@ -64,6 +64,8 @@
|
|||||||
</option>
|
</option>
|
||||||
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "ExternalNotFoundOption.English"}}
|
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "ExternalNotFoundOption.English"}}
|
||||||
</option>
|
</option>
|
||||||
|
<option value="it" id="it" {{if (selectedLanguage "it")}} selected {{end}}>{{t "ExternalNotFoundOption.Italian"}}
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -64,6 +64,8 @@
|
|||||||
</option>
|
</option>
|
||||||
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "ExternalRegistrationUserOverview.English"}}
|
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "ExternalRegistrationUserOverview.English"}}
|
||||||
</option>
|
</option>
|
||||||
|
<option value="it" id="it" {{if (selectedLanguage "it")}} selected {{end}}>{{t "ExternalRegistrationUserOverview.Italian"}}
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -58,6 +58,8 @@
|
|||||||
</option>
|
</option>
|
||||||
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "RegistrationUser.English"}}
|
<option value="en" id="en" {{if (selectedLanguage "en")}} selected {{end}}>{{t "RegistrationUser.English"}}
|
||||||
</option>
|
</option>
|
||||||
|
<option value="it" id="it" {{if (selectedLanguage "it")}} selected {{end}}>{{t "RegistrationUser.Italian"}}
|
||||||
|
</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="lgn-field" >
|
<div class="lgn-field" >
|
||||||
|
Loading…
Reference in New Issue
Block a user