Add the ability to switch from email to ldap and back

3 files changed, 70 insertions, 45 deletions

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index d9411df07..34e938e69 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -633,21 +633,45 @@
   "choose_auth_page.ldapCreate": "Create new team with LDAP Account",
   "choose_auth_page.noSignup": "No sign-up methods configured, please contact your system administrator.",
   "claim.account.noEmail": "No email specified",
-  "claim.email_to_sso.enterPwd": "Enter the password for your {team} {site} account",
-  "claim.email_to_sso.pwd": "Password",
-  "claim.email_to_sso.pwdError": "Please enter your password.",
-  "claim.email_to_sso.ssoNote": "You must already have a valid {type} account",
-  "claim.email_to_sso.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
-  "claim.email_to_sso.switchTo": "Switch account to {uiType}",
-  "claim.email_to_sso.title": "Switch Email/Password Account to {uiType}",
-  "claim.sso_to_email.confirm": "Confirm Password",
-  "claim.sso_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
-  "claim.sso_to_email.enterPwd": "Please enter a password.",
-  "claim.sso_to_email.newPwd": "New Password",
-  "claim.sso_to_email.pwdNotMatch": "Password do not match.",
-  "claim.sso_to_email.switchTo": "Switch {type} to email and password",
-  "claim.sso_to_email.title": "Switch {type} Account to Email",
-  "claim.sso_to_email_newPwd": "Enter a new password for your {team} {site} account",
+  "claim.email_to_oauth.enterPwd": "Enter the password for your {team} {site} account",
+  "claim.email_to_oauth.pwd": "Password",
+  "claim.email_to_oauth.pwdError": "Please enter your password.",
+  "claim.email_to_oauth.ssoNote": "You must already have a valid {type} account",
+  "claim.email_to_oauth.ssoType": "Upon claiming your account, you will only be able to login with {type} SSO",
+  "claim.email_to_oauth.switchTo": "Switch account to {uiType}",
+  "claim.email_to_oauth.title": "Switch Email/Password Account to {uiType}",
+  "claim.oauth_to_email.confirm": "Confirm Password",
+  "claim.oauth_to_email.description": "Upon changing your account type, you will only be able to login with your email and password.",
+  "claim.oauth_to_email.enterPwd": "Please enter a password.",
+  "claim.oauth_to_email.newPwd": "New Password",
+  "claim.oauth_to_email.pwdNotMatch": "Password do not match.",
+  "claim.oauth_to_email.switchTo": "Switch {type} to email and password",
+  "claim.oauth_to_email.title": "Switch {type} Account to Email",
+  "claim.oauth_to_email.newPwd": "Enter a new password for your {team} {site} account",
+  "claim.email_to_ldap.pwdError": "Please enter your password.",
+  "claim.email_to_ldap.ldapIdError": "Please enter your LDAP ID.",
+  "claim.email_to_ldap.ldapPasswordError": "Please enter your LDAP password.",
+  "claim.email_to_ldap.title": "Switch Email/Password Account to LDAP",
+  "claim.email_to_ldap.ssoType": "Upon claiming your account, you will only be able to login with LDAP",
+  "claim.email_to_ldap.ssoNote": "You must already have a valid LDAP account",
+  "claim.email_to_ldap.enterPwd": "Enter the password for your {team} {site} email account",
+  "claim.email_to_ldap.pwd": "Password",
+  "claim.email_to_ldap.enterLdapPwd": "Enter the ID and password for your LDAP account",
+  "claim.email_to_ldap.ldapId": "LDAP ID",
+  "claim.email_to_ldap.ldapPwd": "LDAP Password",
+  "claim.email_to_ldap.switchTo": "Switch account to LDAP",
+  "claim.ldap_to_email.pwdError": "Please enter your password.",
+  "claim.ldap_to_email.pwdNotMatch": "Passwords do not match.",
+  "claim.ldap_to_email.ldapPasswordError": "Please enter your LDAP password.",
+  "claim.ldap_to_email.title": "Switch LDAP Account to Email/Password",
+  "claim.ldap_to_email.ssoType": "Upon claiming your account, you will only be able to login with your email and password",
+  "claim.ldap_to_email.email": "You will use the email {email} to login",
+  "claim.ldap_to_email.enterLdapPwd": "Enter your LDAP password for your {team} {site} email account",
+  "claim.ldap_to_email.ldapPwd": "LDAP Password",
+  "claim.ldap_to_email.enterPwd": "Enter a new password for your email account",
+  "claim.ldap_to_email.pwd": "Password",
+  "claim.ldap_to_email.confirm": "Confirm Password",
+  "claim.ldap_to_email.switchTo": "Switch account to email/password",
   "confirm_modal.cancel": "Cancel",
   "create_comment.addComment": "Add a comment...",
   "create_comment.comment": "Add Comment",
