Improve type checking for card verify

This commit is contained in:
Anna Melzer 2018-10-25 23:41:51 +02:00
parent d1b4daebd2
commit c41bf79e4b

View file

@ -7,6 +7,20 @@ let scriptLoading = false;
let scriptLoaded = false; let scriptLoaded = false;
let scriptDidError = false; let scriptDidError = false;
declare class CardVerify {
static stripeHandler: {
open: Function,
close: Function,
};
}
declare class StripeCheckout {
static configure({}): {
open: Function,
close: Function,
};
}
type Props = { type Props = {
disabled: boolean, disabled: boolean,
label: ?string, label: ?string,
@ -27,14 +41,20 @@ type Props = {
// token.id can be used to create a charge or customer. // token.id can be used to create a charge or customer.
// token.email contains the email address entered by the user. // token.email contains the email address entered by the user.
token: string, token: string,
email: string,
}; };
class CardVerify extends React.Component { type State = {
constructor(props) { open: boolean,
};
class CardVerifyComponent extends React.Component<Props, State> {
constructor(props: Props) {
super(props); super(props);
this.state = { this.state = {
open: false, open: false,
}; };
this.onClick = this.onClick.bind(this);
} }
componentDidMount() { componentDidMount() {
@ -65,12 +85,14 @@ class CardVerify extends React.Component {
scriptDidError = true; scriptDidError = true;
scriptLoading = false; scriptLoading = false;
reject(event); reject(event);
this.onScriptError(event); this.onScriptError();
}; };
}); });
const wrappedPromise = new Promise((accept, cancel) => { const wrappedPromise = new Promise((accept, cancel) => {
promise.then(() => (canceled ? cancel({ isCanceled: true }) : accept())); promise.then(() => (canceled ? cancel(new Error({ isCanceled: true })) : accept()));
promise.catch(error => (canceled ? cancel({ isCanceled: true }) : cancel(error))); promise.catch(
error => (canceled ? cancel(new Error({ isCanceled: true })) : cancel(error))
);
}); });
return { return {
@ -83,8 +105,10 @@ class CardVerify extends React.Component {
this.loadPromise.promise.then(this.onScriptLoaded).catch(this.onScriptError); this.loadPromise.promise.then(this.onScriptLoaded).catch(this.onScriptError);
if (document.body) {
document.body.appendChild(script); document.body.appendChild(script);
} }
}
componentDidUpdate() { componentDidUpdate() {
if (!scriptLoading) { if (!scriptLoading) {
@ -112,7 +136,7 @@ class CardVerify extends React.Component {
} }
}; };
onScriptError = (...args) => { onScriptError = () => {
throw new Error('Unable to load credit validation script.'); throw new Error('Unable to load credit validation script.');
}; };
@ -120,6 +144,23 @@ class CardVerify extends React.Component {
this.setState({ open: false }); this.setState({ open: false });
}; };
onClick = () => {
if (scriptDidError) {
throw new Error('Tried to call onClick, but StripeCheckout failed to load');
} else if (CardVerify.stripeHandler) {
this.showStripeDialog();
} else {
this.hasPendingClick = true;
}
};
loadPromise: {
promise: Promise<any>,
cancel: Function,
};
hasPendingClick: boolean;
updateStripeHandler() { updateStripeHandler() {
if (!CardVerify.stripeHandler) { if (!CardVerify.stripeHandler) {
CardVerify.stripeHandler = StripeCheckout.configure({ CardVerify.stripeHandler = StripeCheckout.configure({
@ -142,18 +183,6 @@ class CardVerify extends React.Component {
}); });
} }
onClick = () => {
if (scriptDidError) {
try {
throw new Error('Tried to call onClick, but StripeCheckout failed to load');
} catch (x) {}
} else if (CardVerify.stripeHandler) {
this.showStripeDialog();
} else {
this.hasPendingClick = true;
}
};
render() { render() {
return ( return (
<Button <Button
@ -161,10 +190,10 @@ class CardVerify extends React.Component {
label={this.props.label} label={this.props.label}
icon={icons.LOCK} icon={icons.LOCK}
disabled={this.props.disabled || this.state.open || this.hasPendingClick} disabled={this.props.disabled || this.state.open || this.hasPendingClick}
onClick={this.onClick.bind(this)} onClick={this.onClick}
/> />
); );
} }
} }
export default CardVerify; export default CardVerifyComponent;