diff --git a/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java b/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java index 8f3b0602d6..dd64898741 100644 --- a/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java +++ b/openbas-api/src/main/java/io/openbas/service/PlatformSettingsService.java @@ -94,7 +94,7 @@ private List buildOpenIdProviders() { return providers.entrySet().stream() .map(entry -> { String uri = "/oauth2/authorization/" + entry.getKey(); - String clientName = env.getProperty("openex.provider." + entry.getKey() + ".login"); + String clientName = env.getProperty("openbas.provider." + entry.getKey() + ".login"); // In case of missing name configuration, generate a generic name if (clientName == null) { clientName = "Login with " + entry.getKey(); @@ -118,7 +118,7 @@ private List buildSaml2Providers() { return providers.entrySet().stream() .map(entry -> { String uri = "/saml2/authenticate/" + entry.getKey(); - String clientName = env.getProperty("openex.provider." + entry.getKey() + ".login"); + String clientName = env.getProperty("openbas.provider." + entry.getKey() + ".login"); // In case of missing name configuration, generate a generic name if (clientName == null) { clientName = "Login with " + entry.getKey(); diff --git a/openbas-front/src/public/components/login/LoginForm.js b/openbas-front/src/public/components/login/LoginForm.js index afb0ec88b4..7ec53efa5f 100644 --- a/openbas-front/src/public/components/login/LoginForm.js +++ b/openbas-front/src/public/components/login/LoginForm.js @@ -26,7 +26,7 @@ const LoginForm = (props) => { name="username" type="text" variant="standard" - label={t('Email address')} + label={t('Login')} fullWidth={true} style={{ marginTop: 5 }} /> diff --git a/openbas-front/src/utils/Localization.js b/openbas-front/src/utils/Localization.js index f12b5129bd..8e55ba871e 100644 --- a/openbas-front/src/utils/Localization.js +++ b/openbas-front/src/utils/Localization.js @@ -11,12 +11,14 @@ const i18n = { 'Send reset code': 'Envoyer le code', 'Enter code': 'Entrer le code', 'Back to login': "Retour à l'identification", + Login: 'Nom d\'utilisateur', 'Sign in': "S'identifier", 'Login with github': "S'identifier avec github", 'You probably need a public email in your github account': "Vous avez probablement besoin d'une adresse e-mail publique dans votre compte github", 'Should be a valid email address': 'Doit être une adresse e-mail valide', 'Login with microsoft': "S'identifier avec microsoft", + 'Corporate login': 'Connexion d\'entreprise', Continue: 'Continuer', Dashboard: 'Tableau de bord', Players: 'Joueurs', @@ -1302,12 +1304,14 @@ const i18n = { 'Send reset code': '发送重置代码', 'Enter code': '输入代码', 'Back to login': '返回登录', + Login: '登录', 'Sign in': '登录', 'Login with github': '使用github登录', 'You probably need a public email in your github account': '你可能需要在GitHub中有一个公开邮件地址', 'Should be a valid email address': '应为有效邮件地址', 'Login with microsoft': '使用microsoft登录', + 'Corporate login': '企业登录', Continue: '继续', Dashboard: '仪表盘', Players: '选手', diff --git a/openbas-front/tests_e2e/model/login.page.ts b/openbas-front/tests_e2e/model/login.page.ts index e9f505d659..578b071cf6 100644 --- a/openbas-front/tests_e2e/model/login.page.ts +++ b/openbas-front/tests_e2e/model/login.page.ts @@ -8,8 +8,8 @@ class LoginPage { return this.page.getByTestId('login-page'); } - getEmailInput() { - return this.page.getByLabel('Email address'); + getLoginInput() { + return this.page.getByLabel('Login'); } getPasswordInput() { diff --git a/openbas-front/tests_e2e/utils/login.ts b/openbas-front/tests_e2e/utils/login.ts index f169284115..04ef790ea7 100644 --- a/openbas-front/tests_e2e/utils/login.ts +++ b/openbas-front/tests_e2e/utils/login.ts @@ -9,7 +9,7 @@ const login = async (page: Page) => { const loginPage = new LoginPage(page); await expect(loginPage.getLoginPage()).toBeVisible(); - await loginPage.getEmailInput().fill('admin@openbas.io'); + await loginPage.getLoginInput().fill('admin@openbas.io'); await loginPage.getPasswordInput().fill('admin'); await loginPage.getSignInButton().click();