sforkowany z mirror/soapbox
Captcha: convert to tsx
Alex Gleason
rodzic
907ccd9e24
commit
aa4faeb96c
|
|
@ -1,125 +0,0 @@
|
|||
import { Map as ImmutableMap } from 'immutable';
|
||||
import PropTypes from 'prop-types';
|
||||
import React from 'react';
|
||||
import ImmutablePropTypes from 'react-immutable-proptypes';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
import { connect } from 'react-redux';
|
||||
|
||||
import { fetchCaptcha } from 'soapbox/actions/auth';
|
||||
import { TextInput } from 'soapbox/features/forms';
|
||||
|
||||
const noOp = () => {};
|
||||
|
||||
export default @connect()
|
||||
class CaptchaField extends React.Component {
|
||||
|
||||
static propTypes = {
|
||||
onChange: PropTypes.func,
|
||||
onFetch: PropTypes.func,
|
||||
onFetchFail: PropTypes.func,
|
||||
onClick: PropTypes.func,
|
||||
dispatch: PropTypes.func,
|
||||
refreshInterval: PropTypes.number,
|
||||
idempotencyKey: PropTypes.string,
|
||||
}
|
||||
|
||||
static defaultProps = {
|
||||
onChange: noOp,
|
||||
onFetch: noOp,
|
||||
onFetchFail: noOp,
|
||||
onClick: noOp,
|
||||
refreshInterval: 5*60*1000, // 5 minutes, Pleroma default
|
||||
}
|
||||
|
||||
state = {
|
||||
captcha: ImmutableMap(),
|
||||
refresh: undefined,
|
||||
}
|
||||
|
||||
startRefresh = () => {
|
||||
const { refreshInterval } = this.props;
|
||||
if (refreshInterval) {
|
||||
const refresh = setInterval(this.fetchCaptcha, refreshInterval);
|
||||
this.setState({ refresh });
|
||||
}
|
||||
}
|
||||
|
||||
endRefresh = () => {
|
||||
clearInterval(this.state.refresh);
|
||||
}
|
||||
|
||||
forceRefresh = () => {
|
||||
this.fetchCaptcha();
|
||||
this.endRefresh();
|
||||
this.startRefresh();
|
||||
}
|
||||
|
||||
fetchCaptcha = () => {
|
||||
const { dispatch, onFetch, onFetchFail } = this.props;
|
||||
dispatch(fetchCaptcha()).then(response => {
|
||||
const captcha = ImmutableMap(response.data);
|
||||
this.setState({ captcha });
|
||||
onFetch(captcha);
|
||||
}).catch(error => {
|
||||
onFetchFail(error);
|
||||
});
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
this.fetchCaptcha();
|
||||
this.startRefresh(); // Refresh periodically
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
this.endRefresh();
|
||||
}
|
||||
|
||||
componentDidUpdate(prevProps) {
|
||||
if (this.props.idempotencyKey !== prevProps.idempotencyKey) {
|
||||
this.forceRefresh();
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const { captcha } = this.state;
|
||||
const { onChange, onClick, ...props } = this.props;
|
||||
|
||||
switch(captcha.get('type')) {
|
||||
case 'native':
|
||||
return (
|
||||
<div>
|
||||
<p>{<FormattedMessage id='registration.captcha.hint' defaultMessage='Click the image to get a new captcha' />}</p>
|
||||
<NativeCaptchaField captcha={captcha} onChange={onChange} onClick={onClick} {...props} />
|
||||
</div>
|
||||
);
|
||||
case 'none':
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
export const NativeCaptchaField = ({ captcha, onChange, onClick, name, value }) => (
|
||||
<div className='captcha' >
|
||||
<img alt='captcha' src={captcha.get('url')} onClick={onClick} />
|
||||
<TextInput
|
||||
placeholder='Enter the pictured text'
|
||||
name={name}
|
||||
value={value}
|
||||
autoComplete='off'
|
||||
autoCorrect='off'
|
||||
autoCapitalize='off'
|
||||
onChange={onChange}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
NativeCaptchaField.propTypes = {
|
||||
captcha: ImmutablePropTypes.map.isRequired,
|
||||
onChange: PropTypes.func,
|
||||
onClick: PropTypes.func,
|
||||
name: PropTypes.string,
|
||||
value: PropTypes.string,
|
||||
};
|
||||
|
|
@ -0,0 +1,118 @@
|
|||
import { Map as ImmutableMap } from 'immutable';
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import { FormattedMessage } from 'react-intl';
|
||||
|
||||
import { fetchCaptcha } from 'soapbox/actions/auth';
|
||||
import { TextInput } from 'soapbox/features/forms';
|
||||
import { useAppDispatch } from 'soapbox/hooks';
|
||||
|
||||
const noOp = () => {};
|
||||
|
||||
interface ICaptchaField {
|
||||
name?: string,
|
||||
value: string,
|
||||
onChange?: React.ChangeEventHandler<HTMLInputElement>,
|
||||
onFetch?: (captcha: ImmutableMap<string, any>) => void,
|
||||
onFetchFail?: (error: Error) => void,
|
||||
onClick?: React.MouseEventHandler,
|
||||
refreshInterval?: number,
|
||||
idempotencyKey: string,
|
||||
}
|
||||
|
||||
const CaptchaField: React.FC<ICaptchaField> = ({
|
||||
name,
|
||||
value,
|
||||
onChange = noOp,
|
||||
onFetch = noOp,
|
||||
onFetchFail = noOp,
|
||||
onClick = noOp,
|
||||
refreshInterval = 5*60*1000, // 5 minutes, Pleroma default
|
||||
idempotencyKey,
|
||||
}) => {
|
||||
const dispatch = useAppDispatch();
|
||||
|
||||
const [captcha, setCaptcha] = useState(ImmutableMap<string, any>());
|
||||
const [refresh, setRefresh] = useState<NodeJS.Timer | undefined>(undefined);
|
||||
|
||||
const getCaptcha = () => {
|
||||
dispatch(fetchCaptcha()).then(response => {
|
||||
const captcha = ImmutableMap<string, any>(response.data);
|
||||
setCaptcha(captcha);
|
||||
onFetch(captcha);
|
||||
}).catch((error: Error) => {
|
||||
onFetchFail(error);
|
||||
});
|
||||
};
|
||||
|
||||
const startRefresh = () => {
|
||||
if (refreshInterval) {
|
||||
const newRefresh = setInterval(getCaptcha, refreshInterval);
|
||||
setRefresh(newRefresh);
|
||||
}
|
||||
};
|
||||
|
||||
const endRefresh = () => {
|
||||
if (refresh) {
|
||||
clearInterval(refresh);
|
||||
}
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
getCaptcha();
|
||||
endRefresh();
|
||||
startRefresh(); // Refresh periodically
|
||||
|
||||
return () => {
|
||||
endRefresh();
|
||||
};
|
||||
}, [idempotencyKey]);
|
||||
|
||||
switch(captcha.get('type')) {
|
||||
case 'native':
|
||||
return (
|
||||
<div>
|
||||
<p>{<FormattedMessage id='registration.captcha.hint' defaultMessage='Click the image to get a new captcha' />}</p>
|
||||
|
||||
<NativeCaptchaField
|
||||
captcha={captcha}
|
||||
onChange={onChange}
|
||||
onClick={onClick}
|
||||
name={name}
|
||||
value={value}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
case 'none':
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
};
|
||||
|
||||
interface INativeCaptchaField {
|
||||
captcha: ImmutableMap<string, any>,
|
||||
onChange: React.ChangeEventHandler<HTMLInputElement>,
|
||||
onClick: React.MouseEventHandler,
|
||||
name?: string,
|
||||
value: string,
|
||||
}
|
||||
|
||||
const NativeCaptchaField: React.FC<INativeCaptchaField> = ({ captcha, onChange, onClick, name, value }) => (
|
||||
<div className='captcha' >
|
||||
<img alt='captcha' src={captcha.get('url')} onClick={onClick} />
|
||||
<TextInput
|
||||
placeholder='Enter the pictured text'
|
||||
name={name}
|
||||
value={value}
|
||||
autoComplete='off'
|
||||
autoCorrect='off'
|
||||
autoCapitalize='off'
|
||||
onChange={onChange}
|
||||
required
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
export {
|
||||
CaptchaField as default,
|
||||
NativeCaptchaField,
|
||||
};
|
||||
Ładowanie…
Reference in New Issue