From 28c066b782110a8d4165876f792c73000523ab6b Mon Sep 17 00:00:00 2001 From: Nick Nielsen Date: Sat, 21 Dec 2024 09:11:35 -0700 Subject: [PATCH 1/7] adding flag to remove isLoggedIn --- packages/react-scripts/layout/views/layout.ejs | 5 ++++- packages/react-scripts/package.json | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/react-scripts/layout/views/layout.ejs b/packages/react-scripts/layout/views/layout.ejs index 45e8a931407..0cf4441fbad 100644 --- a/packages/react-scripts/layout/views/layout.ejs +++ b/packages/react-scripts/layout/views/layout.ejs @@ -46,7 +46,6 @@ SERVER_DATA.sgBaseUrl = "<%= process.env.SG_BASE_URL %>" SERVER_DATA.splitioAuthKey = "<%= process.env.SPLITIO_AUTH_KEY %>" SERVER_DATA.geoData = <%- typeof geoData !== 'undefined' ? JSON.stringify(geoData) : JSON.stringify({}) %>; - SERVER_DATA.isLoggedIn = <%= isLoggedIn %> <% include partials/experiments %> <% include partials/sentry %> <% include partials/clientAppConfig %> @@ -55,6 +54,10 @@ if (!window.dtinfo) window.dtinfo = {} window.dtinfo.appName = SERVER_DATA.appName } + // Apps that cache SERVER_DATA need this flag on. + <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName: SERVER_DATA.appName }).isOn) { %> + SERVER_DATA.isLoggedIn = <%= isLoggedIn %> + <% } %> diff --git a/packages/react-scripts/package.json b/packages/react-scripts/package.json index b6b464176b7..f90a5cbb123 100644 --- a/packages/react-scripts/package.json +++ b/packages/react-scripts/package.json @@ -1,6 +1,6 @@ { "name": "@fs/react-scripts", - "version": "8.8.1", + "version": "8.8.2", "upstreamVersion": "5.0.1", "description": "Configuration and scripts for Create React App.", "repository": { From 8133e4e02951b22f867a1409714fc5ed103b6b3b Mon Sep 17 00:00:00 2001 From: Nick Nielsen Date: Sat, 21 Dec 2024 09:13:11 -0700 Subject: [PATCH 2/7] update package-lock for react script change --- package-lock.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index e53c4c778b7..6b58238944f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -41170,7 +41170,7 @@ }, "packages/react-scripts": { "name": "@fs/react-scripts", - "version": "8.8.0", + "version": "8.8.2", "license": "MIT", "dependencies": { "@babel/core": "^7.16.0", From da5d9240a48ad86add75d12b47c2961e71f90d08 Mon Sep 17 00:00:00 2001 From: Nick Nielsen Date: Sat, 21 Dec 2024 09:21:10 -0700 Subject: [PATCH 3/7] correcting change --- packages/react-scripts/layout/views/layout.ejs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/react-scripts/layout/views/layout.ejs b/packages/react-scripts/layout/views/layout.ejs index 0cf4441fbad..94a8bd92b47 100644 --- a/packages/react-scripts/layout/views/layout.ejs +++ b/packages/react-scripts/layout/views/layout.ejs @@ -46,6 +46,9 @@ SERVER_DATA.sgBaseUrl = "<%= process.env.SG_BASE_URL %>" SERVER_DATA.splitioAuthKey = "<%= process.env.SPLITIO_AUTH_KEY %>" SERVER_DATA.geoData = <%- typeof geoData !== 'undefined' ? JSON.stringify(geoData) : JSON.stringify({}) %>; + <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName }).isOn) { %> + SERVER_DATA.isLoggedIn = <%= isLoggedIn %> + <% } %> <% include partials/experiments %> <% include partials/sentry %> <% include partials/clientAppConfig %> @@ -54,10 +57,6 @@ if (!window.dtinfo) window.dtinfo = {} window.dtinfo.appName = SERVER_DATA.appName } - // Apps that cache SERVER_DATA need this flag on. - <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName: SERVER_DATA.appName }).isOn) { %> - SERVER_DATA.isLoggedIn = <%= isLoggedIn %> - <% } %> From dc3c70f842b9fe2021cbf1185b80cfc45f1b92f2 Mon Sep 17 00:00:00 2001 From: Nick Nielsen Date: Mon, 23 Dec 2024 10:53:38 -0700 Subject: [PATCH 4/7] Update packages/react-scripts/layout/views/layout.ejs --- packages/react-scripts/layout/views/layout.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/layout/views/layout.ejs b/packages/react-scripts/layout/views/layout.ejs index 94a8bd92b47..4b05c4eedad 100644 --- a/packages/react-scripts/layout/views/layout.ejs +++ b/packages/react-scripts/layout/views/layout.ejs @@ -46,7 +46,7 @@ SERVER_DATA.sgBaseUrl = "<%= process.env.SG_BASE_URL %>" SERVER_DATA.splitioAuthKey = "<%= process.env.SPLITIO_AUTH_KEY %>" SERVER_DATA.geoData = <%- typeof geoData !== 'undefined' ? JSON.stringify(geoData) : JSON.stringify({}) %>; - <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName }).isOn) { %> + <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName: process.env.APP_NAME }).isOn) { %> SERVER_DATA.isLoggedIn = <%= isLoggedIn %> <% } %> <% include partials/experiments %> From 95ff04af5ac16a7aacd4a7e3d6f8a1b7b6bd1f6d Mon Sep 17 00:00:00 2001 From: Nick Nielsen Date: Mon, 23 Dec 2024 13:03:15 -0700 Subject: [PATCH 5/7] Update packages/react-scripts/layout/views/layout.ejs --- packages/react-scripts/layout/views/layout.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/layout/views/layout.ejs b/packages/react-scripts/layout/views/layout.ejs index 4b05c4eedad..94a8bd92b47 100644 --- a/packages/react-scripts/layout/views/layout.ejs +++ b/packages/react-scripts/layout/views/layout.ejs @@ -46,7 +46,7 @@ SERVER_DATA.sgBaseUrl = "<%= process.env.SG_BASE_URL %>" SERVER_DATA.splitioAuthKey = "<%= process.env.SPLITIO_AUTH_KEY %>" SERVER_DATA.geoData = <%- typeof geoData !== 'undefined' ? JSON.stringify(geoData) : JSON.stringify({}) %>; - <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName: process.env.APP_NAME }).isOn) { %> + <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName }).isOn) { %> SERVER_DATA.isLoggedIn = <%= isLoggedIn %> <% } %> <% include partials/experiments %> From f3164bec6ae3585fb3975d2c5b6e42b463b620da Mon Sep 17 00:00:00 2001 From: Nick Nielsen Date: Mon, 30 Dec 2024 09:42:04 -0700 Subject: [PATCH 6/7] looking to skipSessionPrevalidation to set isLoggedIn --- packages/react-scripts/layout/views/layout.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/layout/views/layout.ejs b/packages/react-scripts/layout/views/layout.ejs index 94a8bd92b47..716eb4e345a 100644 --- a/packages/react-scripts/layout/views/layout.ejs +++ b/packages/react-scripts/layout/views/layout.ejs @@ -46,7 +46,7 @@ SERVER_DATA.sgBaseUrl = "<%= process.env.SG_BASE_URL %>" SERVER_DATA.splitioAuthKey = "<%= process.env.SPLITIO_AUTH_KEY %>" SERVER_DATA.geoData = <%- typeof geoData !== 'undefined' ? JSON.stringify(geoData) : JSON.stringify({}) %>; - <% if (!getFeatureFlag('frontier_server_removeIsLoggedIn', { appName }).isOn) { %> + <% if (typeof skipSessionPrevalidation != 'undefined' && !skipSessionPrevalidation) { %> SERVER_DATA.isLoggedIn = <%= isLoggedIn %> <% } %> <% include partials/experiments %> From 3cde4dfed8f2b4745010066b8ae8e7dc8c5f8a9c Mon Sep 17 00:00:00 2001 From: Logan Allred Date: Tue, 31 Dec 2024 10:11:19 -0700 Subject: [PATCH 7/7] stricter equality check for consistency with how we do this everywhere else --- packages/react-scripts/layout/views/layout.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-scripts/layout/views/layout.ejs b/packages/react-scripts/layout/views/layout.ejs index 716eb4e345a..2ac07107589 100644 --- a/packages/react-scripts/layout/views/layout.ejs +++ b/packages/react-scripts/layout/views/layout.ejs @@ -46,7 +46,7 @@ SERVER_DATA.sgBaseUrl = "<%= process.env.SG_BASE_URL %>" SERVER_DATA.splitioAuthKey = "<%= process.env.SPLITIO_AUTH_KEY %>" SERVER_DATA.geoData = <%- typeof geoData !== 'undefined' ? JSON.stringify(geoData) : JSON.stringify({}) %>; - <% if (typeof skipSessionPrevalidation != 'undefined' && !skipSessionPrevalidation) { %> + <% if (typeof skipSessionPrevalidation !== 'undefined' && !skipSessionPrevalidation) { %> SERVER_DATA.isLoggedIn = <%= isLoggedIn %> <% } %> <% include partials/experiments %>