@@ -1335,6 +1359,7 @@
   "user.settings.security.switchEmail": "Switch to using email and password",
   "user.settings.security.switchGitlab": "Switch to using GitLab SSO",
   "user.settings.security.switchGoogle": "Switch to using Google SSO",
+  "user.settings.security.switchLda": "Switch to using LDAP",
   "user.settings.security.title": "Security Settings",
   "user.settings.security.viewHistory": "View Access History",
   "user_list.notFound": "No users found :(",
diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json
index 8852dd3c6..9c1665c4e 100644
--- a/webapp/i18n/es.json
+++ b/webapp/i18n/es.json
@@ -633,21 +633,21 @@
   "choose_auth_page.ldapCreate": "Crea un nuevo equipo con tu cuenta de LDAP",
   "choose_auth_page.noSignup": "No hay métodos de inicio de sesión configurad, por favor contacte al administrador de sistemasos",
   "claim.account.noEmail": "No se especifico un correo electrónico.",
-  "claim.email_to_sso.enterPwd": "Ingresa la contraseña para tu cuenta para {team} {site}",
-  "claim.email_to_sso.pwd": "Contraseña",
-  "claim.email_to_sso.pwdError": "Por favor introduce tu contraseña.",
-  "claim.email_to_sso.ssoNote": "Debes tener una cuenta válida con {type}",
-  "claim.email_to_sso.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con {type} SSO",
-  "claim.email_to_sso.switchTo": "Cambiar cuenta a {uiType}",
-  "claim.email_to_sso.title": "Cambiar Cuenta de Correo/Contraseña a {uiType}",
-  "claim.sso_to_email.confirm": "Confirmar Contraseña",
-  "claim.sso_to_email.description": "Al cambiar el tipo de cuenta, sólo podrás iniciar sesión con tu correo electrónico y contraseña.",
-  "claim.sso_to_email.enterPwd": "Por favor ingresa una contraseña.",
-  "claim.sso_to_email.newPwd": "Nueva Contraseña",
-  "claim.sso_to_email.pwdNotMatch": "Las contraseñas no coinciden.",
-  "claim.sso_to_email.switchTo": "Cambiar {type} a correo electrónico y contraseña",
-  "claim.sso_to_email.title": "Cambiar la cuenta de {type} a Correo Electrónico",
-  "claim.sso_to_email_newPwd": "Ingresa una nueva contraseña para tu cuenta de {team} {site}",
+  "claim.email_to_oauth.enterPwd": "Ingresa la contraseña para tu cuenta para {team} {site}",
+  "claim.email_to_oauth.pwd": "Contraseña",
+  "claim.email_to_oauth.pwdError": "Por favor introduce tu contraseña.",
+  "claim.email_to_oauth.ssoNote": "Debes tener una cuenta válida con {type}",
+  "claim.email_to_oauth.ssoType": "Al reclamar tu cuenta, sólo podrás iniciar sesión con {type} SSO",
+  "claim.email_to_oauth.switchTo": "Cambiar cuenta a {uiType}",
+  "claim.email_to_oauth.title": "Cambiar Cuenta de Correo/Contraseña a {uiType}",
+  "claim.oauth_to_email.confirm": "Confirmar Contraseña",
+  "claim.oauth_to_email.description": "Al cambiar el tipo de cuenta, sólo podrás iniciar sesión con tu correo electrónico y contraseña.",
+  "claim.oauth_to_email.enterPwd": "Por favor ingresa una contraseña.",
+  "claim.oauth_to_email.newPwd": "Nueva Contraseña",
+  "claim.oauth_to_email.pwdNotMatch": "Las contraseñas no coinciden.",
+  "claim.oauth_to_email.switchTo": "Cambiar {type} a correo electrónico y contraseña",
+  "claim.oauth_to_email.title": "Cambiar la cuenta de {type} a Correo Electrónico",
+  "claim.oauth_to_email.newPwd": "Ingresa una nueva contraseña para tu cuenta de {team} {site}",
   "confirm_modal.cancel": "Cancelar",
   "create_comment.addComment": "Agregar un comentario...",
   "create_comment.comment": "Agregar Comentario",
