Skip to content
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

Jump to bottom

UR-870 Enhance - Test captcha from settings #601

Merged
merged 6 commits into from
Oct 4, 2023
Merged

UR-870 Enhance - Test captcha from settings #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6347bd7
Feature - Test captcha from captcha settings
salimshrestha98 Sep 6, 2023
4df80a1
Add - Cloudflare turnstile
salimshrestha98 Sep 6, 2023
4685c3e
Enhance - Notice messages
salimshrestha98 Sep 6, 2023
7249fda
Enhance - Make strings translatable
salimshrestha98 Sep 6, 2023
53a2e2d
Fix - Hide test captcha button on changes
salimshrestha98 Sep 19, 2023
c89b4f8
Tweak - Hide cloudflare turnstile test wrapper when Theme of cloudfla…
iamprazol Sep 27, 2023
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
35 changes: 35 additions & 0 deletions assets/css/settings.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,6 +1346,41 @@ body {
width: 30%;
}
}

#user_registration_captcha_setting_captcha_test {
.spinner {
visibility: visible !important;
}
}

#ur-captcha-test-container {
min-width: 512px;
display: block;

#ur-captcha-notice {
padding: 8px;
margin: 2px;
border-radius: 4px;
border-width: 0px !important;

&.success {
background: rgba(0,255,0,0.3);

#ur-captcha-notice--icon {
color: green;
}
}

&.error {
background: rgba(255,0,0,0.3);

#ur-captcha-notice--icon {
color: red;
}
}
}
}

}
}

