fix: tos on external registration (#2164)

* faet: add tos checkbox to external login * fix: add tos to external not found option * fix: add tos to external not found option * fix: show register external user overview * fix: no init user mail on external register * fix: custom login text * add missing custom text tests on org * add missing custom text tests on iam * fix: custom login text external registration overview tests * fix: back button on registration overview * fix: add texts, change register form * fix: external not found html * fix: remove form validation Co-authored-by: Livio Amstutz <livio.a@gmail.com>
2025-08-12 05:17:33 +00:00 · 2021-08-11 13:50:03 +02:00
parent 87fa6e58fb
commit b104011418
28 changed files with 3412 additions and 164 deletions
--- a/internal/domain/custom_login_text.go
+++ b/internal/domain/custom_login_text.go
@@ -175,10 +175,11 @@ const (
 	LoginKeyPasswordlessRegistrationNotSupported            = LoginKeyPasswordlessRegistration + "NotSupported"
 	LoginKeyPasswordlessRegistrationErrorRetry              = LoginKeyPasswordlessRegistration + "ErrorRetry"

-	LoginKeyPasswordlessRegistrationDone               = "PasswordlessRegistrationDone."
-	LoginKeyPasswordlessRegistrationDoneTitle          = LoginKeyPasswordlessRegistrationDone + "Title"
-	LoginKeyPasswordlessRegistrationDoneDescription    = LoginKeyPasswordlessRegistrationDone + "Description"
-	LoginKeyPasswordlessRegistrationDoneNextButtonText = LoginKeyPasswordlessRegistrationDone + "NextButtonText"
+	LoginKeyPasswordlessRegistrationDone                 = "PasswordlessRegistrationDone."
+	LoginKeyPasswordlessRegistrationDoneTitle            = LoginKeyPasswordlessRegistrationDone + "Title"
+	LoginKeyPasswordlessRegistrationDoneDescription      = LoginKeyPasswordlessRegistrationDone + "Description"
+	LoginKeyPasswordlessRegistrationDoneNextButtonText   = LoginKeyPasswordlessRegistrationDone + "NextButtonText"
+	LoginKeyPasswordlessRegistrationDoneCancelButtonText = LoginKeyPasswordlessRegistrationDone + "CancelButtonText"

 	LoginKeyPasswordChange                        = "PasswordChange."
 	LoginKeyPasswordChangeTitle                   = LoginKeyPasswordChange + "Title"
@@ -225,6 +226,24 @@ const (
 	LoginKeyRegistrationUserNextButtonText         = LoginKeyRegistrationUser + "NextButtonText"
 	LoginKeyRegistrationUserBackButtonText         = LoginKeyRegistrationUser + "BackButtonText"

+	LoginKeyExternalRegistrationUserOverview                   = "ExternalRegistrationUserOverview."
+	LoginKeyExternalRegistrationUserOverviewTitle              = LoginKeyExternalRegistrationUserOverview + "Title"
+	LoginKeyExternalRegistrationUserOverviewDescription        = LoginKeyExternalRegistrationUserOverview + "Description"
+	LoginKeyExternalRegistrationUserOverviewEmailLabel         = LoginKeyExternalRegistrationUserOverview + "EmailLabel"
+	LoginKeyExternalRegistrationUserOverviewUsernameLabel      = LoginKeyExternalRegistrationUserOverview + "UsernameLabel"
+	LoginKeyExternalRegistrationUserOverviewFirstnameLabel     = LoginKeyExternalRegistrationUserOverview + "FirstnameLabel"
+	LoginKeyExternalRegistrationUserOverviewLastnameLabel      = LoginKeyExternalRegistrationUserOverview + "LastnameLabel"
+	LoginKeyExternalRegistrationUserOverviewNicknameLabel      = LoginKeyExternalRegistrationUserOverview + "NicknameLabel"
+	LoginKeyExternalRegistrationUserOverviewPhoneLabel         = LoginKeyExternalRegistrationUserOverview + "PhoneLabel"
+	LoginKeyExternalRegistrationUserOverviewLanguageLabel      = LoginKeyExternalRegistrationUserOverview + "LanguageLabel"
+	LoginKeyExternalRegistrationUserOverviewTOSAndPrivacyLabel = LoginKeyExternalRegistrationUserOverview + "TosAndPrivacyLabel"
+	LoginKeyExternalRegistrationUserOverviewTOSConfirm         = LoginKeyExternalRegistrationUserOverview + "TosConfirm"
+	LoginKeyExternalRegistrationUserOverviewTOSLinkText        = LoginKeyExternalRegistrationUserOverview + "TosLinkText"
+	LoginKeyExternalRegistrationUserOverviewTOSConfirmAnd      = LoginKeyExternalRegistrationUserOverview + "TosConfirmAnd"
+	LoginKeyExternalRegistrationUserOverviewPrivacyLinkText    = LoginKeyExternalRegistrationUserOverview + "PrivacyLinkText"
+	LoginKeyExternalRegistrationUserOverviewBackButtonText     = LoginKeyExternalRegistrationUserOverview + "BackButtonText"
+	LoginKeyExternalRegistrationUserOverviewNextButtonText     = LoginKeyExternalRegistrationUserOverview + "NextButtonText"
+
 	LoginKeyRegistrationOrg                 = "RegistrationOrg."
 	LoginKeyRegisterOrgTitle                = LoginKeyRegistrationOrg + "Title"
 	LoginKeyRegisterOrgDescription          = LoginKeyRegistrationOrg + "Description"
@@ -253,6 +272,11 @@ const (
 	LoginKeyExternalNotFoundDescription            = LoginKeyExternalNotFound + "Description"
 	LoginKeyExternalNotFoundLinkButtonText         = LoginKeyExternalNotFound + "LinkButtonText"
 	LoginKeyExternalNotFoundAutoRegisterButtonText = LoginKeyExternalNotFound + "AutoRegisterButtonText"
+	LoginKeyExternalNotFoundTOSAndPrivacyLabel     = LoginKeyExternalNotFound + "TosAndPrivacyLabel"
+	LoginKeyExternalNotFoundTOSConfirm             = LoginKeyExternalNotFound + "TosConfirm"
+	LoginKeyExternalNotFoundTOSLinkText            = LoginKeyExternalNotFound + "TosLinkText"
+	LoginKeyExternalNotFoundTOSConfirmAnd          = LoginKeyExternalNotFound + "TosConfirmAnd"
+	LoginKeyExternalNotFoundPrivacyLinkText        = LoginKeyExternalNotFound + "PrivacyLinkText"

 	LoginKeySuccessLogin                        = "LoginSuccess."
 	LoginKeySuccessLoginTitle                   = LoginKeySuccessLogin + "Title"
@@ -279,39 +303,40 @@ type CustomLoginText struct {
 	Default  bool
 	Language language.Tag

-	SelectAccount                SelectAccountScreenText
-	Login                        LoginScreenText
-	Password                     PasswordScreenText
-	UsernameChange               UsernameChangeScreenText
-	UsernameChangeDone           UsernameChangeDoneScreenText
-	InitPassword                 InitPasswordScreenText
-	InitPasswordDone             InitPasswordDoneScreenText
-	EmailVerification            EmailVerificationScreenText
-	EmailVerificationDone        EmailVerificationDoneScreenText
-	InitUser                     InitializeUserScreenText
-	InitUserDone                 InitializeUserDoneScreenText
-	InitMFAPrompt                InitMFAPromptScreenText
-	InitMFAOTP                   InitMFAOTPScreenText
-	InitMFAU2F                   InitMFAU2FScreenText
-	InitMFADone                  InitMFADoneScreenText
-	MFAProvider                  MFAProvidersText
-	VerifyMFAOTP                 VerifyMFAOTPScreenText
-	VerifyMFAU2F                 VerifyMFAU2FScreenText
-	Passwordless                 PasswordlessScreenText
-	PasswordlessPrompt           PasswordlessPromptScreenText
-	PasswordlessRegistration     PasswordlessRegistrationScreenText
-	PasswordlessRegistrationDone PasswordlessRegistrationDoneScreenText
-	PasswordChange               PasswordChangeScreenText
-	PasswordChangeDone           PasswordChangeDoneScreenText
-	PasswordResetDone            PasswordResetDoneScreenText
-	RegisterOption               RegistrationOptionScreenText
-	RegistrationUser             RegistrationUserScreenText
-	RegistrationOrg              RegistrationOrgScreenText
-	LinkingUsersDone             LinkingUserDoneScreenText
-	ExternalNotFoundOption       ExternalUserNotFoundScreenText
-	LoginSuccess                 SuccessLoginScreenText
-	LogoutDone                   LogoutDoneScreenText
-	Footer                       FooterText
+	SelectAccount                    SelectAccountScreenText
+	Login                            LoginScreenText
+	Password                         PasswordScreenText
+	UsernameChange                   UsernameChangeScreenText
+	UsernameChangeDone               UsernameChangeDoneScreenText
+	InitPassword                     InitPasswordScreenText
+	InitPasswordDone                 InitPasswordDoneScreenText
+	EmailVerification                EmailVerificationScreenText
+	EmailVerificationDone            EmailVerificationDoneScreenText
+	InitUser                         InitializeUserScreenText
+	InitUserDone                     InitializeUserDoneScreenText
+	InitMFAPrompt                    InitMFAPromptScreenText
+	InitMFAOTP                       InitMFAOTPScreenText
+	InitMFAU2F                       InitMFAU2FScreenText
+	InitMFADone                      InitMFADoneScreenText
+	MFAProvider                      MFAProvidersText
+	VerifyMFAOTP                     VerifyMFAOTPScreenText
+	VerifyMFAU2F                     VerifyMFAU2FScreenText
+	Passwordless                     PasswordlessScreenText
+	PasswordlessPrompt               PasswordlessPromptScreenText
+	PasswordlessRegistration         PasswordlessRegistrationScreenText
+	PasswordlessRegistrationDone     PasswordlessRegistrationDoneScreenText
+	PasswordChange                   PasswordChangeScreenText
+	PasswordChangeDone               PasswordChangeDoneScreenText
+	PasswordResetDone                PasswordResetDoneScreenText
+	RegisterOption                   RegistrationOptionScreenText
+	RegistrationUser                 RegistrationUserScreenText
+	ExternalRegistrationUserOverview ExternalRegistrationUserOverviewScreenText
+	RegistrationOrg                  RegistrationOrgScreenText
+	LinkingUsersDone                 LinkingUserDoneScreenText
+	ExternalNotFoundOption           ExternalUserNotFoundScreenText
+	LoginSuccess                     SuccessLoginScreenText
+	LogoutDone                       LogoutDoneScreenText
+	Footer                           FooterText
 }

 func (m *CustomLoginText) IsValid() bool {
@@ -537,6 +562,25 @@ type RegistrationUserScreenText struct {
 	BackButtonText         string
 }

+type ExternalRegistrationUserOverviewScreenText struct {
+	Title              string
+	Description        string
+	EmailLabel         string
+	UsernameLabel      string
+	FirstnameLabel     string
+	LastnameLabel      string
+	NicknameLabel      string
+	LanguageLabel      string
+	PhoneLabel         string
+	TOSAndPrivacyLabel string
+	TOSConfirm         string
+	TOSLinkText        string
+	TOSConfirmAnd      string
+	PrivacyLinkText    string
+	BackButtonText     string
+	NextButtonText     string
+}
+
 type RegistrationOrgScreenText struct {
 	Title                string
 	Description          string
@@ -567,6 +611,11 @@ type ExternalUserNotFoundScreenText struct {
 	Description            string
 	LinkButtonText         string
 	AutoRegisterButtonText string
+	TOSAndPrivacyLabel     string
+	TOSConfirm             string
+	TOSLinkText            string
+	TOSConfirmAnd          string
+	PrivacyLinkText        string
 }

 type SuccessLoginScreenText struct {
@@ -608,7 +657,8 @@ type PasswordlessRegistrationScreenText struct {
 }

 type PasswordlessRegistrationDoneScreenText struct {
-	Title          string
-	Description    string
-	NextButtonText string
+	Title            string
+	Description      string
+	NextButtonText   string
+	CancelButtonText string
 }
--- a/internal/domain/human.go
+++ b/internal/domain/human.go
@@ -18,7 +18,6 @@ type Human struct {
 	*Email
 	*Phone
 	*Address
-	ExternalIDPs []*ExternalIDP
 }

 func (h Human) GetUsername() string {
@@ -79,8 +78,8 @@ func (u *Human) HashPasswordIfExisting(policy *PasswordComplexityPolicy, passwor
 	return nil
 }

-func (u *Human) IsInitialState(passwordless bool) bool {
-	return u.Email == nil || !u.IsEmailVerified || (u.ExternalIDPs == nil || len(u.ExternalIDPs) == 0) && !passwordless && (u.Password == nil || u.SecretString == "")
+func (u *Human) IsInitialState(passwordless, externalIDPs bool) bool {
+	return u.Email == nil || !u.IsEmailVerified || !externalIDPs && !passwordless && (u.Password == nil || u.SecretString == "")
 }

 func NewInitUserCode(generator crypto.Generator) (*InitUserCode, error) {