Squashed commit of the following: commit 1aab0f62e94ce665a1b996552fac41dc4e769b4d Merge: cdf5eb6ec1f5fdaeAuthor: ArtemBaskal <a.baskal@adguard.com> Date: Thu Sep 24 15:36:05 2020 +0300 Merge branch '1920-client-find' into feature/1925 commit cdf5eb6ea67a665d21a3155d8cf89bba9a5a9948 Merge: b6c20b1c10f67bd3Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 23 20:28:51 2020 +0300 Merge branch 'master' into feature/1925 commit b6c20b1c7359a0e5902405b0551712f936848a80 Merge: 97d388ef96512433Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 15 10:44:25 2020 +0300 Merge branch 'master' into feature/1925 commit 97d388ef6571d590f21da00f86d889e881ca0c3d Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 15 10:30:50 2020 +0300 Extract buttons commit ca45fde11fc2b2812ff2b84dbd67aff0b5341be1 Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Sep 10 12:46:09 2020 +0300 Handle errors in updateLogs commit f15e03c2e5a7115db984f70f72b0ddd870ece73d Author: ArtemBaskal <a.baskal@adguard.com> Date: Thu Sep 10 12:39:34 2020 +0300 Update mobile block status on click commit 033b28db3b324f6d529ac1a0ef657886cdbe02bd Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 9 20:53:42 2020 +0300 Fix mobile block buttons, auto open page on web serve start commit 2730937b23309167a066b9154728ac53ffe81a49 Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 9 13:58:37 2020 +0300 Disable allow this client button when isNotInAllowedList is true commit 818cf869d63654c184762ad2701c4429a3e3011e Author: ArtemBaskal <a.baskal@adguard.com> Date: Wed Sep 9 13:06:01 2020 +0300 Update client block state on option click commit a072b8983757f419645c0207ea78e6e867c440cb Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 8 20:17:16 2020 +0300 Adapt to api changes commit 28ab2bd8b3f14f60bc822b5a69fa1801db67d816 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 8 14:12:20 2020 +0300 Change query log block confirm messages commit 9b0b6f6f9b1ec168fa71dbedd036152da59006e3 Author: ArtemBaskal <a.baskal@adguard.com> Date: Tue Sep 8 12:00:46 2020 +0300 Refactor inner work with disallowed commit 05f76154b8f489738d032fdaa835edb371ce70c7 Author: ArtemBaskal <a.baskal@adguard.com> Date: Mon Sep 7 16:11:37 2020 +0300 + client: Move the client access check to the server-side
81 lines
2.9 KiB
JavaScript
81 lines
2.9 KiB
JavaScript
import { createAction } from 'redux-actions';
|
|
import i18next from 'i18next';
|
|
|
|
import apiClient from '../api/Api';
|
|
import { addErrorToast, addSuccessToast } from './toasts';
|
|
import { splitByNewLine } from '../helpers/helpers';
|
|
|
|
export const getAccessListRequest = createAction('GET_ACCESS_LIST_REQUEST');
|
|
export const getAccessListFailure = createAction('GET_ACCESS_LIST_FAILURE');
|
|
export const getAccessListSuccess = createAction('GET_ACCESS_LIST_SUCCESS');
|
|
|
|
export const getAccessList = () => async (dispatch) => {
|
|
dispatch(getAccessListRequest());
|
|
try {
|
|
const data = await apiClient.getAccessList();
|
|
dispatch(getAccessListSuccess(data));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(getAccessListFailure());
|
|
}
|
|
};
|
|
|
|
export const setAccessListRequest = createAction('SET_ACCESS_LIST_REQUEST');
|
|
export const setAccessListFailure = createAction('SET_ACCESS_LIST_FAILURE');
|
|
export const setAccessListSuccess = createAction('SET_ACCESS_LIST_SUCCESS');
|
|
|
|
export const setAccessList = (config) => async (dispatch) => {
|
|
dispatch(setAccessListRequest());
|
|
try {
|
|
const { allowed_clients, disallowed_clients, blocked_hosts } = config;
|
|
|
|
const values = {
|
|
allowed_clients: splitByNewLine(allowed_clients),
|
|
disallowed_clients: splitByNewLine(disallowed_clients),
|
|
blocked_hosts: splitByNewLine(blocked_hosts),
|
|
};
|
|
|
|
await apiClient.setAccessList(values);
|
|
dispatch(setAccessListSuccess());
|
|
dispatch(addSuccessToast('access_settings_saved'));
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(setAccessListFailure());
|
|
}
|
|
};
|
|
|
|
export const toggleClientBlockRequest = createAction('TOGGLE_CLIENT_BLOCK_REQUEST');
|
|
export const toggleClientBlockFailure = createAction('TOGGLE_CLIENT_BLOCK_FAILURE');
|
|
export const toggleClientBlockSuccess = createAction('TOGGLE_CLIENT_BLOCK_SUCCESS');
|
|
|
|
export const toggleClientBlock = (ip, disallowed, disallowed_rule) => async (dispatch) => {
|
|
dispatch(toggleClientBlockRequest());
|
|
try {
|
|
const {
|
|
allowed_clients, blocked_hosts, disallowed_clients = [],
|
|
} = await apiClient.getAccessList();
|
|
|
|
const updatedDisallowedClients = disallowed
|
|
? disallowed_clients.filter((client) => client !== disallowed_rule)
|
|
: disallowed_clients.concat(ip);
|
|
|
|
const values = {
|
|
allowed_clients,
|
|
blocked_hosts,
|
|
disallowed_clients: updatedDisallowedClients,
|
|
};
|
|
|
|
await apiClient.setAccessList(values);
|
|
dispatch(toggleClientBlockSuccess(values));
|
|
|
|
if (disallowed) {
|
|
dispatch(addSuccessToast(i18next.t('client_unblocked', { ip: disallowed_rule })));
|
|
} else {
|
|
dispatch(addSuccessToast(i18next.t('client_blocked', { ip })));
|
|
}
|
|
} catch (error) {
|
|
dispatch(addErrorToast({ error }));
|
|
dispatch(toggleClientBlockFailure());
|
|
}
|
|
};
|