diff --git a/webapp/i18n/pt.json b/webapp/i18n/pt.json
index 41d3bbc1c..0b06b77af 100644
--- a/webapp/i18n/pt.json
+++ b/webapp/i18n/pt.json
@@ -639,21 +639,21 @@
   "choose_auth_page.ldapCreate": "Criar uma nova equipe com uma conta LDAP",
   "choose_auth_page.noSignup": "Nenhum método de inscrição configurado, por favor contate seu administrador do sistema.",
   "claim.account.noEmail": "Nenhum email específicado",
-  "claim.email_to_sso.enterPwd": "Entre a senha para o sua conta {team} {site}",
-  "claim.email_to_sso.pwd": "Senha",
-  "claim.email_to_sso.pwdError": "Por favor digite a sua senha.",
-  "claim.email_to_sso.ssoNote": "Você precisa já ter uma conta {type} válida",
-  "claim.email_to_sso.ssoType": "Ao retirar a sua conta, você só vai ser capaz de logar com SSO {type}",
-  "claim.email_to_sso.switchTo": "Trocar a conta para {uiType}",
-  "claim.email_to_sso.title": "Trocar E-mail/Senha da Conta para {uiType}",
-  "claim.sso_to_email.confirm": "Confirmar senha",
-  "claim.sso_to_email.description": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha.",
-  "claim.sso_to_email.enterPwd": "Por favor entre uma senha.",
-  "claim.sso_to_email.newPwd": "Nova Senha",
-  "claim.sso_to_email.pwdNotMatch": "As senha não correspondem.",
-  "claim.sso_to_email.switchTo": "Trocar {type} para email e senha",
-  "claim.sso_to_email.title": "Trocar Conta {type} para E-mail",
-  "claim.sso_to_email_newPwd": "Entre a nova senha para o sua conta {team} {site}",
+  "claim.email_to_oauth.enterPwd": "Entre a senha para o sua conta {team} {site}",
+  "claim.email_to_oauth.pwd": "Senha",
+  "claim.email_to_oauth.pwdError": "Por favor digite a sua senha.",
+  "claim.email_to_oauth.ssoNote": "Você precisa já ter uma conta {type} válida",
+  "claim.email_to_oauth.ssoType": "Ao retirar a sua conta, você só vai ser capaz de logar com SSO {type}",
+  "claim.email_to_oauth.switchTo": "Trocar a conta para {uiType}",
+  "claim.email_to_oauth.title": "Trocar E-mail/Senha da Conta para {uiType}",
+  "claim.oauth_to_email.confirm": "Confirmar senha",
+  "claim.oauth_to_email.description": "Após a alteração do tipo de conta, você só vai ser capaz de logar com seu e-mail e senha.",
+  "claim.oauth_to_email.enterPwd": "Por favor entre uma senha.",
+  "claim.oauth_to_email.newPwd": "Nova Senha",
+  "claim.oauth_to_email.pwdNotMatch": "As senha não correspondem.",
+  "claim.oauth_to_email.switchTo": "Trocar {type} para email e senha",
+  "claim.oauth_to_email.title": "Trocar Conta {type} para E-mail",
+  "claim.oauth_to_email.newPwd": "Entre a nova senha para o sua conta {team} {site}",
   "confirm_modal.cancel": "Cancelar",
   "create_comment.addComment": "Adicionar um comentário...",
   "create_comment.comment": "Adicionar Comentário",