From 4f05bc619b4c2cd8627b965326389bfaee6bf199 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Mon, 19 Feb 2024 09:51:10 +0000 Subject: [PATCH 1/7] Handle branding cookies with different tenant ids --- .../builder/src/pages/builder/auth/_layout.svelte | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte index f5484182e8..8902e9ac61 100644 --- a/packages/builder/src/pages/builder/auth/_layout.svelte +++ b/packages/builder/src/pages/builder/auth/_layout.svelte @@ -10,13 +10,18 @@ $redirect("../") } - if ($admin?.checklist?.branding) { + if ($admin.cloud && $admin?.checklist?.branding) { let url = new URL(window.location.href) let hostname = url.hostname let parts = hostname.split(".") - let tenantId = parts[0] + let newTenantId = parts[0] let domain = parts.slice(-2).join(".") - CookieUtils.setCookie("tenantId", tenantId, domain) + + let existingTenantId = CookieUtils.getCookie("tenantId") + + if (!existingTenantId || existingTenantId !== newTenantId) { + CookieUtils.setCookie("tenantId", newTenantId, domain) + } } if ( From 2e53be5bd841b12b46f79b429d642e600a6aa4b1 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 21 Feb 2024 16:13:43 +0000 Subject: [PATCH 2/7] add null check --- packages/builder/src/pages/builder/auth/_layout.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte index 8902e9ac61..1a40847aa0 100644 --- a/packages/builder/src/pages/builder/auth/_layout.svelte +++ b/packages/builder/src/pages/builder/auth/_layout.svelte @@ -10,7 +10,7 @@ $redirect("../") } - if ($admin.cloud && $admin?.checklist?.branding) { + if ($admin?.cloud && $admin?.checklist?.branding) { let url = new URL(window.location.href) let hostname = url.hostname let parts = hostname.split(".") From b6b39375a1a1fdb800aae8cc8e4ccb40ae59b512 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 21 Feb 2024 16:16:25 +0000 Subject: [PATCH 3/7] account portal ref --- packages/account-portal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/account-portal b/packages/account-portal index 8c446c4ba3..92129b0d62 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 8c446c4ba385592127fa31755d3b64467b291882 +Subproject commit 92129b0d6251a7b4dabb367c15b09c079399b763 From fe28ae50e587302189998ed71f367e0c433ccca9 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 21 Feb 2024 16:18:12 +0000 Subject: [PATCH 4/7] ref --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 60e47a8249..336bf2184c 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 60e47a8249fd6291a6bc20fe3fe6776b11938fa1 +Subproject commit 336bf2184cf632fdc2bffbad5628e8b15dd381bd From 25d59d0be0b1d9f74d353ae63077e41cd5b780f8 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 21 Feb 2024 16:31:32 +0000 Subject: [PATCH 5/7] Revert "ref" This reverts commit fe28ae50e587302189998ed71f367e0c433ccca9. --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 336bf2184c..60e47a8249 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 336bf2184cf632fdc2bffbad5628e8b15dd381bd +Subproject commit 60e47a8249fd6291a6bc20fe3fe6776b11938fa1 From c94cf7c12c5273571a05f3d3a50c9c212c92bb63 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Wed, 21 Feb 2024 16:31:45 +0000 Subject: [PATCH 6/7] update --- packages/pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/pro b/packages/pro index 60e47a8249..336bf2184c 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 60e47a8249fd6291a6bc20fe3fe6776b11938fa1 +Subproject commit 336bf2184cf632fdc2bffbad5628e8b15dd381bd From 566a6c4399f8db8cde88db8f42a5cb0a6ec96114 Mon Sep 17 00:00:00 2001 From: Martin McKeaveney Date: Thu, 22 Feb 2024 14:02:23 -0300 Subject: [PATCH 7/7] update submodule references --- packages/account-portal | 2 +- packages/pro | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/account-portal b/packages/account-portal index 92129b0d62..ab324e35d8 160000 --- a/packages/account-portal +++ b/packages/account-portal @@ -1 +1 @@ -Subproject commit 92129b0d6251a7b4dabb367c15b09c079399b763 +Subproject commit ab324e35d855012bd0f49caa53c6dd765223c6fa diff --git a/packages/pro b/packages/pro index 336bf2184c..183b35d3ac 160000 --- a/packages/pro +++ b/packages/pro @@ -1 +1 @@ -Subproject commit 336bf2184cf632fdc2bffbad5628e8b15dd381bd +Subproject commit 183b35d3acd42433dcb2d32bcd89a36abe13afec