Hello Altcha

Co-authored-by: tobihagemann <[email protected]>

Author: SailReal

assets/js/cardpayments.js

@@ -1,20 +1,14 @@
 "use strict";
 
-const STRIPE_PK = 'pk_live_eSasX216vGvC26GdbVwA011V';
-const STRIPE_PLANS = {'EUR': 'plan_GgW4ovr7c6upzx', 'USD': 'plan_GejOEdJtfL3kdH'}; // live
-const STRIPE_PHP_URL = 'https://api.cryptomator.org/stripe/prepare_payment.php';
-
-//const STRIPE_PK = 'pk_test_JhF3MoFQGw2Is0DB3BSv345P';
-//const STRIPE_PLANS = {'EUR': 'plan_GgVY2JfD49bc02', 'USD': 'plan_GgVZwj545E0uH3'}; // test
-//const STRIPE_PHP_URL = 'http://localhost/stripe/prepare_payment.php';
+// requires store.js
 
 class OneTimePayment {
 
   /**
    * Initializes the one-time payments helper and stores a references to the status object that can be observed by AlpineJS
    * @param {Object} status 
    * @param {boolean} status.validCardNum Whether the Stripe input field considers the credit card number valid
-   * @param {string} status.captcha The captcha (if reCAPTCHA validation finished) or null
+   * @param {string} status.captcha The captcha (if captcha validation finished) or null
    * @param {string} status.errorMessage An error message or null
    * @param {boolean} status.inProgress Whether an async payment task is currently running
    * @param {boolean} status.success Whether the payment succeeded
@@ -127,21 +121,13 @@ class OneTimePayment {
     this._status.success = false;
     this._status.errorMessage = error.message;
     this._status.inProgress = false;
-    if (grecaptcha) {
-      this._status.captcha = '';
-      grecaptcha.reset();
-    }
   }
 
   onPaymentSucceeded() {
     console.info('Stripe payment succeeded!');
     this._status.success = true;
     this._status.errorMessage = '';
     this._status.inProgress = false;
-    if (grecaptcha) {
-      this._status.captcha = '';
-      grecaptcha.reset();
-    }
   }
 
 }

assets/js/recaptcha.js

@@ -8,3 +8,6 @@ const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = 23141;
 const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = 42235;
 const PADDLE_PRICES_URL = 'https://sandbox-checkout.paddle.com/api/2.0/prices';
 const STORE_API_URL = 'http://localhost:8787/api';
+const STRIPE_PK = 'pk_test_JhF3MoFQGw2Is0DB3BSv345P';
+const STRIPE_PLANS = {'EUR': 'plan_GgVY2JfD49bc02', 'USD': 'plan_GgVZwj545E0uH3'};
+const STRIPE_PHP_URL = 'http://localhost/stripe/prepare_payment.php';

assets/js/store.dev.js

@@ -8,3 +8,6 @@ const PADDLE_HUB_SELF_HOSTED_SUBSCRIPTION_PLAN_ID = 770132;
 const PADDLE_HUB_MANAGED_SUBSCRIPTION_PLAN_ID = 807339;
 const PADDLE_PRICES_URL = 'https://checkout.paddle.com/api/2.0/prices';
 const STORE_API_URL = 'https://store.cryptomator.org/api';
+const STRIPE_PK = 'pk_live_eSasX216vGvC26GdbVwA011V';
+const STRIPE_PLANS = {'EUR': 'plan_GgW4ovr7c6upzx', 'USD': 'plan_GejOEdJtfL3kdH'};
+const STRIPE_PHP_URL = 'https://api.cryptomator.org/stripe/prepare_payment.php';

assets/js/store.prod.js

@@ -57,6 +57,10 @@ enableemoji = true
     source = "node_modules/js-yaml/dist"
     target = "assets/js/js-yaml"
 
+  [[module.mounts]]
+    source = "node_modules/altcha/dist_external"
+    target = "assets/js/altcha"
+
 [markup.goldmark.renderer]
 unsafe = true
 
@@ -121,6 +125,6 @@ block = true
   [[server.headers]]
       for = '/**'
       [server.headers.values]
-        Content-Security-Policy = "default-src 'none'; script-src 'self' 'unsafe-eval' https://umami.skymatic.de/ https://plausible.skymatic.de/ https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/ https://www.google.com/ https://www.gstatic.com/; style-src 'self' 'unsafe-inline' https://*.paddle.com/; img-src 'self' data: https://static.cryptomator.org/ https://*.paddle.com/ https://paddle.s3.amazonaws.com/; connect-src 'self' https://api.cryptomator.org/ https://store.cryptomator.org/ https://umami.skymatic.de/ https://plausible.skymatic.de/ http://localhost:8787/; font-src 'self'; media-src https://static.cryptomator.org/; frame-src https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/ https://www.google.com/; base-uri 'self'; form-action 'self' https://www.paypal.com/ https://www.coinpayments.net/; frame-ancestors 'none'"
+        Content-Security-Policy = "default-src 'none'; script-src 'self' 'unsafe-eval' https://umami.skymatic.de/ https://plausible.skymatic.de/ https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; style-src 'self' 'unsafe-inline' https://*.paddle.com/; img-src 'self' data: https://static.cryptomator.org/ https://*.paddle.com/ https://paddle.s3.amazonaws.com/; connect-src 'self' https://api.cryptomator.org/ https://store.cryptomator.org/ https://umami.skymatic.de/ https://plausible.skymatic.de/ http://localhost:8787/ http://localhost/; font-src 'self'; media-src https://static.cryptomator.org/; frame-src https://community.cryptomator.org/ https://js.stripe.com/ https://*.paddle.com/; base-uri 'self'; form-action 'self' https://www.paypal.com/ https://www.coinpayments.net/; frame-ancestors 'none';"
         Strict-Transport-Security = "max-age=31536000; includeSubDomains"
         X-Content-Type-Options = "nosniff"

hugo.toml

@@ -135,8 +135,6 @@
   translation: "Kreditkartenzahlungen werden über Stripe abgewickelt. Wir können dabei weder deine Kartennummer noch die Prüfziffer einsehen. In deiner Abrechnung wird <a class=\"text-link\" href=\"https://support.stripe.com/questions/unknown-charge-on-card-from-stripe\" target=\"_blank\" rel=\"noopener\">eine Buchung von Stripe</a> enthalten sein."
 - id: donate_creditcard_once_loading
   translation: "Lädt…"
-- id: donate_creditcard_once_loadcaptcha
-  translation: "Weiter…"
 - id: donate_creditcard_once_paynow
   translation: "Jetzt bezahlen"
 - id: donate_creditcard_once_success
@@ -447,8 +445,6 @@
   translation: "Um auf deine Abonnement-Informationen zuzugreifen, wird ein Bestätigungslink an die E-Mail-Adresse gesendet, die du für den Kauf verwendet hast."
 - id: hub_billing_createsession_success_description
   translation: "Bitte überprüfe deine E-Mails auf den Link zur Verwaltung deines Hub-Abonnements."
-- id: hub_billing_createsession_loadcaptcha
-  translation: "Weiter…"
 - id: hub_billing_createsession_submit
   translation: "Zugang anfordern"
 
@@ -586,8 +582,6 @@
 
 - id: hub_demo_instruction
   translation: "Demo-Instanzen werden automatisch erstellt. Es gibt eine begrenzte Anzahl von Demo-Instanzen. Alle Demo-Instanzen werden um 00:00 UTC zurückgesetzt."
-- id: hub_demo_loadcaptcha
-  translation: "Weiter…"
 - id: hub_demo_submit
   translation: "Demo ausprobieren"
 - id: hub_demo_success_title
@@ -928,8 +922,6 @@
   translation: "E-Mail"
 - id: supporter_cert_common_email_placeholder
   translation: "E-Mail-Adresse"
-- id: supporter_cert_common_loadcaptcha
-  translation: "Weiter…"
 - id: supporter_cert_common_submit
   translation: "Anfrage senden"
 - id: supporter_cert_common_success_title
@@ -995,3 +987,17 @@
   translation: "Wir haben dir die Details zu deinen vergangenen Transaktionen und Lizenzen per E-Mail zugesandt."
 - id: supporter_cert_recovery_contact_us
   translation: "Wenn du keine E-Mail bekommen hast, <a class=\"text-link\" href=\"mailto:[email protected]\">kontaktiere uns</a>."
+
+# Altcha
+- id: altcha_label
+  translation: "Ich bin kein Bot"
+- id: altcha_error
+  translation: "Verifizierung fehlgeschlagen. Versuche es später erneut."
+- id: altcha_expired
+  translation: "Verifizierung abgelaufen. Bitte erneut versuchen."
+- id: altcha_verified
+  translation: "Verifiziert!"
+- id: altcha_verifying
+  translation: "Verifizierung läuft…"
+- id: altcha_waitAlert
+  translation: "Verifizierung läuft… bitte warten."

i18n/de.yaml

@@ -135,8 +135,6 @@
   translation: "Credit card payments are securely handled by Stripe. We will not be able to see your card number or CVC. Please expect to be <a class=\"text-link\" href=\"https://support.stripe.com/questions/unknown-charge-on-card-from-stripe\" target=\"_blank\" rel=\"noopener\">charged by Stripe</a>."
 - id: donate_creditcard_once_loading
   translation: "Loading…"
-- id: donate_creditcard_once_loadcaptcha
-  translation: "Continue…"
 - id: donate_creditcard_once_paynow
   translation: "Pay Now"
 - id: donate_creditcard_once_success
@@ -447,8 +445,6 @@
   translation: "To access your subscription information, a confirmation link will be sent to the email you used to make your purchase."
 - id: hub_billing_createsession_success_description
   translation: "Please check your email for the link to manage your Hub subscription."
-- id: hub_billing_createsession_loadcaptcha
-  translation: "Continue…"
 - id: hub_billing_createsession_submit
   translation: "Request Access"
 
@@ -586,8 +582,6 @@
 
 - id: hub_demo_instruction
   translation: "Demo instances are created automatically. There are a limited number of demo instances available. All demo instances are reset at 00:00 UTC."
-- id: hub_demo_loadcaptcha
-  translation: "Continue…"
 - id: hub_demo_submit
   translation: "Try Demo"
 - id: hub_demo_success_title
@@ -928,8 +922,6 @@
   translation: "Email"
 - id: supporter_cert_common_email_placeholder
   translation: "Email address"
-- id: supporter_cert_common_loadcaptcha
-  translation: "Continue…"
 - id: supporter_cert_common_submit
   translation: "Send Request"
 - id: supporter_cert_common_success_title
@@ -995,3 +987,17 @@
   translation: "We've sent details of your past transactions and licenses to you via email."
 - id: supporter_cert_recovery_contact_us
   translation: "If you didn't get an email, <a class=\"text-link\" href=\"mailto:[email protected]\">contact us</a>."
+
+# Altcha
+- id: altcha_label
+  translation: "I\\'m not a bot"
+- id: altcha_error
+  translation: "Verification failed. Try again later."
+- id: altcha_expired
+  translation: "Verification expired. Try again."
+- id: altcha_verified
+  translation: "Verified!"
+- id: altcha_verifying
+  translation: "Verifying…"
+- id: altcha_waitAlert
+  translation: "Verifying… please wait."

i18n/en.yaml

@@ -70,17 +70,25 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">{{ i18n "dona
 {{ end }}
 {{ define "script" }}
   {{ if hugo.IsDevelopment }}
+    {{ $storeJs := resources.Get "js/store.dev.js" | resources.ExecuteAsTemplate "js/store.js" . }}
+    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
     {{ $customerPortalJs := resources.Get "js/customerportal.js" }}
     <script type="text/javascript" src="{{ $customerPortalJs.RelPermalink }}" defer></script>
-    {{ $recaptchaJs := resources.Get "js/recaptcha.js" }}
-    <script type="text/javascript" src="{{ $recaptchaJs.RelPermalink }}" defer></script>
+    {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
+    <script type="module" type="text/javascript" src="{{ $altchaJs.RelPermalink }}" defer></script>
+    {{ $altchaWorkerJs := resources.Get "js/altcha/worker.js" }}
+    <script type="module" type="text/javascript" src="{{ $altchaWorkerJs.RelPermalink }}" defer></script>
     {{ $cardPaymentsJs := resources.Get "js/cardpayments.js" }}
     <script type="text/javascript" src="{{ $cardPaymentsJs.RelPermalink }}" defer></script>
   {{ else }}
+    {{ $storeJs := resources.Get "js/store.prod.js" | resources.ExecuteAsTemplate "js/store.js" . | minify | fingerprint }}
+    <script type="text/javascript" src="{{ $storeJs.RelPermalink }}" integrity="{{ $storeJs.Data.Integrity }}" defer></script>
     {{ $customerPortalJs := resources.Get "js/customerportal.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $customerPortalJs.RelPermalink }}" integrity="{{ $customerPortalJs.Data.Integrity }}" defer></script>
-    {{ $recaptchaJs := resources.Get "js/recaptcha.js" | minify | fingerprint }}
-    <script type="text/javascript" src="{{ $recaptchaJs.RelPermalink }}" integrity="{{ $recaptchaJs.Data.Integrity }}" defer></script>
+    {{ $altchaJs := resources.Get "js/altcha/altcha.js" }}
+    <script type="module" type="text/javascript" src="{{ $altchaJs.RelPermalink }}" integrity="{{ $altchaJs.Data.Integrity }}" defer></script>
+    {{ $altchaWorkerJs := resources.Get "js/altcha/worker.js" }}
+    <script type="module" type="text/javascript" src="{{ $altchaWorkerJs.RelPermalink }}" integrity="{{ $altchaWorkerJs.Data.Integrity }}" defer></script>
     {{ $cardPaymentsJs := resources.Get "js/cardpayments.js" | minify | fingerprint }}
     <script type="text/javascript" src="{{ $cardPaymentsJs.RelPermalink }}" integrity="{{ $cardPaymentsJs.Data.Integrity }}" defer></script>
   {{ end }}