Changeset 3056649 for jetpack/trunk/extensions/blocks/premium-content/_inc/subscription-service/class-abstract-token-subscription-service.php

Timestamp:

03/22/2024 09:30:19 AM (4 months ago)

Author:

zinigor

Message:

Updating trunk to version 13.2.2

File:

• jetpack/trunk/extensions/blocks/premium-content/_inc/subscription-service/class-abstract-token-subscription-service.php (modified) (4 diffs)

jetpack/trunk/extensions/blocks/premium-content/_inc/subscription-service/class-abstract-token-subscription-service.php

@@ -29 +29 @@
     const POST_ACCESS_LEVEL_PAID_SUBSCRIBERS           = 'paid_subscribers';
     const POST_ACCESS_LEVEL_PAID_SUBSCRIBERS_ALL_TIERS = 'paid_subscribers_all_tiers';
-
-    /**
-     * An optional user_id to query against (omitting this will use either the token or current user id)
-     *
-     * @var int|null
-     */
-    protected $user_id = null;
-
-    /**
-     * Constructor
-     *
-     * @param int|null $user_id An optional user_id to query subscriptions against. Uses token from request/cookie or logged-in user information if omitted.
-     */
-    public function __construct( $user_id = null ) {
-        $this->user_id = $user_id;
-    }
 
     /**
@@ -461 +445 @@
 
         if ( ! empty( $token ) && false === headers_sent() ) {
-            // phpcs:ignore Jetpack.Functions.SetCookie.FoundNonHTTPOnlyFalse
-            setcookie( self::JWT_AUTH_TOKEN_COOKIE_NAME, $token, strtotime( '+1 month' ), '/', COOKIE_DOMAIN, is_ssl(), false );
+            setcookie( self::JWT_AUTH_TOKEN_COOKIE_NAME, $token, 0, '/', COOKIE_DOMAIN, is_ssl(), true ); // httponly -- used by visitor_can_view_content() within the PHP context.
         }
     }
@@ -469 +452 @@
      * Clear the auth cookie.
      *
-     * @param string $cookie_domain Domain to remove cookie from.
-     *
      * @return void
      */
-    public static function clear_token_cookie( $cookie_domain = '' ) {
+    public static function clear_token_cookie() {
         if ( defined( 'TESTING_IN_JETPACK' ) && TESTING_IN_JETPACK ) {
             return;
@@ -480 +461 @@
         if ( self::has_token_from_cookie() ) {
             unset( $_COOKIE[ self::JWT_AUTH_TOKEN_COOKIE_NAME ] );
-            setcookie( self::JWT_AUTH_TOKEN_COOKIE_NAME, '', 1, '/', COOKIE_DOMAIN, is_ssl(), true );
-
-            if ( ! empty( $cookie_domain ) ) {
-                setcookie( self::JWT_AUTH_TOKEN_COOKIE_NAME, '', 1, '/', $cookie_domain, is_ssl(), true );
-            }
+            setcookie( self::JWT_AUTH_TOKEN_COOKIE_NAME, '', time() - DAY_IN_SECONDS, '/', COOKIE_DOMAIN, is_ssl(), true );
         }
     }