Merge branch 'paywall-clientside'

admin/tulo-payway-paywall-settings.php

@@ -16,6 +16,7 @@
 if(isset($_POST['action']) && $_POST['action'] == 'update')
 {
     update_option('tulo_paywall_enabled', isset($_POST["tulo_paywall_enabled"]) ? "on" : "" );
+    update_option('tulo_paywall_clientside_enabled', isset($_POST["tulo_paywall_clientside_enabled"]) ? "on" : "" );
     update_option('tulo_paywall_error_header', $_POST["tulo_paywall_error_header"]);
     update_option('tulo_paywall_error_message', $_POST["tulo_paywall_error_message"]);
     //update_option('tulo_paywall_error_function', $_POST["tulo_paywall_error_function"]);
@@ -175,6 +176,7 @@ function tulo_server_render_custom_variables()
 
         <?php
             tulo_server_render_bool_option_setting(__("Tulo Paywall enabled", "tulo"), "tulo_paywall_enabled");
+            tulo_server_render_bool_option_setting(__("Client-side rendering enabled", "tulo"), "tulo_paywall_clientside_enabled", __("Check to render Paywall clientside to prevent signature caching issues.", "tulo"));
             tulo_server_render_text_option_setting(__("API Client id", "tulo"), "tulo_paywall_client_id", __("Paywall API user client id", "tulo"));
             tulo_server_render_text_option_setting(__("API Secret", "tulo"), "tulo_paywall_secret", __("Paywall API user secret", "tulo"));
         ?>

includes/class-tulo-payway-common.php

@@ -21,7 +21,7 @@ class Tulo_Payway_Server_Common {
     public function __construct() {
     }
 
-    public function get_tulo_myaccount_url() {
+    public static function get_tulo_myaccount_url() {
         $url = "";
         $currentOrg = get_option('tulo_organisation_id');
         if (get_option('tulo_environment') == 'prod') {

includes/class-tulo-payway.php

@@ -257,6 +257,8 @@ private function define_public_hooks() {
           $this->loader->add_action( 'wp_ajax_tulo_login', $plugin_public, 'ajax_login', 1 );
           $this->loader->add_action( 'wp_ajax_nopriv_tulo_logout', $plugin_public, 'ajax_logout', 1 );
           $this->loader->add_action( 'wp_ajax_tulo_logout', $plugin_public, 'ajax_logout', 1 );
+          $this->loader->add_action( 'wp_ajax_nopriv_tulo_pw_signature', $plugin_public, 'ajax_paywall_jwt', 1 );
+          $this->loader->add_action( 'wp_ajax_tulo_pw_signature', $plugin_public, 'ajax_paywall_jwt', 1 );
 
      }
 

lang/tulo-en_US.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tulo Payway\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-07 16:49+0200\n"
-"PO-Revision-Date: 2024-05-07 16:49+0200\n"
+"POT-Creation-Date: 2024-05-22 13:46+0200\n"
+"PO-Revision-Date: 2024-05-22 13:46+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: sv\n"
@@ -25,33 +25,33 @@ msgstr ""
 msgid "Tulo Payway restrictions"
 msgstr "Tulo Payway restrictions"
 
-#: admin/tulo-payway-paywall-settings.php:50
+#: admin/tulo-payway-paywall-settings.php:51
 msgid "Spinner html"
 msgstr "Spinner html"
 
-#: admin/tulo-payway-paywall-settings.php:51
+#: admin/tulo-payway-paywall-settings.php:52
 msgid "HTML shown when paywall is loading."
 msgstr ""
 "HTML shown when the paywall is loading, if left empty standard Tulo Paywall "
 "spinner will be shown."
 
-#: admin/tulo-payway-paywall-settings.php:136
+#: admin/tulo-payway-paywall-settings.php:137
 msgid "Variable key"
 msgstr "Key"
 
-#: admin/tulo-payway-paywall-settings.php:141
+#: admin/tulo-payway-paywall-settings.php:142
 msgid "Variable value"
 msgstr "Value"
 
-#: admin/tulo-payway-paywall-settings.php:143
+#: admin/tulo-payway-paywall-settings.php:144
 msgid "Variable delete"
 msgstr "Delete"
 
-#: admin/tulo-payway-paywall-settings.php:149
+#: admin/tulo-payway-paywall-settings.php:150
 msgid "Add variable"
 msgstr "Add variable"
 
-#: admin/tulo-payway-paywall-settings.php:155
+#: admin/tulo-payway-paywall-settings.php:156
 #, fuzzy
 #| msgid "Tulo Paywall custom variables."
 msgid "Tulo Paywall custom variable."
@@ -60,53 +60,57 @@ msgstr ""
 "paywall-js/1-1/#support-for-custom-variables”>Read more about custom "
 "variables</a>."
 
-#: admin/tulo-payway-paywall-settings.php:168
+#: admin/tulo-payway-paywall-settings.php:169
 msgid "Tulo Paywall settings"
 msgstr "Tulo Paywall settings"
 
-#: admin/tulo-payway-paywall-settings.php:173
+#: admin/tulo-payway-paywall-settings.php:174
 msgid "Paywall basic settings"
 msgstr "Basic settings"
 
-#: admin/tulo-payway-paywall-settings.php:177
+#: admin/tulo-payway-paywall-settings.php:178
 msgid "Tulo Paywall enabled"
 msgstr "Tulo Paywall enabled"
 
-#: admin/tulo-payway-paywall-settings.php:178
+#: admin/tulo-payway-paywall-settings.php:179
+msgid "Client-side rendering enabled"
+msgstr "Client-side rendering enabled"
+
+#: admin/tulo-payway-paywall-settings.php:180
 #: admin/tulo-payway-server-settings.php:281
 msgid "API Client id"
 msgstr "API Client-ID"
 
-#: admin/tulo-payway-paywall-settings.php:178
+#: admin/tulo-payway-paywall-settings.php:180
 msgid "Paywall API user client id"
 msgstr "Paywall API user client id"
 
-#: admin/tulo-payway-paywall-settings.php:179
+#: admin/tulo-payway-paywall-settings.php:181
 #: admin/tulo-payway-server-settings.php:282
 msgid "API Secret"
 msgstr "API Secret"
 
-#: admin/tulo-payway-paywall-settings.php:179
+#: admin/tulo-payway-paywall-settings.php:181
 msgid "Paywall API user secret"
 msgstr "Paywall API user secret"
 
-#: admin/tulo-payway-paywall-settings.php:183
+#: admin/tulo-payway-paywall-settings.php:185
 msgid "Paywall selection settings"
 msgstr "Paywall selection settings"
 
-#: admin/tulo-payway-paywall-settings.php:187
+#: admin/tulo-payway-paywall-settings.php:189
 msgid "Tulo Paywall title"
 msgstr "Tulo Paywall title"
 
-#: admin/tulo-payway-paywall-settings.php:187
+#: admin/tulo-payway-paywall-settings.php:189
 msgid "Tulo Payway title code where Paywall is configured"
 msgstr "Tulo Payway title code where Paywall is configured"
 
-#: admin/tulo-payway-paywall-settings.php:188
+#: admin/tulo-payway-paywall-settings.php:190
 msgid "Tulo Paywall Static Selector Key"
 msgstr "Static Paywall key"
 
-#: admin/tulo-payway-paywall-settings.php:188
+#: admin/tulo-payway-paywall-settings.php:190
 msgid ""
 "If there are more than one Paywall active in Tulo, this static key will "
 "select which Paywall to select for presentation. If static and dynamic keys "
@@ -116,144 +120,144 @@ msgstr ""
 "select which Paywall to select for presentation. If static and dynamic keys "
 "are left blank, Tulo will display the first Paywall created."
 
-#: admin/tulo-payway-paywall-settings.php:189
+#: admin/tulo-payway-paywall-settings.php:191
 msgid "Tulo Paywall Dynamic Selector Key"
 msgstr "Dynamic Paywall key"
 
-#: admin/tulo-payway-paywall-settings.php:189
+#: admin/tulo-payway-paywall-settings.php:191
 msgid ""
 "Enter the name of a session variable that holds the Paywall selection key, "
 "if no value is defined on the session variable, the static key will be used."
 msgstr ""
 "Enter the name of a session variable that holds the Paywall selection key, "
 "if no value is defined on the session variable, the static key will be used."
 
-#: admin/tulo-payway-paywall-settings.php:190
+#: admin/tulo-payway-paywall-settings.php:192
 msgid "Tulo Paywall Product Selector Key"
 msgstr "Product Paywall key"
 
-#: admin/tulo-payway-paywall-settings.php:190
+#: admin/tulo-payway-paywall-settings.php:192
 msgid ""
 "Use the locked article's required product code as selector, must map to a "
 "Paywall with matching key."
 msgstr ""
 "Use the locked article’s required product code as selector, must map to a "
 "Paywall with matching key."
 
-#: admin/tulo-payway-paywall-settings.php:196
+#: admin/tulo-payway-paywall-settings.php:198
 msgid "Paywall analytics settings"
 msgstr "Analytics settings"
 
-#: admin/tulo-payway-paywall-settings.php:200
+#: admin/tulo-payway-paywall-settings.php:202
 msgid "Tulo Paywall Traffic Source"
 msgstr "Tulo Paywall Traffic Source"
 
-#: admin/tulo-payway-paywall-settings.php:200
+#: admin/tulo-payway-paywall-settings.php:202
 msgid "Leave empty if no traffic source should be used (not recommended)."
 msgstr "Leave empty if no traffic source should be used (not recommended)."
 
-#: admin/tulo-payway-paywall-settings.php:201
+#: admin/tulo-payway-paywall-settings.php:203
 msgid "Tulo Paywall Merchant Reference (static)"
 msgstr "Tulo Paywall Merchant Reference (static)"
 
-#: admin/tulo-payway-paywall-settings.php:201
+#: admin/tulo-payway-paywall-settings.php:203
 msgid ""
 "Leave empty if no merchant reference should be used or if inferred from "
 "article link."
 msgstr ""
 "Leave empty if no merchant reference should be used or if inferred from "
 "article link."
 
-#: admin/tulo-payway-paywall-settings.php:202
+#: admin/tulo-payway-paywall-settings.php:204
 msgid "Tulo Paywall Merchant Reference from link"
 msgstr "Tulo Paywall Merchant Reference from link"
 
-#: admin/tulo-payway-paywall-settings.php:202
+#: admin/tulo-payway-paywall-settings.php:204
 msgid "Get merchant reference from current article link"
 msgstr "Get merchant reference from current article link"
 
-#: admin/tulo-payway-paywall-settings.php:203
+#: admin/tulo-payway-paywall-settings.php:205
 msgid "Tulo Paywall Account Origin"
 msgstr "Account Origin"
 
-#: admin/tulo-payway-paywall-settings.php:203
+#: admin/tulo-payway-paywall-settings.php:205
 msgid "New accounts will be created with this account origin"
 msgstr "New accounts will be created with this account origin"
 
-#: admin/tulo-payway-paywall-settings.php:208
+#: admin/tulo-payway-paywall-settings.php:210
 msgid "Paywall look and feel settings"
 msgstr "Look and feel"
 
-#: admin/tulo-payway-paywall-settings.php:213
+#: admin/tulo-payway-paywall-settings.php:215
 msgid "Tulo Paywall CSS enabled"
 msgstr "Tulo Paywall CSS enabled"
 
-#: admin/tulo-payway-paywall-settings.php:213
+#: admin/tulo-payway-paywall-settings.php:215
 msgid "Check to include Tulo CSS for the paywall"
 msgstr "Check to include Tulo CSS for the paywall"
 
-#: admin/tulo-payway-paywall-settings.php:219
+#: admin/tulo-payway-paywall-settings.php:221
 msgid "Paywall error handling settings"
 msgstr "Error handling settings"
 
-#: admin/tulo-payway-paywall-settings.php:223
+#: admin/tulo-payway-paywall-settings.php:225
 msgid "Tulo Paywall Error header"
 msgstr "Error header text"
 
-#: admin/tulo-payway-paywall-settings.php:223
+#: admin/tulo-payway-paywall-settings.php:225
 msgid "Error header text shown when the paywall cannot be loaded"
 msgstr "Error header text shown when the paywall cannot be loaded"
 
-#: admin/tulo-payway-paywall-settings.php:224
+#: admin/tulo-payway-paywall-settings.php:226
 msgid "Tulo Paywall Error description"
 msgstr "Error description"
 
-#: admin/tulo-payway-paywall-settings.php:224
+#: admin/tulo-payway-paywall-settings.php:226
 msgid "Error description text shown when the paywall cannot be loaded"
 msgstr "Error description text shown when the paywall cannot be loaded"
 
-#: admin/tulo-payway-paywall-settings.php:229
+#: admin/tulo-payway-paywall-settings.php:231
 msgid "Tulo Paywall error handling."
 msgstr ""
 "If no specific error settings are defined, default values apply. <a "
 "href=“https://docs.worldoftulo.com/paywall/integration/plug-and-play/paywall-"
 "js/1-2/#error-handling”>Read more about error handling</a>."
 
-#: admin/tulo-payway-paywall-settings.php:234
+#: admin/tulo-payway-paywall-settings.php:236
 msgid "Paywall other settings"
 msgstr "Other settings"
 
-#: admin/tulo-payway-paywall-settings.php:238
+#: admin/tulo-payway-paywall-settings.php:240
 msgid "Tulo Paywall Login Url"
 msgstr "Login Url"
 
-#: admin/tulo-payway-paywall-settings.php:238
+#: admin/tulo-payway-paywall-settings.php:240
 msgid "Login URL that can be used in the Paywall template"
 msgstr ""
 "Enter URL used for logging in on the site, if left empty the standard Tulo "
 "login url will be used"
 
-#: admin/tulo-payway-paywall-settings.php:239
+#: admin/tulo-payway-paywall-settings.php:241
 msgid "Tulo Paywall Shop Url"
 msgstr "Shop Url"
 
-#: admin/tulo-payway-paywall-settings.php:239
+#: admin/tulo-payway-paywall-settings.php:241
 msgid "Shop URL that can be used in the Paywall template"
 msgstr "Enter URL for the shop you wish to display in the Paywall"
 
-#: admin/tulo-payway-paywall-settings.php:240
+#: admin/tulo-payway-paywall-settings.php:242
 msgid "Javascript debug enabled"
 msgstr "Javascript debug enabled"
 
-#: admin/tulo-payway-paywall-settings.php:240
+#: admin/tulo-payway-paywall-settings.php:242
 msgid "Check to see extra debug statements in the Javascript console"
 msgstr "Check to see extra debug statements in the Javascript console"
 
-#: admin/tulo-payway-paywall-settings.php:244
+#: admin/tulo-payway-paywall-settings.php:246
 msgid "Paywall custom variables"
 msgstr "Custom variables"
 
-#: admin/tulo-payway-paywall-settings.php:256
+#: admin/tulo-payway-paywall-settings.php:258
 #: admin/tulo-payway-server-settings.php:315
 msgid "Save Changes"
 msgstr "Save Changes"
@@ -438,11 +442,11 @@ msgstr "Wrong username or password. (%s attempts left)"
 msgid "Visitor is logged in"
 msgstr "Visitor must be logged in"
 
-#: public/class-tulo-payway-public.php:385
+#: public/class-tulo-payway-public.php:396
 msgid "Loading paywall..."
 msgstr "Loading..."
 
-#: public/class-tulo-payway-public.php:482
+#: public/class-tulo-payway-public.php:525
 msgid "Buy"
 msgstr "Buy"