Pull request: + client: 2358 Make the mobileconfig API parameterized and more robust
Merge in DNS/adguard-home from feature/2358 to master Updates #2358. Squashed commit of the following: commit b2b91ee3b7303d20b94265d43d785e77260b2210 Author: Artem Baskal <a.baskal@adguard.com> Date: Tue Dec 1 14:54:35 2020 +0300 + client: 2358 Make the mobileconfig API parameterized and more robust
This commit is contained in:
Ainar Garipov
parent
641db73a86
commit
7d1d87d6ec
|
|
@ -2,22 +2,25 @@ import React, { useState } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import { Trans, useTranslation } from 'react-i18next';
|
import { Trans, useTranslation } from 'react-i18next';
|
||||||
import i18next from 'i18next';
|
import i18next from 'i18next';
|
||||||
|
import { useSelector } from 'react-redux';
|
||||||
import Tabs from './Tabs';
|
import Tabs from './Tabs';
|
||||||
import Icons from './Icons';
|
import Icons from './Icons';
|
||||||
|
import { getPathWithQueryString } from '../../helpers/helpers';
|
||||||
|
|
||||||
const MOBILE_CONFIG_LINKS = {
|
const MOBILE_CONFIG_LINKS = {
|
||||||
DOT: '/apple/dot.mobileconfig',
|
DOT: '/apple/dot.mobileconfig',
|
||||||
DOH: '/apple/doh.mobileconfig',
|
DOH: '/apple/doh.mobileconfig',
|
||||||
};
|
};
|
||||||
|
const renderMobileconfigInfo = ({ label, components, server_name }) => <li key={label}>
|
||||||
const renderMobileconfigInfo = ({ label, components }) => <li key={label}>
|
|
||||||
<Trans components={components}>{label}</Trans>
|
<Trans components={components}>{label}</Trans>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<a href={MOBILE_CONFIG_LINKS.DOT} download>{i18next.t('download_mobileconfig_dot')}</a>
|
<a href={getPathWithQueryString(MOBILE_CONFIG_LINKS.DOT, { host: server_name })}
|
||||||
|
download>{i18next.t('download_mobileconfig_dot')}</a>
|
||||||
</li>
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<a href={MOBILE_CONFIG_LINKS.DOH} download>{i18next.t('download_mobileconfig_doh')}</a>
|
<a href={getPathWithQueryString(MOBILE_CONFIG_LINKS.DOH, { host: server_name })}
|
||||||
|
download>{i18next.t('download_mobileconfig_doh')}</a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>;
|
</li>;
|
||||||
|
|
@ -38,37 +41,8 @@ const renderLi = ({ label, components }) => <li key={label}>
|
||||||
</Trans>
|
</Trans>
|
||||||
</li>;
|
</li>;
|
||||||
|
|
||||||
const dnsPrivacyList = [{
|
const getDnsPrivacyList = (server_name) => {
|
||||||
title: 'Android',
|
const iosList = [
|
||||||
list: [
|
|
||||||
{
|
|
||||||
label: 'setup_dns_privacy_android_1',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'setup_dns_privacy_android_2',
|
|
||||||
components: [
|
|
||||||
{
|
|
||||||
key: 0,
|
|
||||||
href: 'https://adguard.com/adguard-android/overview.html',
|
|
||||||
},
|
|
||||||
<code key="1">text</code>,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
label: 'setup_dns_privacy_android_3',
|
|
||||||
components: [
|
|
||||||
{
|
|
||||||
key: 0,
|
|
||||||
href: 'https://getintra.org/',
|
|
||||||
},
|
|
||||||
<code key="1">text</code>,
|
|
||||||
],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
title: 'iOS',
|
|
||||||
list: [
|
|
||||||
{
|
{
|
||||||
label: 'setup_dns_privacy_ios_2',
|
label: 'setup_dns_privacy_ios_2',
|
||||||
components: [
|
components: [
|
||||||
|
|
@ -79,13 +53,6 @@ const dnsPrivacyList = [{
|
||||||
<code key="1">text</code>,
|
<code key="1">text</code>,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
|
||||||
label: 'setup_dns_privacy_4',
|
|
||||||
components: {
|
|
||||||
highlight: <code />,
|
|
||||||
},
|
|
||||||
renderComponent: renderMobileconfigInfo,
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: 'setup_dns_privacy_ios_1',
|
label: 'setup_dns_privacy_ios_1',
|
||||||
components: [
|
components: [
|
||||||
|
|
@ -93,68 +60,114 @@ const dnsPrivacyList = [{
|
||||||
key: 0,
|
key: 0,
|
||||||
href: 'https://itunes.apple.com/app/id1452162351',
|
href: 'https://itunes.apple.com/app/id1452162351',
|
||||||
},
|
},
|
||||||
<code key="1">text</code>,
|
<code key="1">text</code>,
|
||||||
{
|
{
|
||||||
key: 2,
|
key: 2,
|
||||||
href: 'https://dnscrypt.info/stamps',
|
href: 'https://dnscrypt.info/stamps',
|
||||||
},
|
},
|
||||||
|
|
||||||
],
|
],
|
||||||
},
|
}];
|
||||||
],
|
/* Insert second element if can generate .mobileconfig links */
|
||||||
},
|
if (server_name) {
|
||||||
{
|
iosList.splice(1, 0, {
|
||||||
title: 'setup_dns_privacy_other_title',
|
label: 'setup_dns_privacy_4',
|
||||||
list: [
|
components: {
|
||||||
{
|
highlight: <code />,
|
||||||
label: 'setup_dns_privacy_other_1',
|
},
|
||||||
},
|
renderComponent: ({ label, components }) => renderMobileconfigInfo({
|
||||||
{
|
label,
|
||||||
label: 'setup_dns_privacy_other_2',
|
components,
|
||||||
components: [
|
server_name,
|
||||||
{
|
}),
|
||||||
key: 0,
|
});
|
||||||
href: 'https://github.com/AdguardTeam/dnsproxy',
|
}
|
||||||
},
|
|
||||||
],
|
return [{
|
||||||
},
|
title: 'Android',
|
||||||
{
|
list: [
|
||||||
href: 'https://github.com/jedisct1/dnscrypt-proxy',
|
{
|
||||||
label: 'setup_dns_privacy_other_3',
|
label: 'setup_dns_privacy_android_1',
|
||||||
components: [
|
},
|
||||||
{
|
{
|
||||||
key: 0,
|
label: 'setup_dns_privacy_android_2',
|
||||||
href: 'https://github.com/jedisct1/dnscrypt-proxy',
|
components: [
|
||||||
},
|
{
|
||||||
|
key: 0,
|
||||||
|
href: 'https://adguard.com/adguard-android/overview.html',
|
||||||
|
},
|
||||||
<code key="1">text</code>,
|
<code key="1">text</code>,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: 'setup_dns_privacy_other_4',
|
label: 'setup_dns_privacy_android_3',
|
||||||
components: [
|
components: [
|
||||||
{
|
{
|
||||||
key: 0,
|
key: 0,
|
||||||
href: 'https://support.mozilla.org/kb/firefox-dns-over-https',
|
href: 'https://getintra.org/',
|
||||||
},
|
},
|
||||||
<code key="1">text</code>,
|
<code key="1">text</code>,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
],
|
||||||
label: 'setup_dns_privacy_other_5',
|
},
|
||||||
components: [
|
{
|
||||||
{
|
title: 'iOS',
|
||||||
key: 0,
|
list: iosList,
|
||||||
href: 'https://dnscrypt.info/implementations',
|
},
|
||||||
},
|
{
|
||||||
{
|
title: 'setup_dns_privacy_other_title',
|
||||||
key: 1,
|
list: [
|
||||||
href: 'https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients',
|
{
|
||||||
},
|
label: 'setup_dns_privacy_other_1',
|
||||||
],
|
},
|
||||||
},
|
{
|
||||||
],
|
label: 'setup_dns_privacy_other_2',
|
||||||
},
|
components: [
|
||||||
];
|
{
|
||||||
|
key: 0,
|
||||||
|
href: 'https://github.com/AdguardTeam/dnsproxy',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
href: 'https://github.com/jedisct1/dnscrypt-proxy',
|
||||||
|
label: 'setup_dns_privacy_other_3',
|
||||||
|
components: [
|
||||||
|
{
|
||||||
|
key: 0,
|
||||||
|
href: 'https://github.com/jedisct1/dnscrypt-proxy',
|
||||||
|
},
|
||||||
|
<code key="1">text</code>,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'setup_dns_privacy_other_4',
|
||||||
|
components: [
|
||||||
|
{
|
||||||
|
key: 0,
|
||||||
|
href: 'https://support.mozilla.org/kb/firefox-dns-over-https',
|
||||||
|
},
|
||||||
|
<code key="1">text</code>,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'setup_dns_privacy_other_5',
|
||||||
|
components: [
|
||||||
|
{
|
||||||
|
key: 0,
|
||||||
|
href: 'https://dnscrypt.info/implementations',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 1,
|
||||||
|
href: 'https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Clients',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
const renderDnsPrivacyList = ({ title, list }) => <div className="tab__paragraph" key={title}>
|
const renderDnsPrivacyList = ({ title, list }) => <div className="tab__paragraph" key={title}>
|
||||||
<strong><Trans>{title}</Trans></strong>
|
<strong><Trans>{title}</Trans></strong>
|
||||||
|
|
@ -172,6 +185,7 @@ const getTabs = ({
|
||||||
tlsAddress,
|
tlsAddress,
|
||||||
httpsAddress,
|
httpsAddress,
|
||||||
showDnsPrivacyNotice,
|
showDnsPrivacyNotice,
|
||||||
|
server_name,
|
||||||
t,
|
t,
|
||||||
}) => ({
|
}) => ({
|
||||||
Router: {
|
Router: {
|
||||||
|
|
@ -277,7 +291,7 @@ const getTabs = ({
|
||||||
setup_dns_privacy_3
|
setup_dns_privacy_3
|
||||||
</Trans>
|
</Trans>
|
||||||
</div>
|
</div>
|
||||||
{dnsPrivacyList.map(renderDnsPrivacyList)}
|
{getDnsPrivacyList(server_name).map(renderDnsPrivacyList)}
|
||||||
</>}
|
</>}
|
||||||
</div>
|
</div>
|
||||||
</div>;
|
</div>;
|
||||||
|
|
@ -299,6 +313,7 @@ const renderContent = ({ title, list, getTitle }) => <div key={title} label={i18
|
||||||
|
|
||||||
const Guide = ({ dnsAddresses }) => {
|
const Guide = ({ dnsAddresses }) => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
const server_name = useSelector((state) => state.encryption.server_name);
|
||||||
const tlsAddress = dnsAddresses?.filter((item) => item.includes('tls://')) ?? '';
|
const tlsAddress = dnsAddresses?.filter((item) => item.includes('tls://')) ?? '';
|
||||||
const httpsAddress = dnsAddresses?.filter((item) => item.includes('https://')) ?? '';
|
const httpsAddress = dnsAddresses?.filter((item) => item.includes('https://')) ?? '';
|
||||||
const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
|
const showDnsPrivacyNotice = httpsAddress.length < 1 && tlsAddress.length < 1;
|
||||||
|
|
@ -309,6 +324,7 @@ const Guide = ({ dnsAddresses }) => {
|
||||||
tlsAddress,
|
tlsAddress,
|
||||||
httpsAddress,
|
httpsAddress,
|
||||||
showDnsPrivacyNotice,
|
showDnsPrivacyNotice,
|
||||||
|
server_name,
|
||||||
t,
|
t,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,8 @@ const encryption = handleActions({
|
||||||
const newState = {
|
const newState = {
|
||||||
...state,
|
...state,
|
||||||
...payload,
|
...payload,
|
||||||
|
/* TODO: handle property delete on api refactor */
|
||||||
|
server_name: payload.server_name || '',
|
||||||
processing: false,
|
processing: false,
|
||||||
};
|
};
|
||||||
return newState;
|
return newState;
|
||||||
|
|
@ -20,6 +22,7 @@ const encryption = handleActions({
|
||||||
const newState = {
|
const newState = {
|
||||||
...state,
|
...state,
|
||||||
...payload,
|
...payload,
|
||||||
|
server_name: payload.server_name || '',
|
||||||
processingConfig: false,
|
processingConfig: false,
|
||||||
};
|
};
|
||||||
return newState;
|
return newState;
|
||||||
|
|
@ -49,6 +52,7 @@ const encryption = handleActions({
|
||||||
subject,
|
subject,
|
||||||
warning_validation,
|
warning_validation,
|
||||||
dns_names,
|
dns_names,
|
||||||
|
server_name: payload.server_name || '',
|
||||||
processingValidate: false,
|
processingValidate: false,
|
||||||
};
|
};
|
||||||
return newState;
|
return newState;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue