diff --git a/src/components/auth/chooseAccount/ChooseAccount.intl.json b/src/components/auth/chooseAccount/ChooseAccount.intl.json index d614678..9b207ca 100644 --- a/src/components/auth/chooseAccount/ChooseAccount.intl.json +++ b/src/components/auth/chooseAccount/ChooseAccount.intl.json @@ -2,6 +2,5 @@ "chooseAccountTitle": "Choose an account", "addAccount": "Log into another account", "logoutAll": "Log out from all accounts", - "createNewAccount": "Create new account", "description": "You have logged in into multiple accounts. Please choose the one, you want to use to authorize {appName}" } diff --git a/src/components/auth/chooseAccount/ChooseAccount.jsx b/src/components/auth/chooseAccount/ChooseAccount.jsx index 39af5e3..0aaa6de 100644 --- a/src/components/auth/chooseAccount/ChooseAccount.jsx +++ b/src/components/auth/chooseAccount/ChooseAccount.jsx @@ -10,11 +10,7 @@ export default factory({ }, links: [ { - label: messages.createNewAccount - }, - { - label: messages.logoutAll, - payload: {logout: true} + label: messages.logoutAll } ] }); diff --git a/src/i18n/be.json b/src/i18n/be.json index dd5ebc8..1494b40 100644 --- a/src/i18n/be.json +++ b/src/i18n/be.json @@ -20,7 +20,6 @@ "components.auth.appInfo.useItYourself": "Наведайце нашу {link}, каб даведацца, як выкарыстоўваць гэты сэрвіс ў сваіх праектах.", "components.auth.chooseAccount.addAccount": "Увайсці ў другі акаўнт", "components.auth.chooseAccount.chooseAccountTitle": "Выбар акаўнта", - "components.auth.chooseAccount.createNewAccount": "Стварыць новы акаўнт", "components.auth.chooseAccount.description": "Вы выканалі ўваход у некалькі акаўнтаў. Пазначце, які вы жадаеце выкарыстаць для аўтарызацыі {appName}", "components.auth.chooseAccount.logoutAll": "Выйсці з усіх акаўнтаў", "components.auth.finish.authForAppFailed": "Аўтарызацыя для {appName} не атрымалася", diff --git a/src/i18n/en.json b/src/i18n/en.json index d9e84ac..28a69e2 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -20,7 +20,6 @@ "components.auth.appInfo.useItYourself": "Visit our {link}, to learn how to use this service in you projects.", "components.auth.chooseAccount.addAccount": "Log into another account", "components.auth.chooseAccount.chooseAccountTitle": "Choose an account", - "components.auth.chooseAccount.createNewAccount": "Create new account", "components.auth.chooseAccount.description": "You have logged in into multiple accounts. Please choose the one, you want to use to authorize {appName}", "components.auth.chooseAccount.logoutAll": "Log out from all accounts", "components.auth.finish.authForAppFailed": "Authorization for {appName} was failed", diff --git a/src/i18n/pt.json b/src/i18n/pt.json index 3e9122c..16e6c15 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -20,7 +20,6 @@ "components.auth.appInfo.useItYourself": "Visite nossa {link} para aprender a como usar esse serviço nos seus projetos.", "components.auth.chooseAccount.addAccount": "Entrar em outra conta", "components.auth.chooseAccount.chooseAccountTitle": "Escolha uma conta", - "components.auth.chooseAccount.createNewAccount": "Criar uma nova conta", "components.auth.chooseAccount.description": "Você entrou em múltiplas contas. Por favor selecione a que você quer usar para autorizar {appName}", "components.auth.chooseAccount.logoutAll": "Desconectar de todas as contas", "components.auth.finish.authForAppFailed": "Autorização para {appName} falhou.", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 7b82ad1..ba2b35e 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -20,7 +20,6 @@ "components.auth.appInfo.useItYourself": "Посетите нашу {link}, чтобы узнать, как использовать этот сервис в своих проектах.", "components.auth.chooseAccount.addAccount": "Войти в другой аккаунт", "components.auth.chooseAccount.chooseAccountTitle": "Выбор аккаунта", - "components.auth.chooseAccount.createNewAccount": "Создать новый аккаунт", "components.auth.chooseAccount.description": "Вы выполнили вход в несколько аккаунтов. Укажите, какой вы хотите использовать для авторизации {appName}", "components.auth.chooseAccount.logoutAll": "Выйти из всех аккаунтов", "components.auth.finish.authForAppFailed": "Авторизация для {appName} не удалась", diff --git a/src/i18n/uk.json b/src/i18n/uk.json index 5560903..744d7bb 100644 --- a/src/i18n/uk.json +++ b/src/i18n/uk.json @@ -20,7 +20,6 @@ "components.auth.appInfo.useItYourself": "Відвідайте нашу {link}, щоб дізнатися, як використовувати цей сервіс в своїх проектах.", "components.auth.chooseAccount.addAccount": "Увійти в інший акаунт", "components.auth.chooseAccount.chooseAccountTitle": "Оберіть акаунт", - "components.auth.chooseAccount.createNewAccount": "Створити новий акаунт", "components.auth.chooseAccount.description": "Ви увійшли у декілька акаунтів. Будь ласка, оберіть акаунт, який ви бажаєте використовувати для авторизації {appName}", "components.auth.chooseAccount.logoutAll": "Вийти з усіх аккаунтів", "components.auth.finish.authForAppFailed": "Авторизація для {appName} не вдалася", diff --git a/src/services/authFlow/ChooseAccountState.js b/src/services/authFlow/ChooseAccountState.js index 92de6b8..b85f3f5 100644 --- a/src/services/authFlow/ChooseAccountState.js +++ b/src/services/authFlow/ChooseAccountState.js @@ -1,7 +1,6 @@ import AbstractState from './AbstractState'; import LoginState from './LoginState'; import CompleteState from './CompleteState'; -import RegisterState from './RegisterState'; export default class ChooseAccountState extends AbstractState { enter(context) { @@ -17,16 +16,7 @@ export default class ChooseAccountState extends AbstractState { } } - /** - * @param {object} context - * @param {object} payload - * @param {bool} [payload.logout=false] - */ - reject(context, payload = {}) { - if (payload.logout) { - context.run('logout'); - } else { - context.setState(new RegisterState()); - } + reject(context) { + context.run('logout'); } } diff --git a/tests/services/authFlow/ChooseAccountState.test.js b/tests/services/authFlow/ChooseAccountState.test.js index f600eef..12ffae4 100644 --- a/tests/services/authFlow/ChooseAccountState.test.js +++ b/tests/services/authFlow/ChooseAccountState.test.js @@ -1,7 +1,6 @@ import ChooseAccountState from 'services/authFlow/ChooseAccountState'; import CompleteState from 'services/authFlow/CompleteState'; import LoginState from 'services/authFlow/LoginState'; -import RegisterState from 'services/authFlow/RegisterState'; import { bootstrap, expectState, expectNavigate, expectRun } from './helpers'; @@ -46,16 +45,10 @@ describe('ChooseAccountState', () => { }); describe('#reject', () => { - it('should transition to register', () => { - expectState(mock, RegisterState); - - state.reject(context); - }); - it('should logout', () => { expectRun(mock, 'logout'); - state.reject(context, {logout: true}); + state.reject(context); }); }); });