Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Remove isUserTriggered since there is no jQuery click anymore

Browse Source 
Now, this action is always user-triggered.

[MAILPOET-2682]
This commit is contained in:
Jan Jakeš
2020-04-23 10:29:09 +02:00
committed by Veljko V
parent 223c8cf67f
commit 0b80ad8597
2 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/js/src/settings/pages/key_activation/key_activation.tsx
View File

@@ -40,7 +40,6 @@ export default function KeyActivation() {
notices.error(<p>{t('premiumTabNoKeyNotice')}</p>, { scroll: true });
return;
}
const isUserTriggered = event.isTrusted;
await setState({
mssStatus: null,
premiumStatus: null,
@@ -48,14 +47,12 @@ export default function KeyActivation() {
});
MailPoet.Modal.loading(true);
setState({ inProgress: true });
await verifyMssKey(state.key, isUserTriggered);
await verifyMssKey(state.key);
await sendCongratulatoryMssEmail();
await verifyPremiumKey(state.key);
setState({ inProgress: false });
MailPoet.Modal.loading(false);
if (isUserTriggered) {
setState({ fromAddressModalCanBeShown: true });
}
setState({ fromAddressModalCanBeShown: true });
};
return (
@@ -94,7 +91,7 @@ export default function KeyActivation() {
<MssMessages
keyMessage={state.mssMessage}
activationCallback={async () => {
await verifyMssKey(state.key, true);
await verifyMssKey(state.key);
sendCongratulatoryMssEmail();
setState({ fromAddressModalCanBeShown: true });
}}

35
assets/js/src/settings/store/actions/mss_and_premium.ts
View File

@@ -9,7 +9,7 @@ export function updateKeyActivationState(fields: Partial<KeyActivationState>): A
return { type: 'UPDATE_KEY_ACTIVATION_STATE', fields };
}
export function* verifyMssKey(key: string, activateMssIfKeyValid: boolean) {
export function* verifyMssKey(key: string) {
const { success, error, res } = yield {
type: 'CALL_API',
endpoint: 'services',
@@ -25,25 +25,22 @@ export function* verifyMssKey(key: string, activateMssIfKeyValid: boolean) {
const fields: Partial<KeyActivationState> = {
mssMessage: res.data.message || null,
};
if (activateMssIfKeyValid) {
const call = yield {
type: 'CALL_API',
endpoint: 'settings',
action: 'set',
data: {
mta_group: 'mailpoet',
mta: { method: 'MailPoet', mailpoet_api_key: key },
signup_confirmation: { enabled: '1' },
},
};
if (!call.success) {
fields.mssStatus = MssStatus.VALID_MSS_NOT_ACTIVE;
} else {
yield setSettings(call.res.data);
fields.mssStatus = MssStatus.VALID_MSS_ACTIVE;
}
} else {
const call = yield {
type: 'CALL_API',
endpoint: 'settings',
action: 'set',
data: {
mta_group: 'mailpoet',
mta: { method: 'MailPoet', mailpoet_api_key: key },
signup_confirmation: { enabled: '1' },
},
};
if (!call.success) {
fields.mssStatus = MssStatus.VALID_MSS_NOT_ACTIVE;
} else {
yield setSettings(call.res.data);
fields.mssStatus = MssStatus.VALID_MSS_ACTIVE;
}
return updateKeyActivationState(fields);
}