Skip to content

refactor(checkout): replace captcha-specific JS with generic hooks #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
superdav42 merged 1 commit into from
Apr 22, 2026
Merged

refactor(checkout): replace captcha-specific JS with generic hooks #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 75 additions & 51 deletions assets/js/checkout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,45 +1205,40 @@
this.login_error = '';

const that = this;
const username_or_email = this.login_prompt_field === 'email'
const field_type = this.login_prompt_field;
const username_or_email = field_type === 'email'
? this.email_address || ''
: this.username || '';

// Include captcha tokens if present on the page.
const login_data = {
/**
* Filter the inline login request data.
*
* Addons can hook into this filter to append extra fields to the
* inline login request (for example, captcha tokens).
*
* @param {Object} data The data object to be sent.
* @param {string} field_type The field type ('email' or 'username').
*/
const login_data = hooks.applyFilters('wu_inline_login_data', {
username_or_email,
password: this.inline_login_password,
_wpnonce: jQuery('[name="_wpnonce"]').val()
};

const recaptcha_token = jQuery('input[name="g-recaptcha-response"]').filter(function() {
return this.value;
}).first().val();
const hcaptcha_token = jQuery('input[name="h-captcha-response"]').filter(function() {
return this.value;
}).first().val();
const cap_token = jQuery('input[name="cap-token"]').filter(function() {
return this.value;
}).first().val();

if (recaptcha_token) {
login_data[ 'g-recaptcha-response' ] = recaptcha_token;
}

if (hcaptcha_token) {
login_data[ 'h-captcha-response' ] = hcaptcha_token;
}

if (cap_token) {
login_data[ 'cap-token' ] = cap_token;
}
}, field_type);

this.request('wu_inline_login', login_data, function(results) {

that.logging_in = false;

if (results.success) {

/**
* Fires when an inline login attempt succeeds.
*
* @param {Object} results The AJAX success response.
* @param {string} field_type The field type ('email' or 'username').
*/
hooks.doAction('wu_inline_login_success', results, field_type);

// Login successful - reload page to show logged-in state
window.location.reload();

Expand All @@ -1263,6 +1258,17 @@

}

/**
* Fires when an inline login attempt fails.
*
* Addons can hook into this action to react to failed logins
* (for example, resetting a captcha widget).
*
* @param {Object} error The AJAX error response.
* @param {string} field_type The field type ('email' or 'username').
*/
hooks.doAction('wu_inline_login_error', error, field_type);

});

return false;
Expand Down Expand Up @@ -1351,6 +1357,17 @@

}

/**
* Fires when an inline login attempt fails.
*
* Addons can hook into this action to react to failed logins
* (for example, resetting a captcha widget).
*
* @param {Object} error The AJAX error response or jqXHR.
* @param {string} fieldType The field type ('email' or 'username').
*/
hooks.doAction('wu_inline_login_error', error, fieldType);

}

function handleLogin(e) {
Expand All @@ -1375,34 +1392,20 @@

const username_or_email = fieldType === 'email' ? that.email_address : that.username;

// Include captcha tokens if present on the page.
const inline_login_data = {
/**
* Filter the inline login request data.
*
* Addons can hook into this filter to append extra fields
* to the inline login request (for example, captcha tokens).
*
* @param {Object} data The data object to be sent.
* @param {string} fieldType The field type ('email' or 'username').
*/
const inline_login_data = hooks.applyFilters('wu_inline_login_data', {
username_or_email,
password,
_wpnonce: jQuery('[name="_wpnonce"]').val()
};

const recaptcha_val = jQuery('input[name="g-recaptcha-response"]').filter(function() {
return this.value;
}).first().val();
const hcaptcha_val = jQuery('input[name="h-captcha-response"]').filter(function() {
return this.value;
}).first().val();
const cap_val = jQuery('input[name="cap-token"]').filter(function() {
return this.value;
}).first().val();

if (recaptcha_val) {
inline_login_data[ 'g-recaptcha-response' ] = recaptcha_val;
}

if (hcaptcha_val) {
inline_login_data[ 'h-captcha-response' ] = hcaptcha_val;
}

if (cap_val) {
inline_login_data[ 'cap-token' ] = cap_val;
}
}, fieldType);

jQuery.ajax({
method: 'POST',
Expand All @@ -1412,6 +1415,14 @@

if (results.success) {

/**
* Fires when an inline login attempt succeeds.
*
* @param {Object} results The AJAX success response.
* @param {string} fieldType The field type.
*/
hooks.doAction('wu_inline_login_success', results, fieldType);

window.location.reload();

} else {
Expand Down Expand Up @@ -1457,6 +1468,19 @@

});

/**
* Fires once the inline login prompt is attached and ready.
*
* Addons can hook into this action to initialize their own
* widgets inside the prompt (for example, rendering a captcha
* widget whose markup was injected via the
* `wu_inline_login_prompt_before_submit` server-side action).
*
* @param {string} fieldType The field type ('email' or 'username').
* @param {HTMLElement} loginPromptContainer The prompt container element.
*/
hooks.doAction('wu_inline_login_prompt_ready', fieldType, loginPromptContainer);

});

},
Expand Down
Loading
Loading