Expand Down
209 changes: 191 additions & 18 deletions assets/js/admin/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,17 +226,17 @@
)
.closest(".user-registration-global-settings")
.hide();
$("#user_registration_captcha_setting_recaptcha_site_key_cloudflare")
$(
"#user_registration_captcha_setting_recaptcha_site_key_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
"#user_registration_captcha_setting_recaptcha_site_secret_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
"#user_registration_captcha_setting_recaptcha_cloudflare_theme"
)
$("#user_registration_captcha_setting_recaptcha_cloudflare_theme")
.closest(".user-registration-global-settings")
.hide();
} else if (value == "hCaptcha") {
Expand Down Expand Up @@ -274,34 +274,34 @@
$("#user_registration_captcha_setting_invisible_recaptcha_v2")
.closest(".user-registration-global-settings")
.hide();
$("#user_registration_captcha_setting_recaptcha_site_key_cloudflare")
$(
"#user_registration_captcha_setting_recaptcha_site_key_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
"#user_registration_captcha_setting_recaptcha_site_secret_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
"#user_registration_captcha_setting_recaptcha_cloudflare_theme"
)
$("#user_registration_captcha_setting_recaptcha_cloudflare_theme")
.closest(".user-registration-global-settings")
.hide();
} else if (value == "cloudflare") {
$("#user_registration_captcha_setting_recaptcha_site_key_cloudflare")
$(
"#user_registration_captcha_setting_recaptcha_site_key_cloudflare"
)
.closest(".user-registration-global-settings")
.show();
$(
"#user_registration_captcha_setting_recaptcha_site_secret_cloudflare"
)
.closest(".user-registration-global-settings")
.show();
$(
"#user_registration_captcha_setting_recaptcha_cloudflare_theme"
)
$("#user_registration_captcha_setting_recaptcha_cloudflare_theme")
.closest(".user-registration-global-settings")
.show();
$("#user_registration_captcha_setting_recaptcha_site_key_hcaptcha")
$("#user_registration_captcha_setting_recaptcha_site_key_hcaptcha")
.closest(".user-registration-global-settings")
.hide();
$(
Expand Down Expand Up @@ -354,7 +354,9 @@
$("#user_registration_captcha_setting_recaptcha_site_secret")
.closest(".user-registration-global-settings")
.hide();
$("#user_registration_captcha_setting_recaptcha_site_key_cloudflare")
$(
"#user_registration_captcha_setting_recaptcha_site_key_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
Expand Down Expand Up @@ -414,24 +416,195 @@
$("#user_registration_captcha_setting_recaptcha_site_secret_v3")
.closest(".user-registration-global-settings")
.hide();
$("#user_registration_captcha_setting_recaptcha_site_key_cloudflare")
$(
"#user_registration_captcha_setting_recaptcha_site_key_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
"#user_registration_captcha_setting_recaptcha_site_secret_cloudflare"
)
.closest(".user-registration-global-settings")
.hide();
$(
"#user_registration_captcha_setting_recaptcha_cloudflare_theme"
)
$("#user_registration_captcha_setting_recaptcha_cloudflare_theme")
.closest(".user-registration-global-settings")
.hide();
$("#user_registration_captcha_setting_invisible_recaptcha_v2")
.closest(".user-registration-global-settings")
.show();
}
}

var captchaSettingsChanged = false;

$(".user-registration-global-settings")
.find("input, select")
.on("change", function () {
captchaSettingsChanged = true;
$("#user_registration_captcha_setting_captcha_test")
.parent()
.hide();
});

/**
* Test Captcha from settings page.
*/
$(".user-registration").on(
"click",
"#user_registration_captcha_setting_captcha_test",
function (e) {
e.preventDefault();
e.stopPropagation();

if (captchaSettingsChanged) {
alert(user_registration_settings_params.i18n.unsaved_changes);
return;
}

var spinner = $(
"#user_registration_captcha_setting_captcha_test .spinner"
);
spinner.show();

setTimeout(function () {
spinner.hide();
}, 2500);

var ur_recaptcha_node = $("#ur-captcha-node");
if (
"undefined" !== typeof ur_recaptcha_code &&
ur_recaptcha_code.site_key.length
) {
if (ur_recaptcha_node.length !== 0) {
switch (ur_recaptcha_code.version) {
case "v2":
google_recaptcha_login = grecaptcha.render(
ur_recaptcha_node
.find(".g-recaptcha")
.attr("id"),
{
sitekey: ur_recaptcha_code.site_key,
theme: "light",
style: "transform:scale(0.77);-webkit-transform:scale(0.77);transform-origin:0 0;-webkit-transform-origin:0 0;",
}
);

if (ur_recaptcha_code.is_invisible) {
grecaptcha
.execute(google_recaptcha_login)
.then(function (token) {
if (null !== token) {
display_captcha_test_status(
user_registration_settings_params
.i18n.captcha_failed,
"error"
);
return;
} else {
display_captcha_test_status(
user_registration_settings_params
.i18n.captcha_success,
"success"
);
}
});
}
break;

case "v3":
try {
grecaptcha
.execute(ur_recaptcha_code.site_key, {
action: "click",
})
.then(function (d) {
display_captcha_test_status(
user_registration_settings_params
.i18n.captcha_success,
"success"
);
});
} catch (err) {
display_captcha_test_status(
err.message,
"error"
);
}
break;

case "hCaptcha":
google_recaptcha_login = hcaptcha.render(
ur_recaptcha_node
.find(".g-recaptcha-hcaptcha")
.attr("id"),
{
sitekey: ur_recaptcha_code.site_key,
theme: "light",
style: "transform:scale(0.77);-webkit-transform:scale(0.77);transform-origin:0 0;-webkit-transform-origin:0 0;",
}
);
break;

case "cloudflare":
try {
turnstile.render(
"#" +
ur_recaptcha_node
.find(".cf-turnstile")
.attr("id"),
{
sitekey: ur_recaptcha_code.site_key,
theme: ur_recaptcha_code.theme_mode,
style: "transform:scale(0.77);-webkit-transform:scale(0.77);transform-origin:0 0;-webkit-transform-origin:0 0;",
}
);

ur_recaptcha_node
.find("iframe")
.css("display", "block");
} catch (err) {
display_captcha_test_status(
err.message,
"error"
);
}
break;
}
}
}
}
);

/**
*
* @param {string} notice Notice message.
* @param {string} type Notice type.
*/
function display_captcha_test_status(notice = "", type = "success") {
if (notice.length) {
var notice_container = $("#ur-captcha-notice");
var notice_icon = $("#ur-captcha-notice--icon");
var notice_text = $("#ur-captcha-notice--text");

if (notice_text.length) {
notice_text.html(notice);

if ("success" === type) {
notice_container.removeClass().addClass("success");
notice_icon.addClass("dashicons dashicons-yes-alt");
} else if ("error" === type) {
notice_container.removeClass().addClass("error");
notice_icon.addClass("dashicons dashicons-dismiss");
}
}
}

var spinner = $(
"#user_registration_captcha_setting_captcha_test .spinner"
);
spinner.hide();
}

$(".ur-redirect-to-login-page").ready(function () {
var $url = $(".ur-redirect-to-login-page"),
$check = $("#user_registration_login_options_prevent_core_login"),
Expand Down
30 changes: 30 additions & 0 deletions includes/admin/class-ur-admin-assets.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,36 @@ public function admin_scripts() {

wp_register_script( 'ur-live-user-notice', UR()->plugin_url() . '/assets/js/admin/live-user-notice' . $suffix . '.js', array( 'jquery', 'heartbeat' ), UR_VERSION, false );
wp_enqueue_script( 'ur-live-user-notice' );

wp_register_script(
'ur-google-recaptcha',
'https://www.google.com/recaptcha/api.js?onload=onloadURCallback&render=explicit',
array(),
'2.0.0',
);

$recaptcha_site_key_v3 = get_option( 'user_registration_captcha_setting_recaptcha_site_key_v3' );

wp_register_script(
'ur-google-recaptcha-v3',
'https://www.google.com/recaptcha/api.js?render=' . $recaptcha_site_key_v3,
array(),
'3.0.0',
);

wp_register_script(
'ur-recaptcha-hcaptcha',
'https://hcaptcha.com/1/api.js?onload=onloadURCallback&render=explicit',
array(),
UR_VERSION,
);

wp_register_script(
'ur-recaptcha-cloudflare',
'https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit&onload=onloadURCallback',
array(),
UR_VERSION,
);
}

/**
Expand Down
5 changes: 5 additions & 0 deletions includes/admin/class-ur-admin-settings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,11 @@ public static function output() {
'ajax_url' => admin_url( 'admin-ajax.php' ),
'user_registration_search_global_settings_nonce' => wp_create_nonce( 'user_registration_search_global_settings' ),
'i18n_nav_warning' => esc_html__( 'The changes you made will be lost if you navigate away from this page.', 'user-registration' ),
'i18n' => array(
'captcha_success' => esc_html__( 'Captcha Test Successful !', 'user-registration' ),
'captcha_failed' => esc_html__( 'Some error occured. Please verify that the keys you entered are valid.', 'user-registration' ),
'unsaved_changes' => esc_html__( 'You have some unsaved changes. Please save and try again.', 'user-registration' ),
),
)
);

Expand Down
Loading
Loading