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

Bring staging up to date with main #1572

Merged
merged 2 commits into from
Dec 12, 2024
+11 −6
Merged

Bring staging up to date with main #1572

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
975afbd
Only change protocol on http https
forgetso Dec 12, 2024
5c46ecd
Only change image protocol on http https (#1571)
forgetso Dec 12, 2024
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
17 changes: 11 additions & 6 deletions packages/procaptcha/src/modules/ProsopoCaptchaApi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,17 @@ export class ProsopoCaptchaApi implements ProcaptchaApiInterface {
}

// convert https/http to match page
for (const captcha of captchaChallenge.captchas) {
for (const item of captcha.items) {
if (item.data) {
// drop the 'http(s):' prefix, leaving '//'. The '//' will autodetect http/https from the page load type
// https://stackoverflow.com/a/18320348/7215926
item.data = item.data.replace(/^http(s)*:\/\//, "//");
if (
window.location.protocol === "https:" ||
window.location.protocol === "http:"
) {
for (const captcha of captchaChallenge.captchas) {
for (const item of captcha.items) {
if (item.data) {
// drop the 'http(s):' prefix, leaving '//'. The '//' will autodetect http/https from the page load type
// https://stackoverflow.com/a/18320348/7215926
item.data = item.data.replace(/^http(s)*:\/\//, "//");
}
}
}
}
Expand Down
Loading