From 3d8f1637c6b11956cbaff8029fb78d544b782ddc Mon Sep 17 00:00:00 2001 From: Mirlan Date: Wed, 15 Jul 2020 18:08:55 +0600 Subject: [PATCH] fix(#184): make request on logout (#42) --- src/config/procedures.tsx | 1 + src/features/AuthStore/hooks/useLogout.tsx | 12 +++--------- src/requests/index.tsx | 1 + src/requests/logout.tsx | 18 ++++++++++++++++++ 4 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 src/requests/logout.tsx diff --git a/src/config/procedures.tsx b/src/config/procedures.tsx index 3a52bd7a..50f3c0de 100644 --- a/src/config/procedures.tsx +++ b/src/config/procedures.tsx @@ -3,6 +3,7 @@ export const PROCEDURES = { create_user: 'create_user', get_cities: 'get_cities', get_players_teams_tournaments: 'get_players_teams_tournaments', + logout_user: 'logout_user', lst_c_country: 'lst_c_country', param_lexical: 'param_lexical', } diff --git a/src/features/AuthStore/hooks/useLogout.tsx b/src/features/AuthStore/hooks/useLogout.tsx index 1ff9b376..1658e169 100644 --- a/src/features/AuthStore/hooks/useLogout.tsx +++ b/src/features/AuthStore/hooks/useLogout.tsx @@ -2,10 +2,7 @@ import { useHistory } from 'react-router-dom' import { PAGES } from 'config' import { removeToken } from 'helpers' -// import { logout } from 'requests' - -// временная заглушка запроса -const logout = () => Promise.resolve() +import { logout } from 'requests' type Args = { setToken: (token: string | null) => void, @@ -14,13 +11,10 @@ type Args = { export const useLogout = ({ setToken }: Args) => { const history = useHistory() - const onSuccess = () => { + return () => { + logout() removeToken() setToken(null) history.replace(PAGES.login) } - - return async () => ( - logout().then(onSuccess) - ) } diff --git a/src/requests/index.tsx b/src/requests/index.tsx index a877c19e..528c126b 100644 --- a/src/requests/index.tsx +++ b/src/requests/index.tsx @@ -1,5 +1,6 @@ export * from './register' export * from './login' +export * from './logout' export * from './getCountries' export * from './getCountryCities' export * from './getLexics' diff --git a/src/requests/logout.tsx b/src/requests/logout.tsx new file mode 100644 index 00000000..5488b4d5 --- /dev/null +++ b/src/requests/logout.tsx @@ -0,0 +1,18 @@ +import { DATA_URL, PROCEDURES } from 'config' +import { callApi } from 'helpers' + +const proc = PROCEDURES.logout_user + +export const logout = () => { + const config = { + body: { + params: {}, + proc, + }, + } + + callApi({ + config, + url: DATA_URL, + }) +}