LogalDeveloper/owncast
0
Fork 0
Code Activity

fix(js): consolidate url and account validators

Browse Source
This commit is contained in:
Gabe Kangas
2023-04-16 14:17:13 -07:00
parent e84ccbb90b
commit b3ac4e1a15
11 changed files with 101 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/components/admin/config/general/EditSocialLinks.tsx
View File

@@ -18,7 +18,7 @@ import {
isValidAccount,
isValidUrl,
DEFAULT_TEXTFIELD_URL_PATTERN,
} from '../../../../utils/urls';
} from '../../../../utils/validators';
import { TextField } from '../../TextField';
import { createInputStatus, STATUS_ERROR, STATUS_SUCCESS } from '../../../../utils/input-statuses';
import { FormStatusIndicator } from '../../FormStatusIndicator';

2
web/components/admin/config/server/EditStorage.tsx
View File

@@ -20,7 +20,7 @@ import {
} from '../../../../utils/input-statuses';
import { TextField } from '../../TextField';
import { FormStatusIndicator } from '../../FormStatusIndicator';
import { isValidUrl } from '../../../../utils/urls';
import { isValidUrl } from '../../../../utils/validators';
import { ToggleSwitch } from '../../ToggleSwitch';
const { Panel } = Collapse;

4
web/components/modals/FediAuthModal/FediAuthModal.tsx
View File

@@ -2,7 +2,7 @@ import { Alert, Button, Input, Space, Spin, Collapse } from 'antd';
import React, { FC, useState } from 'react';
import dynamic from 'next/dynamic';
import styles from './FediAuthModal.module.scss';
import { validateAccount } from '../../../utils/validators';
import { isValidFediverseAccount } from '../../../utils/validators';
const { Panel } = Collapse;
@@ -50,7 +50,7 @@ export const FediAuthModal: FC<FediAuthModalProps> = ({
}
const validate = (acct: string) => {
setValid(validateAccount(acct));
setValid(isValidFediverseAccount(acct));
};
const onInput = (e: React.ChangeEvent<HTMLInputElement>) => {

10
web/components/modals/FollowModal/FollowModal.tsx
View File

@@ -2,6 +2,7 @@
import { Input, Button, Alert, Spin, Space } from 'antd';
import { FC, useState } from 'react';
import styles from './FollowModal.module.scss';
import { isValidFediverseAccount } from '../../../utils/validators';
const ENDPOINT = '/api/remotefollow';
@@ -11,13 +12,6 @@ export type FollowModalProps = {
name: string;
};
function validateAccount(a) {
const sanitized = a.replace(/^@+/, '');
const regex =
/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return regex.test(String(sanitized).toLowerCase());
}
export const FollowModal: FC<FollowModalProps> = ({ handleClose, account, name }) => {
const [remoteAccount, setRemoteAccount] = useState(null);
const [valid, setValid] = useState(false);
@@ -26,7 +20,7 @@ export const FollowModal: FC<FollowModalProps> = ({ handleClose, account, name }
const handleAccountChange = a => {
setRemoteAccount(a);
if (validateAccount(a)) {
if (isValidFediverseAccount(a)) {
setValid(true);
} else {
setValid(false);

2
web/components/modals/IndieAuthModal/IndieAuthModal.tsx
View File

@@ -1,7 +1,7 @@
import { Alert, Input, Space, Spin, Collapse, Typography, Button } from 'antd';
import dynamic from 'next/dynamic';
import React, { FC, useState } from 'react';
import { isValidUrl } from '../../../utils/urls';
import { isValidUrl } from '../../../utils/validators';
const { Panel } = Collapse;
const { Link } = Typography;