From cdbc456797dec24b4a7562b6fbf9101843548417 Mon Sep 17 00:00:00 2001 From: Guilherme Carreiro Date: Mon, 22 Apr 2024 13:19:32 +0200 Subject: [PATCH] Update proxy --- .../cli-ruby/lib/shopify_cli/theme/dev_server/proxy.rb | 5 +++-- .../assets/cli-ruby/lib/shopify_cli/theme/repl/api.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/dev_server/proxy.rb b/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/dev_server/proxy.rb index 9edafc23712..3966144882b 100644 --- a/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/dev_server/proxy.rb +++ b/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/dev_server/proxy.rb @@ -25,8 +25,9 @@ class DevServer ] class Proxy - SESSION_COOKIE_NAME = "_secure_session_id" - SESSION_COOKIE_REGEXP = /#{SESSION_COOKIE_NAME}=(\h+)/ + + SESSION_COOKIE_NAME = "_shopify_essential" + SESSION_COOKIE_REGEXP = /#{SESSION_COOKIE_NAME}=:(.+):;/ SESSION_COOKIE_MAX_AGE = 60 * 60 * 23 # 1 day - leeway of 1h IGNORED_ENDPOINTS = %w[ shopify/monorail diff --git a/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/repl/api.rb b/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/repl/api.rb index 460f233535f..fd3326a6b16 100644 --- a/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/repl/api.rb +++ b/packages/cli-kit/assets/cli-ruby/lib/shopify_cli/theme/repl/api.rb @@ -60,7 +60,7 @@ def liquid_template end def cookie - @cookie ||= "storefront_digest=#{repl.storefront_digest}; _secure_session_id=#{repl.secure_session_id}" + @cookie ||= "storefront_digest=#{repl.storefront_digest}; #{DevServer::Proxy::SESSION_COOKIE_NAME}=#{repl.secure_session_id}" end def shop