Update tpw_session_refresh

adeprimo · Jun 25, 2024 · aca1cdd · aca1cdd
1 parent bf81c73
commit aca1cdd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/includes/class-tulo-paywall.php b/includes/class-tulo-paywall.php
@@ -65,9 +65,9 @@ public function get_back_url() {
     public function get_return_url() {
         $currentUrl = $this->get_current_url();
         if (str_contains($currentUrl, "?")) {
-            $currentUrl .= "&tpw_session_refresh=1";
+            $currentUrl .= "&tpw_session_refresh=".time();
         } else {
-            $currentUrl .= "?tpw_session_refresh=1";
+            $currentUrl .= "?tpw_session_refresh=".time();
         }            
         return str_replace("http://", "https://", $currentUrl);
     }

diff --git a/includes/class-tulo-payway-common.php b/includes/class-tulo-payway-common.php
@@ -39,10 +39,10 @@ public function get_authentication_url() {
         $permalinkStructure = get_option( 'permalink_structure' );
         if ($permalinkStructure == "plain") {
             $queryVars = $wp->query_vars;
-            $queryVars['tpw_session_refresh'] = '1';
+            $queryVars['tpw_session_refresh'] = time();
             $currentUrl = add_query_arg( $queryVars, home_url( $wp->request ) );    
         } else {
-            $currentUrl .= "?tpw_session_refresh=1";
+            $currentUrl .= "?tpw_session_refresh=".time();
         } 
         $currentOrg = get_option('tulo_organisation_id');
         $authUrl = get_option('tulo_authentication_url');

diff --git a/public/class-tulo-payway-public.php b/public/class-tulo-payway-public.php
@@ -104,7 +104,7 @@ public function check_session($wp)
 
 
         if (strpos($_SERVER["REQUEST_URI"], "favicon") === false) {
-            if (get_query_var("tpw_session_refresh") == "1") {
+            if (get_query_var("tpw_session_refresh") != "") {
                 $this->common->write_log("!! forced session session refresh using query param");
                 $this->session->refresh();
                 $currentUrl = home_url( $wp->request );
@@ -114,6 +114,11 @@ public function check_session($wp)
                     unset($queryVars['tpw_session_refresh']);
                     $currentUrl = add_query_arg( $queryVars, home_url( $wp->request ) );
                 }
+                if (strpos($currentUrl, "?") === false) {
+                    $currentUrl .= "?tpw=".time();
+                } else {
+                    $currentUrl .= "&tpw=".time();
+                }
                 $this->common->write_log("!! session has been refreshed, redirecting to: ".$currentUrl);
                 header("Location: ".$currentUrl, true, 302);
                 die();