From 7151c73aae2e7b1cb155b14738af1da7f820643d Mon Sep 17 00:00:00 2001
From: Viliam Krizan <vkrizan@redhat.com>
Date: Mon, 21 Aug 2023 15:12:19 +0200
Subject: [PATCH 01/15] fix(pendo): no error on missing pendo

---
 src/components/ChromeRoute/ChromeRoute.tsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/ChromeRoute/ChromeRoute.tsx b/src/components/ChromeRoute/ChromeRoute.tsx
index 1d401ce913..dbc64f6907 100644
--- a/src/components/ChromeRoute/ChromeRoute.tsx
+++ b/src/components/ChromeRoute/ChromeRoute.tsx
@@ -46,11 +46,13 @@ const ChromeRoute = memo(
       /**
        * update pendo metadata on application change
        */
-      try {
-        window?.pendo?.updateOptions(getPendoConf(user as DeepRequired<ChromeUser>));
-      } catch (error) {
-        console.error('Unable to update pendo options');
-        console.error(error);
+      if (window.pendo) {
+        try {
+          window.pendo.updateOptions(getPendoConf(user as DeepRequired<ChromeUser>));
+        } catch (error) {
+          console.error('Unable to update pendo options');
+          console.error(error);
+        }
       }
 
       /**

From 315eae6718c0db9f56506b1a9bcb2012805682d7 Mon Sep 17 00:00:00 2001
From: Matt Knop <mknop@redhat.com>
Date: Wed, 23 Aug 2023 13:03:05 -0600
Subject: [PATCH 02/15] Adding aliases for new pipeline pr check

---
 package.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 58a507ad74..63cc8429aa 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,11 @@
     "translations:compile": "npx formatjs compile ./locales/translation-template.json --out-file ./src/locales/translations.json",
     "translations:datafile": "node scripts/createDataJson.js",
     "verify": "npm-run-all lint build test",
-    "postinstall": "rm -rf .webpack-cache"
+    "postinstall": "rm -rf .webpack-cache",
+    "ci:unit-tests": "run-s test",
+    "ci:lint": "run-s lint",
+    "ci:cypress-component-tests": "run-s test:ct",
+    "ci:cypress-e2e-tests": "run-s test:e2e"
   },
   "repository": {
     "type": "git",

From 768b6ff5d8cf0288371f93b593ec73823d1151c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Maro=C5=A1i?= <marvusm.mmi@gmail.com>
Date: Mon, 14 Aug 2023 16:09:14 +0200
Subject: [PATCH 03/15] Add dynamic partner title to product selection screen.

---
 .../Stratosphere/ProductSelection.tsx         | 138 +++++++++---------
 .../Stratosphere/RedirectBanner.test.tsx      |   3 +-
 .../Stratosphere/RedirectBanner.tsx           |  29 +---
 src/hooks/useMarketplacePartner.ts            |  37 +++++
 4 files changed, 116 insertions(+), 91 deletions(-)
 create mode 100644 src/hooks/useMarketplacePartner.ts

diff --git a/src/components/Stratosphere/ProductSelection.tsx b/src/components/Stratosphere/ProductSelection.tsx
index 540aa0e6e5..dfdabf9c26 100644
--- a/src/components/Stratosphere/ProductSelection.tsx
+++ b/src/components/Stratosphere/ProductSelection.tsx
@@ -14,76 +14,80 @@ import ProductCard from './ProductCard';
 import { Header } from '../Header/Header';
 import ChromeLink from '../ChromeLink/ChromeLink';
 import Footer from './Footer';
+import useMarketplacePartner from '../../hooks/useMarketplacePartner';
 
 import './product-selection.scss';
 
-const ProductSelection = () => (
-  <div id="chrome-app-render-root">
-    <Page
-      header={
-        <Masthead className="chr-c-masthead">
-          <Header />
-        </Masthead>
-      }
-    >
-      <div className="chr-c-product-selection pf-v5-u-pt-lg pf-v5-u-pb-lg">
-        <Stack hasGutter>
-          <StackItem>
-            <Bullseye>
-              <Icon iconSize="xl">
-                <CheckCircleIcon color="var(--pf-v5-global--success-color--100)" />
-              </Icon>
-            </Bullseye>
-          </StackItem>
-          <StackItem>
-            <Stack>
-              <StackItem>
-                <Bullseye>
-                  <Title size="3xl" headingLevel="h1">
-                    Congratulations,
+const ProductSelection = () => {
+  const { partner } = useMarketplacePartner();
+  return (
+    <div id="chrome-app-render-root">
+      <Page
+        header={
+          <Masthead className="chr-c-masthead">
+            <Header />
+          </Masthead>
+        }
+      >
+        <div className="chr-c-product-selection pf-u-pt-lg pf-u-pb-lg">
+          <Stack hasGutter>
+            <StackItem>
+              <Bullseye>
+                <Icon size="xl">
+                  <CheckCircleIcon color="var(--pf-global--success-color--100)" />
+                </Icon>
+              </Bullseye>
+            </StackItem>
+            <StackItem>
+              <Stack>
+                <StackItem>
+                  <Bullseye>
+                    <Title size="3xl" headingLevel="h1">
+                      Congratulations,
+                    </Title>
+                  </Bullseye>
+                </StackItem>
+                <StackItem>
+                  <Title className="chr-c-product-selection__description" size="3xl" headingLevel="h1">
+                    your Red Hat and {partner} accounts are connected and you can now access Red Hat support resources
                   </Title>
-                </Bullseye>
-              </StackItem>
-              <StackItem>
-                <Title className="chr-c-product-selection__description" size="3xl" headingLevel="h1">
-                  your Red Hat and AWS accounts are connected and you can now access Red Hat support resources
-                </Title>
-              </StackItem>
-            </Stack>
-          </StackItem>
-          <StackItem>
-            <Bullseye>
-              <TextContent>
-                <Text>To get started using your Red Hat products, follow the links below</Text>
-              </TextContent>
-            </Bullseye>
-          </StackItem>
-          <StackItem>
-            <Flex>
-              <div className="chr-c-product-selection__layout">
-                {productsList.map((item, i) => (
-                  <ProductCard key={i} {...item} order={i} />
-                ))}
-              </div>
-            </Flex>
-          </StackItem>
-          <StackItem>
-            <Bullseye>
-              <TextContent>
-                <Text>
-                  To manage or learn more about your Red Hat subscriptions, visit{' '}
-                  <ChromeLink href="/insights/subscriptions/rhel" appId="subscriptions">
-                    subscriptions.
-                  </ChromeLink>
-                </Text>
-              </TextContent>
-            </Bullseye>
-          </StackItem>
-        </Stack>
-      </div>
-      <Footer />
-    </Page>
-  </div>
-);
+                </StackItem>
+              </Stack>
+            </StackItem>
+            <StackItem>
+              <Bullseye>
+                <TextContent>
+                  <Text>To get started using your Red Hat products, follow the links below</Text>
+                </TextContent>
+              </Bullseye>
+            </StackItem>
+            <StackItem>
+              <Flex>
+                <div className="chr-c-product-selection__layout">
+                  {productsList.map((item, i) => (
+                    <ProductCard key={i} {...item} order={i} />
+                  ))}
+                </div>
+              </Flex>
+            </StackItem>
+            <StackItem>
+              <Bullseye>
+                <TextContent>
+                  <Text>
+                    To manage or learn more about your Red Hat subscriptions, visit{' '}
+                    <ChromeLink href="/insights/subscriptions/rhel" appId="subscriptions">
+                      subscriptions.
+                    </ChromeLink>
+                  </Text>
+                </TextContent>
+              </Bullseye>
+            </StackItem>
+          </Stack>
+        </div>
+        <Footer />
+      </Page>
+    </div>
+  );
+};
 
 export default ProductSelection;
diff --git a/src/components/Stratosphere/RedirectBanner.test.tsx b/src/components/Stratosphere/RedirectBanner.test.tsx
index 024a14a95a..bf1e42bd97 100644
--- a/src/components/Stratosphere/RedirectBanner.test.tsx
+++ b/src/components/Stratosphere/RedirectBanner.test.tsx
@@ -6,7 +6,8 @@ import configureStore from 'redux-mock-store';
 import { InitialEntry } from 'history';
 import { Store } from 'redux';
 
-import RedirectBanner, { AWS_BANNER_NAME, AZURE_BANNER_NAME } from './RedirectBanner';
+import RedirectBanner from './RedirectBanner';
+import { AWS_BANNER_NAME, AZURE_BANNER_NAME } from '../../hooks/useMarketplacePartner';
 
 const LocationSpy: React.VoidFunctionComponent<{ changeSpy: jest.Mock }> = ({ changeSpy }) => {
   const { search, pathname, hash, state } = useLocation();
diff --git a/src/components/Stratosphere/RedirectBanner.tsx b/src/components/Stratosphere/RedirectBanner.tsx
index d6d1f9fa6d..456f9a2dc2 100644
--- a/src/components/Stratosphere/RedirectBanner.tsx
+++ b/src/components/Stratosphere/RedirectBanner.tsx
@@ -4,39 +4,22 @@ import { Text, TextContent } from '@patternfly/react-core/dist/dynamic/component
 import { useSelector } from 'react-redux';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { ReduxState } from '../../redux/store';
-
-// TODO: Figure out what param chrome should expect
-export const AWS_BANNER_NAME = 'from-aws';
-export const AZURE_BANNER_NAME = 'from-azure';
-export const GCP_BANNER_NAME = 'from-gcp';
-
-const partnerMapper: { [partner: string]: string } = {
-  [AWS_BANNER_NAME]: 'AWS',
-  [AZURE_BANNER_NAME]: 'Microsoft Azure',
-  [GCP_BANNER_NAME]: 'Google Cloud',
-};
-const possibleParams = [AWS_BANNER_NAME, AZURE_BANNER_NAME, GCP_BANNER_NAME];
-
-const hasPartner = (params: URLSearchParams) => possibleParams.find((param) => params.has(param));
+import useMarketplacePartner from '../../hooks/useMarketplacePartner';
 
 const RedirectBanner = () => {
-  const { pathname, search, hash, state } = useLocation();
+  const { pathname, hash, state } = useLocation();
+  const { partnerId, partner, removePartnerParam } = useMarketplacePartner();
   const navigate = useNavigate();
-  const params = new URLSearchParams(search);
-  const isVisible = hasPartner(params);
-  const partner = isVisible ? partnerMapper[isVisible] : null;
   const product = useSelector<ReduxState, string | undefined>((state) => state.chrome.activeProduct);
 
   const handleClose = () => {
     // remove only the flag search param
-    params.delete(AWS_BANNER_NAME);
-    params.delete(AZURE_BANNER_NAME);
-    params.delete(GCP_BANNER_NAME);
+    const clearedParams = removePartnerParam();
     // only change the search params
     navigate(
       {
         pathname,
-        search: params.toString(),
+        search: clearedParams.toString(),
         hash,
       },
       {
@@ -46,7 +29,7 @@ const RedirectBanner = () => {
     );
   };
   // show the banner only if correct search param exists
-  return isVisible ? (
+  return partnerId ? (
     <Alert
       actionClose={<AlertActionCloseButton data-testid="stratosphere-banner-close" onClose={handleClose} />}
       isInline
diff --git a/src/hooks/useMarketplacePartner.ts b/src/hooks/useMarketplacePartner.ts
new file mode 100644
index 0000000000..08637ef55d
--- /dev/null
+++ b/src/hooks/useMarketplacePartner.ts
@@ -0,0 +1,37 @@
+import { useLocation } from 'react-router-dom';
+
+// TODO: Figure out what param chrome should expect
+export const AWS_BANNER_NAME = 'from-aws';
+export const AZURE_BANNER_NAME = 'from-azure';
+export const GCP_BANNER_NAME = 'from-gcp';
+
+const partnerMapper: { [partner: string]: string } = {
+  [AWS_BANNER_NAME]: 'AWS',
+  [AZURE_BANNER_NAME]: 'Microsoft Azure',
+  [GCP_BANNER_NAME]: 'Google Cloud',
+};
+const possibleParams = [AWS_BANNER_NAME, AZURE_BANNER_NAME, GCP_BANNER_NAME];
+
+const hasPartner = (params: URLSearchParams) => possibleParams.find((param) => params.has(param));
+
+const removePartnerParam = (params: URLSearchParams) => {
+  params.delete(AWS_BANNER_NAME);
+  params.delete(AZURE_BANNER_NAME);
+  params.delete(GCP_BANNER_NAME);
+  return params;
+};
+
+const useMarketplacePartner = () => {
+  const { search } = useLocation();
+
+  const params = new URLSearchParams(search);
+  const partnerId = hasPartner(params);
+  const partner = partnerId ? partnerMapper[partnerId] : null;
+  return {
+    partner,
+    partnerId,
+    removePartnerParam: () => removePartnerParam(params),
+  };
+};
+
+export default useMarketplacePartner;

From ac40259aebf3e9c197dbb7d6f1a9e47b159fc222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Maro=C5=A1i?= <marvusm.mmi@gmail.com>
Date: Mon, 14 Aug 2023 16:13:50 +0200
Subject: [PATCH 04/15] Do not show product links for azure partner page.

---
 .../Stratosphere/ProductSelection.tsx         | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/components/Stratosphere/ProductSelection.tsx b/src/components/Stratosphere/ProductSelection.tsx
index dfdabf9c26..03607b5897 100644
--- a/src/components/Stratosphere/ProductSelection.tsx
+++ b/src/components/Stratosphere/ProductSelection.tsx
@@ -19,7 +19,7 @@ import useMarketplacePartner from '../../hooks/useMarketplacePartner';
 import './product-selection.scss';
 
 const ProductSelection = () => {
-  const { partner } = useMarketplacePartner();
+  const { partner, partnerId } = useMarketplacePartner();
   return (
     <div id="chrome-app-render-root">
       <Page
@@ -54,22 +54,26 @@ const ProductSelection = () => {
                 </StackItem>
               </Stack>
             </StackItem>
-            <StackItem>
-              <Bullseye>
-                <TextContent>
-                  <Text>To get started using your Red Hat products, follow the links below</Text>
-                </TextContent>
-              </Bullseye>
-            </StackItem>
-            <StackItem>
-              <Flex>
-                <div className="chr-c-product-selection__layout">
-                  {productsList.map((item, i) => (
-                    <ProductCard key={i} {...item} order={i} />
-                  ))}
-                </div>
-              </Flex>
-            </StackItem>
+            {partnerId !== 'from-azure' && (
+              <>
+                <StackItem>
+                  <Bullseye>
+                    <TextContent>
+                      <Text>To get started using your Red Hat products, follow the links below</Text>
+                    </TextContent>
+                  </Bullseye>
+                </StackItem>
+                <StackItem>
+                  <Flex>
+                    <div className="chr-c-product-selection__layout">
+                      {productsList.map((item, i) => (
+                        <ProductCard key={i} {...item} order={i} />
+                      ))}
+                    </div>
+                  </Flex>
+                </StackItem>
+              </>
+            )}
             <StackItem>
               <Bullseye>
                 <TextContent>

From d031fd6cb8cce4c51c23c543af8f9f116a79448d Mon Sep 17 00:00:00 2001
From: Karel Hala <khala@redhat.com>
Date: Thu, 24 Aug 2023 10:47:27 +0200
Subject: [PATCH 05/15] Open new tabs for all URLs in PF5 dropdown

---
 src/components/Header/Tools.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Header/Tools.tsx b/src/components/Header/Tools.tsx
index cec8e2951a..f1ebf6b8d0 100644
--- a/src/components/Header/Tools.tsx
+++ b/src/components/Header/Tools.tsx
@@ -132,7 +132,7 @@ const Tools = () => {
   const aboutMenuDropdownItems = [
     {
       title: `${intl.formatMessage(messages.apiDocumentation)}`,
-      url: `https://developers.redhat.com/api-catalog/`,
+      onClick: () => window.open('https://developers.redhat.com/api-catalog/', '_blank'),
       isHidden: isITLessEnv,
     },
     {
@@ -143,17 +143,17 @@ const Tools = () => {
     },
     {
       title: `${intl.formatMessage(messages.statusPage)}`,
-      url: 'https://status.redhat.com/',
+      onClick: () => window.open('https://status.redhat.com/', '_blank'),
       isHidden: isITLessEnv,
     },
     {
       title: `${intl.formatMessage(messages.supportOptions)}`,
-      url: 'https://access.redhat.com/support',
+      onClick: () => window.open('https://access.redhat.com/support', '_blank'),
       isHidden: isITLessEnv,
     },
     {
       title: `${intl.formatMessage(messages.insightsRhelDocumentation)}`,
-      url: `https://access.redhat.com/documentation/en-us/red_hat_insights`,
+      onClick: () => window.open('https://access.redhat.com/documentation/en-us/red_hat_insights', '_blank'),
       isHidden: getSection() !== 'insights' || isITLessEnv,
     },
 

From 9c404c94a627e651098c0759ea2e7065a74493b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Radek=20Kaluz=CC=8Ci=CC=81k?= <radek.kaluzik@email.cz>
Date: Thu, 24 Aug 2023 13:38:35 +0200
Subject: [PATCH 06/15] Update Azure Notification to Notify Customer of 48hr
 Delay for Support Entitlement

---
 src/components/Stratosphere/RedirectBanner.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Stratosphere/RedirectBanner.tsx b/src/components/Stratosphere/RedirectBanner.tsx
index 456f9a2dc2..ca6ef25f06 100644
--- a/src/components/Stratosphere/RedirectBanner.tsx
+++ b/src/components/Stratosphere/RedirectBanner.tsx
@@ -37,10 +37,17 @@ const RedirectBanner = () => {
       title={`Congratulations, your Red Hat and ${partner} accounts are linked`}
     >
       <TextContent>
-        <Text>
-          Welcome to the Red Hat Hybrid Cloud Console. If you cannot access production tools for a subscription that you have purchased, please wait 5
-          minutes and and confirm your subscription at subscription inventory. {product ? `Here you can configure or manage ${product}` : ''}.
-        </Text>
+        {partnerId === 'from-azure' ? (
+          <Text>
+            It may take up to two days for all subscription information between Red Hat and Microsoft to synchronize. If any subscription services are
+            needed in the meantime, like technical support, simply note this in your request to receive the full benefit of your new subscription.
+          </Text>
+        ) : (
+          <Text>
+            Welcome to the Red Hat Hybrid Cloud Console. If you cannot access production tools for a subscription that you have purchased, please wait
+            5 minutes and and confirm your subscription at subscription inventory. {product ? `Here you can configure or manage ${product}.` : ''}
+          </Text>
+        )}
         <a href="#">View subscription inventory</a>
       </TextContent>
     </Alert>

From 478ad148495fdb0063007edd1fc37823ce115209 Mon Sep 17 00:00:00 2001
From: Blake Holifield <bholifie@redhat.com>
Date: Tue, 22 Aug 2023 15:50:55 -0400
Subject: [PATCH 07/15] Update WSS docs

---
 docs/localWSDevelopment.md | 77 ++++++++++++++++++++------------------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/docs/localWSDevelopment.md b/docs/localWSDevelopment.md
index 004d61c6c8..24cbecdddb 100644
--- a/docs/localWSDevelopment.md
+++ b/docs/localWSDevelopment.md
@@ -9,7 +9,7 @@
 
 ## Setting up the development environment
 
-### Chrome service backend
+### Chrome Service Backend
 
 The chrome service backend is the bridge between kafka and the browser client. It exposes a WS endpoint that allows the browser to connect to the service.
 
@@ -18,14 +18,46 @@ The chrome service backend is the bridge between kafka and the browser client. I
 To enable it for local development with chrome UI follow these steps:
 
 1. Make sure you are on the `main` branch or have created new branch fro the latest `main`.
-2. <a name="bypass"></a>If the WS feature is hidden behind a feature flag, and you don't want to go through the FF setup, [bypass this condition](https://github.com/RedHatInsights/chrome-service-backend/blob/main/main.go#L61) by adding `true || ..` to the condition in your local repository.
-3. Start the kafka container by running `make kafka`.
-4. Start the chrome service by running `go run .` in the repo root.
-5. Run a `go run cmd/kafka/testMessage.go` to test the connection. You should see a log in the terminal from where the go server was started.
+2. Start the kafka and unleash containers by running `make infra`.
+3. Start the chrome service by running `make dev` in the repo root.
+4. Run a `go run cmd/kafka/testMessage.go` to test the connection. You should see a log in the terminal from where the go server was started.
 
-#### The `make kafka` command failed.
 
-It is possible that you have services running on your machine that occupy either the kafka or postgres ports. To change the default values, open the `local/kafka-compose.yaml` and change the postgres or kafka (or both) port bindings:
+
+### Chrome Frontend
+
+1. Ensure you are on the latest version for chrome `master` branch. The support for WS client was added in [#2525](https://github.com/RedHatInsights/insights-chrome/pull/2525).
+2. Once your chrome service backend is running, start the chrome dev server with the chrome service config using this command: `CHROME_SERVICE=8000 yarn dev`.
+3. The WS client connection is hidden behind a `platform.chrome.notifications-drawer` feature flag. If its not available in your current environment (stage or prod or EE), bypass the feature flag condition in the `src/hooks/useChromeServiceEvents.ts` file.
+4. Open the browser, open the browser console, emit a custom message from the chrome service terminal using `go run cmd/kafka/testMessage.go`.
+5. In the network tab of your browser console, filter only to show `ws` communication, click on related ws connection (there will be a couple for webpack dev server, ignore these and find `wss://stage.foo.redhat.com:1337/wss/chrome-service/v1/ws`). 
+6. Click the 'messages' tab in chrome or the 'response' tab in firefox and observe the messages being pushed down to the browser. The messages should be similar to the sample payload below.
+
+#### Sample WS message payload
+
+```js
+{
+  // the actual payload consumed by chrome
+  data: {
+    description: "Some longer description",
+    title: "New notification"
+  },
+  // cloud events sub protocol metadata
+  datacontenttype: "application/json",
+  id: "test-message",
+  source: "https://whatever.service.com",
+  specversion: "1.0.2",
+  time: "2023-05-23T11:54:03.879689005+02:00",
+  // a type field used to identify message purpose
+  type: "notifications.drawer"
+}
+```
+
+## Troubleshooting
+
+#### The `make infra` command failed.
+
+It is possible that you have services running on your machine that occupy either the kafka or postgres ports. To change the default values, open the `local/full-stack-compose.yaml` and change the postgres or kafka or unleash (or all) port bindings:
 
 ```diff
 diff --git a/local/kafka-compose.yaml b/local/kafka-compose.yaml
@@ -55,33 +87,4 @@ index f8f3451..60fc9cd 100644
 
 #### The `go run cmd/kafka/testMessage.go`
 
-The command will not work if the main server is not running, or the ws consumer did not start. Ensure you either have feature flags setup or you have bypassed the condition listed in the [step 2](#bypass).
-
-
-### Chrome frontend
-
-1. ensure you are on the latest version for chrome `master` branch. The support for WS client was added in [#2525](https://github.com/RedHatInsights/insights-chrome/pull/2525).
-2. Once your chrome service backend is running, start the chrome dev server with the chrome service config using this command: `CHROME_SERVICE=8000 yarn dev`.
-3. The WS client connection is hidden behind a `platform.chrome.notifications-drawer` feature flag. If its not available in your current environment (stage or prod or EE), bypass the feature flag condition in the `src/hooks/useChromeServiceEvents.ts` file.
-4. OPen the browser, open the browser console, emit a custom message from the chrome service terminal using `go run cmd/kafka/testMessage.go`.
-5. In the network tab of your browser console, filter only to show `ws` communication, click on related ws connection (there will be a couple for webpack dev server, ignore these) and observer the messages being pushed down to the browser.
-
-#### Sample WS message payload
-
-```js
-{
-  // the actual payload consumed by chrome
-  data: {
-    description: "Some longer description",
-    title: "New notification"
-  },
-  // cloud events sub protocol metadata
-  datacontenttype: "application/json",
-  id: "test-message",
-  source: "https://whatever.service.com",
-  specversion: "1.0.2",
-  time: "2023-05-23T11:54:03.879689005+02:00",
-  // a type field used to identify message purpose
-  type: "notifications.drawer"
-}
-```
+The command will not work if the main server is not running, or the ws consumer did not start. Ensure you either have feature flags setup or the pods are running correctly with `podman ps`.

From 3f5495c8fc79b4127af38906555ed31a92431eac Mon Sep 17 00:00:00 2001
From: Bryan Florkiewicz <bflorkie@redhat.com>
Date: Thu, 24 Aug 2023 18:36:02 -0400
Subject: [PATCH 08/15] Add search e2e test with screenshot

---
 cypress/e2e/release-gate/search.cy.tsx | 71 ++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 cypress/e2e/release-gate/search.cy.tsx

diff --git a/cypress/e2e/release-gate/search.cy.tsx b/cypress/e2e/release-gate/search.cy.tsx
new file mode 100644
index 0000000000..5e9ea7c521
--- /dev/null
+++ b/cypress/e2e/release-gate/search.cy.tsx
@@ -0,0 +1,71 @@
+const searchResponse = {
+  response: {
+    numFound: 2,
+    start: 0,
+    maxScore: 10.0,
+    docs: [
+      {
+        id: 'hcc-module-/openshift/create-OPENSHIFT.cluster.create.azure',
+        view_uri: 'https://console.redhat.com/openshift/create',
+        documentKind: 'ModuleDefinition',
+        allTitle: 'Azure Red Hat OpenShift',
+        bundle: ['openshift'],
+        bundle_title: ['OpenShift'],
+        relative_uri: '/openshift/create',
+        alt_titles: ['ARO', 'Azure', 'OpenShift on Azure'],
+        abstract: 'https://console.redhat.com/openshift/create',
+        timestamp: '2023-08-22T17:01:31.717Z',
+        _version_: 1774949404248113152,
+      },
+      {
+        id: 'hcc-module-/openshift/releases-openshift.releases',
+        view_uri: 'https://console.redhat.com/openshift/releases',
+        documentKind: 'ModuleDefinition',
+        allTitle: 'Releases',
+        bundle: ['openshift'],
+        bundle_title: ['OpenShift'],
+        relative_uri: '/openshift/releases',
+        icons: 'InfrastructureIcon',
+        abstract: 'View general information on the most recent OpenShift Container Platform release versions that you can install.',
+        timestamp: '2023-08-15T10:55:46.769Z',
+        _version_: 1774949404248113152,
+      },
+    ],
+  },
+  highlighting: {
+    'hcc-module-/openshift/create-OPENSHIFT.cluster.create.azure': {
+      abstract: ['https://console.redhat.com/<mark>openshift</mark>/create'],
+      allTitle: ['Azure Red Hat <mark>OpenShift</mark>'],
+      bundle: ['<mark>openshift</mark>'],
+    },
+    'hcc-module-/openshift/releases-openshift.releases': {
+      abstract: [
+        'View general information on the most recent <mark>OpenShift</mark> Container Platform <mark>release</mark> versions that you can install.',
+      ],
+      allTitle: ['<mark>Releases</mark>'],
+      bundle: ['<mark>openshift</mark>'],
+    },
+  },
+};
+
+describe('Search', () => {
+  it('search for openshift services', () => {
+    cy.login();
+    cy.visit('/');
+    cy.intercept(
+      {
+        method: 'GET',
+        url: '**/hydra/rest/search/**',
+      },
+      searchResponse
+    ).as('search');
+    cy.get('.chr-c-search__input').click().type('openshift');
+    cy.wait('@search').its('response.statusCode').should('equal', 200);
+    cy.get('@search.all').should('have.length', 1);
+    cy.screenshot();
+    cy.get('.chr-c-search__input').should('contain', 'Top 2 results');
+    cy.get('.chr-c-search__input .pf-c-menu__list-item').first().should('contain', 'Azure');
+    cy.get('.chr-c-search__input .pf-c-menu__list-item').last().should('contain', 'Releases').click();
+    cy.url().should('contain', '/openshift/releases');
+  });
+});

From 6f1e68cd14137f9c603514574da6f82db1669b6d Mon Sep 17 00:00:00 2001
From: Bryan Florkiewicz <bflorkie@redhat.com>
Date: Thu, 24 Aug 2023 18:59:45 -0400
Subject: [PATCH 09/15] Fix selector

---
 cypress/e2e/release-gate/search.cy.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/cypress/e2e/release-gate/search.cy.tsx b/cypress/e2e/release-gate/search.cy.tsx
index 5e9ea7c521..b88347640b 100644
--- a/cypress/e2e/release-gate/search.cy.tsx
+++ b/cypress/e2e/release-gate/search.cy.tsx
@@ -39,10 +39,8 @@ const searchResponse = {
       bundle: ['<mark>openshift</mark>'],
     },
     'hcc-module-/openshift/releases-openshift.releases': {
-      abstract: [
-        'View general information on the most recent <mark>OpenShift</mark> Container Platform <mark>release</mark> versions that you can install.',
-      ],
-      allTitle: ['<mark>Releases</mark>'],
+      abstract: ['View general information on the most recent <mark>OpenShift</mark> Container Platform release versions that you can install.'],
+      allTitle: ['Releases'],
       bundle: ['<mark>openshift</mark>'],
     },
   },
@@ -64,8 +62,8 @@ describe('Search', () => {
     cy.get('@search.all').should('have.length', 1);
     cy.screenshot();
     cy.get('.chr-c-search__input').should('contain', 'Top 2 results');
-    cy.get('.chr-c-search__input .pf-c-menu__list-item').first().should('contain', 'Azure');
-    cy.get('.chr-c-search__input .pf-c-menu__list-item').last().should('contain', 'Releases').click();
+    cy.get('.chr-c-search__input li').first().should('contain', 'Azure');
+    cy.get('.chr-c-search__input li').last().should('contain', 'Releases').click();
     cy.url().should('contain', '/openshift/releases');
   });
 });

From e0252dcc8438dcfe703209b30c24733358407748 Mon Sep 17 00:00:00 2001
From: Aneela Chagarlamudi <48183451+aneelac22@users.noreply.github.com>
Date: Mon, 28 Aug 2023 07:53:36 -0400
Subject: [PATCH 10/15] Integrate Keycloak in int and scr env (#2609)

* integrate keycloak
Updates to use nav with chrome-service for itless

* expose refreshToken and hide some masthead items

* Don't fetch not needed nav files

* Add stage scr env

* updates for scr

* Refactor to use less flags

* update test

* Fix createchrome for keycloak
---
 src/auth/index.ts                             |  9 +--
 src/bootstrap.tsx                             |  4 +-
 src/chrome/create-chrome.ts                   |  7 ++-
 src/cognito/auth.ts                           |  2 +
 src/components/AppFilter/useAppFilter.test.js |  2 -
 src/components/AppFilter/useAppFilter.ts      | 12 +---
 src/components/Header/Tools.tsx               |  5 +-
 src/components/Header/UserToggle.tsx          |  4 +-
 .../Navigation/ChromeNavExpandable.tsx        | 16 +----
 src/components/Navigation/ChromeNavItem.tsx   |  5 --
 src/components/Routes/Routes.tsx              |  8 +--
 src/jwt/Priv.ts                               |  6 +-
 src/jwt/__mocks__/keycloak-js.ts              |  4 +-
 src/jwt/jwt.ts                                | 25 +++++---
 src/jwt/offline.ts                            | 13 +++-
 src/jwt/user.ts                               | 10 +--
 src/utils/common.ts                           | 32 ++++++++--
 src/utils/consts.ts                           |  5 +-
 src/utils/fetchNavigationFiles.ts             |  8 ++-
 src/utils/useRenderFedramp.ts                 | 61 -------------------
 20 files changed, 94 insertions(+), 144 deletions(-)
 delete mode 100644 src/utils/useRenderFedramp.ts

diff --git a/src/auth/index.ts b/src/auth/index.ts
index 7e0b8ba239..0005a535cb 100644
--- a/src/auth/index.ts
+++ b/src/auth/index.ts
@@ -6,7 +6,7 @@ import { Store } from 'redux';
 
 import * as jwt from '../jwt/jwt';
 import { getTokenWithAuthorizationCode } from '../cognito/auth';
-import { ITLess } from '../utils/common';
+import { ITLessCognito } from '../utils/common';
 import consts, { defaultAuthOptions as defaultOptions } from '../utils/consts';
 import { ACCOUNT_REQUEST_TIMEOUT, ACTIVE_REMOTE_REQUEST, CROSS_ACCESS_ACCOUNT_NUMBER, CROSS_ACCESS_ORG_ID } from '../utils/consts';
 import qe from '../utils/iqeEnablement';
@@ -20,7 +20,7 @@ export type LibJWT = {
 };
 
 const TIMER_STR = '[JWT][jwt.js] Auth time';
-const isITLessEnv = ITLess();
+const isITLessCognito = ITLessCognito();
 function bouncer() {
   if (!jwt.isAuthenticated()) {
     cookie.remove(defaultOptions.cookieName);
@@ -48,6 +48,7 @@ export const createAuthObject = (libjwt: LibJWT, getUser: () => Promise<ChromeUs
   doOffline: () =>
     libjwt.jwt.doOffline(consts.noAuthParam, consts.offlineToken, globalConfig?.chrome?.ssoUrl || globalConfig?.chrome?.config?.ssoUrl),
   getToken: () => libjwt.initPromise.then(() => libjwt.jwt.getUserInfo().then(() => libjwt.jwt.getEncodedToken())),
+  getRefreshToken: () => libjwt.jwt.getRefreshToken(),
   getUser,
   qe: {
     ...qe,
@@ -67,7 +68,7 @@ export const createGetUser = (libjwt: LibJWT): (() => Promise<ChromeUser | undef
 export const createGetUserPermissions = (libJwt: LibJWT, getUser: () => Promise<void | ChromeUser>) => {
   const fetchPermissions = createFetchPermissionsWatcher(getUser);
   return async (app = '', bypassCache?: boolean) => {
-    if (isITLessEnv) {
+    if (isITLessCognito) {
       const cogToken = await getTokenWithAuthorizationCode();
       return fetchPermissions(cogToken || '', app, bypassCache);
     } else {
@@ -98,7 +99,7 @@ export default ({ ssoUrl, ssoScopes }: { ssoUrl?: string; ssoScopes: string[] })
   const promise = jwt.init(options, ssoUrl).then(bouncer);
 
   return {
-    getOfflineToken: () => (isITLessEnv ? getTokenWithAuthorizationCode() : getOfflineToken(options.realm, options.clientId, ssoUrl)),
+    getOfflineToken: () => (isITLessCognito ? getTokenWithAuthorizationCode() : getOfflineToken(options.realm, options.clientId, ssoUrl)),
     jwt: jwt,
     initPromise: promise,
   };
diff --git a/src/bootstrap.tsx b/src/bootstrap.tsx
index ef9bf46525..7c808a97ca 100644
--- a/src/bootstrap.tsx
+++ b/src/bootstrap.tsx
@@ -12,7 +12,7 @@ import { ACTIVE_REMOTE_REQUEST, CROSS_ACCESS_ACCOUNT_NUMBER } from './utils/cons
 import auth, { LibJWT, createGetUserPermissions, crossAccountBouncer } from './auth';
 import sentry from './utils/sentry';
 import registerAnalyticsObserver from './analytics/analyticsObserver';
-import { ITLess, generateRoutesList, getEnv, loadFedModules, noop, trustarcScriptSetup } from './utils/common';
+import { ITLess, ITLessCognito, generateRoutesList, getEnv, loadFedModules, noop, trustarcScriptSetup } from './utils/common';
 import messages from './locales/data.json';
 import ErrorBoundary from './components/ErrorComponents/ErrorBoundary';
 import LibtJWTContext from './components/LibJWTContext';
@@ -135,7 +135,7 @@ const App = () => {
     document.title = `${title}console.redhat.com`;
   }, [documentTitle]);
 
-  if (isITLessEnv) {
+  if (ITLessCognito()) {
     return isReady && modules && scalprumConfig ? (
       <RootApp cookieElement={cookieElement} setCookieElement={setCookieElement} config={scalprumConfig} />
     ) : (
diff --git a/src/chrome/create-chrome.ts b/src/chrome/create-chrome.ts
index 19a61dd2b8..603b60a6c0 100644
--- a/src/chrome/create-chrome.ts
+++ b/src/chrome/create-chrome.ts
@@ -19,7 +19,7 @@ import {
   toggleFeedbackModal,
   toggleGlobalFilter,
 } from '../redux/actions';
-import { ITLess, getEnv, getEnvDetails, isBeta, isProd, updateDocumentTitle } from '../utils/common';
+import { ITLess, ITLessCognito, getEnv, getEnvDetails, isBeta, isProd, updateDocumentTitle } from '../utils/common';
 import { createSupportCase } from '../utils/createCase';
 import debugFunctions from '../utils/debugFunctions';
 import { flatTags } from '../components/GlobalFilter/globalFilterApi';
@@ -99,10 +99,11 @@ export const createChromeContext = ({
   };
 
   const isITLessEnv = ITLess();
+  const isITLessCognito = ITLessCognito();
 
   const api: ChromeAPI = {
     ...actions,
-    auth: isITLessEnv ? createCognitoAuthObject(store) : createAuthObject(libJwt, getUser, store, modulesConfig),
+    auth: isITLessCognito ? createCognitoAuthObject(store) : createAuthObject(libJwt, getUser, store, modulesConfig),
     initialized: true,
     isProd,
     forceDemo: () => Cookies.set('cs_demo', 'true'),
@@ -113,7 +114,7 @@ export const createChromeContext = ({
     getEnvironmentDetails: () => getEnvDetails(),
     createCase: (fields?: any) => getUser().then((user) => createSupportCase(user!.identity, libJwt, fields)),
     getUserPermissions: async (app = '', bypassCache?: boolean) => {
-      if (isITLessEnv) {
+      if (isITLessCognito) {
         const cogToken = await getTokenWithAuthorizationCode();
         return fetchPermissions(cogToken || '', app, bypassCache);
       } else {
diff --git a/src/cognito/auth.ts b/src/cognito/auth.ts
index 7cee76cd8f..2e3bbef17d 100644
--- a/src/cognito/auth.ts
+++ b/src/cognito/auth.ts
@@ -56,6 +56,7 @@ export async function getTokenWithAuthorizationCode() {
 
   const redirectUri = dataConfig?.redirectUri;
   if (!code && !refreshToken) {
+    localStorage.clear();
     window.location.href = loginUrl;
   }
   if (refreshToken) {
@@ -68,6 +69,7 @@ export async function getTokenWithAuthorizationCode() {
         body: `grant_type=refresh_token&client_id=${dataConfig?.ClientId}&refresh_token=${localStorage.getItem('REFRESH_TOKEN')}`,
       });
       if (!response.ok) {
+        localStorage.clear();
         window.location.href = loginUrl;
         throw new Error(`Request failed with status code ${response.status}`);
       }
diff --git a/src/components/AppFilter/useAppFilter.test.js b/src/components/AppFilter/useAppFilter.test.js
index 573b351d7d..9e7f2017da 100644
--- a/src/components/AppFilter/useAppFilter.test.js
+++ b/src/components/AppFilter/useAppFilter.test.js
@@ -368,13 +368,11 @@ describe('useAppFilter', () => {
             appId: 'foo',
             href: '/openshift/subscriptions/foo',
             title: 'subs-nested-ins',
-            isFedramp: false,
           },
           {
             appId: 'foo',
             href: '/insights/subscriptions/foo',
             title: 'subs-nested-o',
-            isFedramp: false,
           },
         ],
         title: 'Subscriptions',
diff --git a/src/components/AppFilter/useAppFilter.ts b/src/components/AppFilter/useAppFilter.ts
index c71dc4b273..6b59cd25dc 100644
--- a/src/components/AppFilter/useAppFilter.ts
+++ b/src/components/AppFilter/useAppFilter.ts
@@ -3,9 +3,8 @@ import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { BundleNavigation, ChromeModule, NavItem } from '../../@types/types';
 import { ReduxState } from '../../redux/store';
-import { ITLess, getChromeStaticPathname, isBeta, isProd } from '../../utils/common';
+import { getChromeStaticPathname, isBeta, isProd } from '../../utils/common';
 import { evaluateVisibility } from '../../utils/isNavItemVisible';
-import { computeFedrampResult } from '../../utils/useRenderFedramp';
 
 export type AppFilterBucket = {
   id: string;
@@ -27,6 +26,8 @@ export const requiredBundles = [
   ...(!isProd() ? previewBundles : isBeta() ? previewBundles : []),
 ];
 
+export const itLessBundles = ['openshift', 'insights', 'settings', 'iam'];
+
 const bundlesOrder = [
   'application-services',
   'openshift',
@@ -41,8 +42,6 @@ const bundlesOrder = [
   'business-services',
 ];
 
-const isITLessEnv = ITLess();
-
 function findModuleByLink(href: string, { modules }: Pick<ChromeModule, 'modules'> = { modules: [] }) {
   const routes = (modules || [])
     .flatMap(({ routes }) => routes.map((route) => (typeof route === 'string' ? route : route.pathname)))
@@ -55,7 +54,6 @@ function getBundleLink({ title, isExternal, href, routes, expandable, ...rest }:
   const subscriptionsLinks: NavItem[] = [];
   let url = href;
   let appId = rest.appId!;
-  let isFedramp = computeFedrampResult(isITLessEnv, url, modules[appId]);
   if (expandable) {
     routes?.forEach(({ href, title, ...rest }) => {
       if (href?.includes('/openshift/cost-management') && rest.filterable !== false) {
@@ -65,7 +63,6 @@ function getBundleLink({ title, isExternal, href, routes, expandable, ...rest }:
       if (rest.filterable !== false && (href?.includes('/insights/subscriptions') || href?.includes('/openshift/subscriptions'))) {
         subscriptionsLinks.push({
           ...rest,
-          isFedramp: false, // openshift and subs are never visible on fedramp.
           href,
           title,
         });
@@ -76,14 +73,12 @@ function getBundleLink({ title, isExternal, href, routes, expandable, ...rest }:
         const truncatedRoute = href.split('/').slice(0, 3).join('/');
         url = isExternal ? href : moduleRoute.length > truncatedRoute.length ? moduleRoute : truncatedRoute;
         appId = rest.appId ? rest.appId : appId;
-        isFedramp = computeFedrampResult(isITLessEnv, url, modules[appId]);
       }
     });
   }
 
   return {
     ...rest,
-    isFedramp,
     appId,
     isExternal,
     title,
@@ -142,7 +137,6 @@ const useAppFilter = () => {
         }, [])
         .flat()
         .map((link) => getBundleLink(link, modules || {}))
-        .filter(({ isFedramp }) => (isITLessEnv ? !!isFedramp : true))
         .filter(({ filterable }) => filterable !== false) || [];
     const bundleLinks: NavItem[] = [];
     const extraLinks: { cost: NavItem[]; subs: NavItem[] } = {
diff --git a/src/components/Header/Tools.tsx b/src/components/Header/Tools.tsx
index f1ebf6b8d0..93d5b460c9 100644
--- a/src/components/Header/Tools.tsx
+++ b/src/components/Header/Tools.tsx
@@ -88,7 +88,7 @@ const Tools = () => {
   const libjwt = useContext(LibtJWTContext);
   const intl = useIntl();
   const location = useLocation();
-  const settingsPath = `/settings/sources`;
+  const settingsPath = isITLessEnv ? `/settings/my-user-access` : `/settings/sources`;
   const identityAndAccessManagmentPath = '/iam/user-access/users';
   const betaSwitcherTitle = `${isBeta() ? intl.formatMessage(messages.stopUsing) : intl.formatMessage(messages.use)} ${intl.formatMessage(
     messages.betaRelease
@@ -148,8 +148,7 @@ const Tools = () => {
     },
     {
       title: `${intl.formatMessage(messages.supportOptions)}`,
-      onClick: () => window.open('https://access.redhat.com/support', '_blank'),
-      isHidden: isITLessEnv,
+      url: isITLessEnv ? 'https://redhatgov.servicenowservices.com/css' : 'https://access.redhat.com/support',
     },
     {
       title: `${intl.formatMessage(messages.insightsRhelDocumentation)}`,
diff --git a/src/components/Header/UserToggle.tsx b/src/components/Header/UserToggle.tsx
index 98ac72ad4e..b04a655c04 100644
--- a/src/components/Header/UserToggle.tsx
+++ b/src/components/Header/UserToggle.tsx
@@ -6,7 +6,7 @@ import { Tooltip } from '@patternfly/react-core/dist/dynamic/components/Tooltip'
 import QuestionCircleIcon from '@patternfly/react-icons/dist/dynamic/icons/question-circle-icon';
 import UserIcon from './UserIcon';
 import { useSelector } from 'react-redux';
-import { ITLess, getEnv, isProd as isProdEnv } from '../../utils/common';
+import { ITLess, ITLessCognito, getEnv, isProd as isProdEnv } from '../../utils/common';
 import ChromeLink from '../ChromeLink/ChromeLink';
 import { useIntl } from 'react-intl';
 import messages from '../../locales/Messages';
@@ -97,7 +97,7 @@ const buildItems = (username = '', isOrgAdmin?: boolean, accountNumber?: string,
         </DropdownItem>
       )}
     </React.Fragment>,
-    <DropdownItem key="logout" component="button" onClick={() => (isITLessEnv ? cogLogout() : logout(true))}>
+    <DropdownItem key="logout" component="button" onClick={() => (ITLessCognito() ? cogLogout() : logout(true))}>
       {intl.formatMessage(messages.logout)}
     </DropdownItem>,
     extraItems,
diff --git a/src/components/Navigation/ChromeNavExpandable.tsx b/src/components/Navigation/ChromeNavExpandable.tsx
index a8fcf5728f..ac570e8c40 100644
--- a/src/components/Navigation/ChromeNavExpandable.tsx
+++ b/src/components/Navigation/ChromeNavExpandable.tsx
@@ -1,29 +1,17 @@
 import React from 'react';
 import { NavExpandable } from '@patternfly/react-core/dist/dynamic/components/Nav';
 import ChromeNavItemFactory from './ChromeNavItemFactory';
-import { useSelector } from 'react-redux';
-import { ITLess } from '../../utils/common';
-import { computeFedrampResult } from '../../utils/useRenderFedramp';
-import { ReduxState } from '../../redux/store';
 import { ChromeNavExpandableProps } from '../../@types/types';
 
 const ChromeNavExpandable = ({ title, routes, active, isHidden, id }: ChromeNavExpandableProps) => {
-  const modules = useSelector((state: ReduxState) => state.chrome.modules);
-  let filteredFedrampRoutes = routes;
-  if (ITLess()) {
-    filteredFedrampRoutes = routes.filter(({ appId, href }) => {
-      return appId && computeFedrampResult(appId, href, modules![appId]);
-    });
-  }
-
-  if (isHidden || filteredFedrampRoutes.filter(({ appId, expandable }) => expandable || !!appId).length === 0) {
+  if (isHidden || routes.filter(({ appId, expandable }) => expandable || !!appId).length === 0) {
     return null;
   }
 
   const quickStartHighlightId = title.replace(/\s/g, '-');
   return (
     <NavExpandable id={id} isExpanded={active} isActive={active} title={title} data-quickstart-id={quickStartHighlightId}>
-      {filteredFedrampRoutes.map((item, index) => (
+      {routes.map((item, index) => (
         <ChromeNavItemFactory key={index} {...item} />
       ))}
     </NavExpandable>
diff --git a/src/components/Navigation/ChromeNavItem.tsx b/src/components/Navigation/ChromeNavItem.tsx
index dcc5733408..c0f4181b31 100644
--- a/src/components/Navigation/ChromeNavItem.tsx
+++ b/src/components/Navigation/ChromeNavItem.tsx
@@ -13,7 +13,6 @@ import get from 'lodash/get';
 import { isBeta } from '../../utils/common';
 import ChromeLink, { LinkWrapperProps } from '../ChromeLink/ChromeLink';
 import { useDispatch, useSelector } from 'react-redux';
-import useRenderFedramp from '../../utils/useRenderFedramp';
 import { markActiveProduct } from '../../redux/actions';
 import { ChromeNavItemProps } from '../../@types/types';
 import useFavoritePagesWrapper from '../../hooks/useFavoritePagesWrapper';
@@ -32,7 +31,6 @@ const ChromeNavItem = ({
   notifier = '',
 }: ChromeNavItemProps) => {
   const hasNotifier = useSelector((state) => get(state, notifier));
-  const renderFedramp = useRenderFedramp(appId, href);
   const dispatch = useDispatch();
   const { favoritePages } = useFavoritePagesWrapper();
   const isFavorited = useMemo(() => favoritePages.find(({ favorite, pathname }) => favorite && pathname === href), [href, favoritePages]);
@@ -42,9 +40,6 @@ const ChromeNavItem = ({
       dispatch(markActiveProduct(product));
     }
   }, [active]);
-  if (renderFedramp !== true) {
-    return null;
-  }
 
   if (isHidden) {
     return null;
diff --git a/src/components/Routes/Routes.tsx b/src/components/Routes/Routes.tsx
index 61a4754c26..8804ecea09 100644
--- a/src/components/Routes/Routes.tsx
+++ b/src/components/Routes/Routes.tsx
@@ -5,7 +5,6 @@ import ChromeRoute from '../ChromeRoute';
 import NotFoundRoute from '../NotFoundRoute';
 import LoadingFallback from '../../utils/loading-fallback';
 import { ReduxState } from '../../redux/store';
-import { ITLess } from '../../utils/common';
 
 const QuickstartCatalogRoute = lazy(() => import('../QuickstartsCatalogRoute'));
 
@@ -44,11 +43,6 @@ const ChromeRoutes = ({ routesProps }: RoutesProps) => {
   const moduleRoutes = useSelector(({ chrome: { moduleRoutes } }: ReduxState) => moduleRoutes);
   const showBundleCatalog = localStorage.getItem('chrome:experimental:quickstarts') === 'true';
 
-  let list = moduleRoutes;
-  if (ITLess()) {
-    list = list.filter((list) => list.isFedramp);
-  }
-
   return (
     <Routes>
       {showBundleCatalog && (
@@ -64,7 +58,7 @@ const ChromeRoutes = ({ routesProps }: RoutesProps) => {
       {redirects.map(({ path, to }) => (
         <Route key={path} path={path} element={<Navigate replace to={to} />} />
       ))}
-      {list.map((app) => (
+      {moduleRoutes.map((app) => (
         <Route key={app.path} path={app.absolute ? app.path : `${app.path}/*`} element={<ChromeRoute {...routesProps} {...app} />} />
       ))}
       <Route path="*" element={<NotFoundRoute />} />
diff --git a/src/jwt/Priv.ts b/src/jwt/Priv.ts
index 0d3d84260a..f82199a789 100644
--- a/src/jwt/Priv.ts
+++ b/src/jwt/Priv.ts
@@ -1,7 +1,7 @@
 import Keycloak, { KeycloakConfig, KeycloakInitOptions, KeycloakLoginOptions, KeycloakLogoutOptions } from 'keycloak-js';
-import { ITLess } from '../utils/common';
+import { ITLessCognito } from '../utils/common';
 
-const isITLessEnv = ITLess();
+const isITLessCognito = ITLessCognito();
 
 export type PrivCookie = {
   cookieName: string;
@@ -112,7 +112,7 @@ class Priv {
 
   updateToken() {
     // 5 is default KC value, min validaty is required by KC byt then has a default value for some reason
-    if (!isITLessEnv) {
+    if (!isITLessCognito) {
       return this._keycloak.updateToken(5);
     }
   }
diff --git a/src/jwt/__mocks__/keycloak-js.ts b/src/jwt/__mocks__/keycloak-js.ts
index 240bcaa5b4..dc170dd4d0 100644
--- a/src/jwt/__mocks__/keycloak-js.ts
+++ b/src/jwt/__mocks__/keycloak-js.ts
@@ -1,5 +1,7 @@
 import cookie from 'js-cookie';
 import { data as encodedToken } from '../../../testdata/encodedToken.json';
+import { ITLessKeycloak } from '../../utils/common';
+
 class Keycloak {
   scope: any;
   token: any;
@@ -30,7 +32,7 @@ class Keycloak {
     this.responseMode = 'fragment';
     this.responseType = 'code';
     this.flow = 'standard';
-    this.clientId = 'cloud-services';
+    this.clientId = ITLessKeycloak() ? 'console-dot' : 'cloud-services';
     this.authServerUrl = 'https://sso.qa.redhat.com/auth';
     this.realm = 'redhat-external';
     this.endpoints = {};
diff --git a/src/jwt/jwt.ts b/src/jwt/jwt.ts
index 9eff1acab6..d526504ea8 100644
--- a/src/jwt/jwt.ts
+++ b/src/jwt/jwt.ts
@@ -4,7 +4,8 @@ import { BroadcastChannel } from 'broadcast-channel';
 import cookie from 'js-cookie';
 import {
   DEFAULT_SSO_ROUTES,
-  ITLess,
+  ITLessCognito,
+  ITLessKeycloak,
   LOGIN_SCOPES_STORAGE_KEY,
   deleteLocalStorageItems,
   getRouterBasename,
@@ -27,7 +28,8 @@ const log = logger('jwt.js');
 const DEFAULT_COOKIE_NAME = 'cs_jwt';
 
 const priv = new Priv();
-const itLessEnv = ITLess();
+const itLessCognito = ITLessCognito();
+const itLessKeycloakEnv = ITLessKeycloak();
 
 enum AllowedPartnerScopes {
   aws = 'aws',
@@ -134,7 +136,7 @@ export const doOffline = (key: string, val: string, configSsoUrl?: string) => {
       scopes.push(partnerScope);
     }
 
-    if (ssoScopes) {
+    if (ssoScopes && !itLessKeycloakEnv) {
       try {
         // make sure add openid scope when custom scope is used
         scopes.push('openid', JSON.parse(ssoScopes));
@@ -168,7 +170,7 @@ export const init = (options: JWTInitOptions, configSsoUrl?: string) => {
   const cookieName = options.cookieName ? options.cookieName : DEFAULT_COOKIE_NAME;
 
   priv.setCookie({ cookieName });
-  if (itLessEnv) {
+  if (itLessCognito) {
     let token;
     let cogUser: CogUser;
 
@@ -197,7 +199,7 @@ export const init = (options: JWTInitOptions, configSsoUrl?: string) => {
     return Promise.resolve(platformUrl(options.routes ? options.routes : DEFAULT_SSO_ROUTES, configSsoUrl)).then((ssoUrl) => {
       //constructor for new Keycloak Object?
       options.url = ssoUrl;
-      options.clientId = 'cloud-services';
+      options.clientId = itLessKeycloakEnv ? 'console-dot' : 'cloud-services';
       options.realm = 'redhat-external';
 
       //options for keycloak.init method
@@ -293,10 +295,10 @@ export function isExistingValid(token?: string) {
 export async function initSuccess() {
   log('JWT Initialized');
   let cogToken;
-  if (itLessEnv) {
+  if (itLessCognito) {
     cogToken = await getTokenWithAuthorizationCode();
   }
-  const token = itLessEnv ? cogToken : priv.getToken();
+  const token = itLessCognito ? cogToken : priv.getToken();
   setCookie(token);
 }
 
@@ -405,6 +407,9 @@ function refreshTokens() {
   setCookie(priv.getToken());
   authChannel.postMessage({ type: 'refresh' });
 }
+export function getRefreshToken() {
+  return priv.getRefershToken();
+}
 
 // Actually update the token
 export function updateToken() {
@@ -445,14 +450,14 @@ export async function setCookie(token?: string) {
   log('Setting the cs_jwt cookie');
   let cogToken;
   let cogUser;
-  if (itLessEnv) {
+  if (itLessCognito) {
     cogToken = await getTokenWithAuthorizationCode();
     cogUser = await getUser();
   }
-  const tok = itLessEnv ? cogToken : token;
+  const tok = itLessCognito ? cogToken : token;
   if (tok && tok.length > 10) {
     // FIXME: Fix cognito typing not to use any
-    const tokExpires = itLessEnv ? cogUser.exp : decodeToken(tok).exp;
+    const tokExpires = itLessCognito ? cogUser.exp : decodeToken(tok).exp;
     const cookieName = priv.getCookie()?.cookieName;
     if (cookieName) {
       setCookieWrapper(`${cookieName}=${tok};` + `path=/wss;` + `secure=true;` + `expires=${getCookieExpires(tokExpires)}`);
diff --git a/src/jwt/offline.ts b/src/jwt/offline.ts
index 3200ff6425..921a916d6f 100644
--- a/src/jwt/offline.ts
+++ b/src/jwt/offline.ts
@@ -1,7 +1,7 @@
 import consts, { OFFLINE_REDIRECT_STORAGE_KEY } from '../utils/consts';
 import insightsUrl from './url';
 import axios, { AxiosResponse } from 'axios';
-import { DEFAULT_SSO_ROUTES } from '../utils/common';
+import { DEFAULT_SSO_ROUTES, ITLessKeycloak, getEnv } from '../utils/common';
 
 type Priv = {
   postbackUrl?: string;
@@ -83,11 +83,18 @@ export function getPostbackUrl() {
 }
 
 export function getPostDataObject(url: string, clientId: string, code: string) {
+  const scr = getEnv() === 'scr';
+  const int = getEnv() === 'int';
+  const redirectUrl = scr
+    ? 'https://console01.stage.openshiftusgov.com/'
+    : int
+    ? 'https://console.int.openshiftusgov.com/'
+    : 'https://ephem.outrights.cc';
   return {
     code: code,
     grant_type: 'authorization_code', // eslint-disable-line camelcase
-    client_id: clientId, // eslint-disable-line camelcase
-    redirect_uri: encodeURIComponent(url.split('#')[0]), // eslint-disable-line camelcase
+    client_id: ITLessKeycloak() ? 'console-dot' : clientId, // eslint-disable-line camelcase
+    redirect_uri: ITLessKeycloak() ? redirectUrl : encodeURIComponent(url.split('#')[0]), // eslint-disable-line camelcase
   };
 }
 
diff --git a/src/jwt/user.ts b/src/jwt/user.ts
index 1538c7ba86..0a4ef036eb 100644
--- a/src/jwt/user.ts
+++ b/src/jwt/user.ts
@@ -1,4 +1,4 @@
-import { ITLess, getRouterBasename, isBeta, isValidAccountNumber, pageAllowsUnentitled } from '../utils/common';
+import { ITLessCognito, getRouterBasename, isBeta, isValidAccountNumber, pageAllowsUnentitled } from '../utils/common';
 import servicesApi from './entitlements';
 import logger from './logger';
 import { SSOParsedToken } from './Priv';
@@ -14,7 +14,7 @@ export type SSOServiceDetails = {
   is_trial: boolean;
 };
 
-const isITLessEnv = ITLess();
+const isITLessCognito = ITLessCognito();
 const bounceInvocationLock: { [service: string]: boolean } = {
   // not_entitled modal should appear only once for insights bundle
   insights: false,
@@ -167,7 +167,7 @@ export function tryBounceIfUnentitled(
 }
 
 export default async (token: SSOParsedToken): Promise<ChromeUser | void> => {
-  const user = isITLessEnv ? await createUser() : buildUser(token);
+  const user = isITLessCognito ? await createUser() : buildUser(token);
 
   const pathName = getWindow().location.pathname.split('/');
   pathName.shift();
@@ -187,12 +187,12 @@ export default async (token: SSOParsedToken): Promise<ChromeUser | void> => {
       };
     } = {};
     // let cogToken;
-    if (isITLessEnv) {
+    if (isITLessCognito) {
       // cogToken = await getTokenWithAuthorizationCode();
     }
     try {
       if (user.identity.org_id) {
-        data = isITLessEnv
+        data = isITLessCognito
           ? ((await serviceAPI.servicesGet()) as unknown as typeof data)
           : ((await serviceAPI.servicesGet()) as unknown as typeof data);
       } else {
diff --git a/src/utils/common.ts b/src/utils/common.ts
index b0c8d49f3b..692669609c 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -38,10 +38,25 @@ export const DEFAULT_SSO_ROUTES = {
     portal: 'https://console.stage.openshiftusgov.com',
   },
   frhStage: {
+    url: ['console.stage.openshiftusgov.com'],
+    sso: 'https://ocm-ra-stage-domain.auth-fips.us-gov-west-1.amazoncognito.com/login',
+    portal: 'https://console.stage.openshiftusgov.com',
+  },
+  ephem: {
     url: ['ephem.outsrights.cc'],
-    sso: 'https://stage-gov-console.auth.us-east-1.amazoncognito.com/login',
+    sso: 'https://keycloak-fips-test.apps.fips-key.2vn8.p1.openshiftapps.com',
     portal: 'https://ephem.outsrights.cc/',
   },
+  int: {
+    url: ['console.int.openshiftusgov.com'],
+    sso: 'https://sso.int.openshiftusgov.com/',
+    portal: 'https://console.int.openshiftusgov.com/',
+  },
+  scr: {
+    url: ['console01.stage.openshiftusgov.com'],
+    sso: 'https://sso01.stage.openshiftusgov.com/',
+    portal: 'https://console01.stage.openshiftusgov.com',
+  },
   dev: {
     url: ['dev.foo.redhat.com', 'console.dev.redhat.com', 'us.console.dev.redhat.com'],
     sso: 'https://sso.redhat.com/auth',
@@ -196,9 +211,17 @@ export function getRouterBasename(pathname?: string) {
 }
 
 export function ITLess() {
+  return getEnv() === 'frh' || getEnv() === 'frhStage' || getEnv() === 'ephem' || getEnv() === 'int' || getEnv() === 'scr';
+}
+
+export function ITLessCognito() {
   return getEnv() === 'frh' || getEnv() === 'frhStage';
 }
 
+export function ITLessKeycloak() {
+  return getEnv() === 'ephem' || getEnv() === 'int' || getEnv() === 'scr';
+}
+
 export function updateDocumentTitle(title?: string, noSuffix = false) {
   const titleSuffix = `| ${useBundle().bundleTitle}`;
   if (typeof title === 'undefined') {
@@ -325,16 +348,18 @@ export const chromeServiceStaticPathname = {
   beta: {
     stage: '/static/beta/stage',
     prod: '/static/beta/prod',
+    itless: '/static/beta/itless',
   },
   stable: {
     stage: '/static/stable/stage',
     prod: '/static/stable/prod',
+    itless: '/static/stable/itless',
   },
 };
 
 export function getChromeStaticPathname(type: 'modules' | 'navigation' | 'services') {
   const stableEnv = isBeta() ? 'beta' : 'stable';
-  const prodEnv = isProd() ? 'prod' : 'stage';
+  const prodEnv = isProd() ? 'prod' : ITLess() ? 'itless' : 'stage';
   return `${CHROME_SERVICE_BASE}${chromeServiceStaticPathname[stableEnv][prodEnv]}/${type}`;
 }
 
@@ -374,7 +399,7 @@ export const loadFedModules = async () =>
 export const generateRoutesList = (modules: { [key: string]: ChromeModule }) =>
   Object.entries(modules)
     .reduce<RouteDefinition[]>(
-      (acc, [scope, { dynamic, manifestLocation, isFedramp, modules = [] }]) => [
+      (acc, [scope, { dynamic, manifestLocation, modules = [] }]) => [
         ...acc,
         ...modules
           .map(({ module, routes }) =>
@@ -382,7 +407,6 @@ export const generateRoutesList = (modules: { [key: string]: ChromeModule }) =>
             routes.map((route) => ({
               scope,
               module,
-              isFedramp: typeof route === 'string' ? isFedramp : route.isFedramp,
               path: typeof route === 'string' ? route : route.pathname,
               manifestLocation,
               dynamic: typeof dynamic === 'boolean' ? dynamic : typeof route === 'string' ? true : route.dynamic,
diff --git a/src/utils/consts.ts b/src/utils/consts.ts
index 3c711d923c..e5c66d79e8 100644
--- a/src/utils/consts.ts
+++ b/src/utils/consts.ts
@@ -1,4 +1,4 @@
-import { ITLess } from './common';
+import { ITLess, ITLessKeycloak } from './common';
 import { AppNavigationCB, ChromeAuthOptions, GenericCB, NavDOMEvent } from '../@types/types';
 import { Listener } from '@redhat-cloud-services/frontend-components-utilities/MiddlewareListener';
 import { APP_NAV_CLICK, GLOBAL_FILTER_UPDATE } from '../redux/action-types';
@@ -63,10 +63,9 @@ export const activationRequestURLs = [
 ];
 
 // Global Defaults
-
 export const defaultAuthOptions: ChromeAuthOptions = {
   realm: 'redhat-external',
-  clientId: 'cloud-services',
+  clientId: ITLessKeycloak() ? 'console-dot' : 'cloud-services',
   cookieName: 'cs_jwt',
 };
 
diff --git a/src/utils/fetchNavigationFiles.ts b/src/utils/fetchNavigationFiles.ts
index 8011017576..45cbabd864 100644
--- a/src/utils/fetchNavigationFiles.ts
+++ b/src/utils/fetchNavigationFiles.ts
@@ -1,13 +1,15 @@
 import axios from 'axios';
 import { BundleNavigation, NavItem, Navigation } from '../@types/types';
 import { Required } from 'utility-types';
-import { requiredBundles } from '../components/AppFilter/useAppFilter';
-import { getChromeStaticPathname, isBeta } from './common';
+import { itLessBundles, requiredBundles } from '../components/AppFilter/useAppFilter';
+import { ITLessKeycloak, getChromeStaticPathname, isBeta } from './common';
 
 export function isBundleNavigation(item: unknown): item is BundleNavigation {
   return typeof item !== 'undefined';
 }
 
+const bundles = ITLessKeycloak() ? itLessBundles : requiredBundles;
+
 export function isNavItems(navigation: Navigation | NavItem[]): navigation is Navigation {
   return Array.isArray((navigation as Navigation).navItems);
 }
@@ -48,7 +50,7 @@ const fetchNavigationFiles = async () => {
   }
 
   filesCache.existingRequest = Promise.all(
-    requiredBundles.map((fragment) =>
+    bundles.map((fragment) =>
       axios
         .get<BundleNavigation>(`${getChromeStaticPathname('navigation')}/${fragment}-navigation.json?ts=${Date.now()}`)
         .catch(() => axios.get<BundleNavigation>(`${isBeta() ? '/beta' : ''}/config/chrome/${fragment}-navigation.json?ts=${Date.now()}`))
diff --git a/src/utils/useRenderFedramp.ts b/src/utils/useRenderFedramp.ts
deleted file mode 100644
index 8e55b5c87e..0000000000
--- a/src/utils/useRenderFedramp.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import { useEffect, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { matchPath } from 'react-router-dom';
-import { ChromeModule } from '../@types/types';
-
-import { ReduxState } from '../redux/store';
-import { ITLess } from './common';
-const isITLessEnv = ITLess();
-
-export const computeFedrampResult = (
-  isITLessEnv: boolean | string,
-  linkHref = '',
-  { modules, isFedramp }: Omit<ChromeModule, 'manifestLocation'> = { modules: [] }
-) => {
-  /**
-   * Render everything on non-fedramp env
-   */
-  if (!isITLessEnv) {
-    return undefined;
-  }
-
-  /**
-   * Look for module routes with fedramp flag that match the link
-   */
-  const configs =
-    modules
-      ?.map(({ routes }) => routes)
-      .flat()
-      .filter((route) => {
-        if (typeof route !== 'object') {
-          return false;
-        }
-
-        const match = matchPath(linkHref, route.pathname);
-
-        return match !== null;
-      })
-      .filter((moduleRoute) => typeof moduleRoute !== 'string' && typeof moduleRoute.isFedramp === 'boolean') || [];
-  const result = configs.length > 0 ? configs.some((moduleRoute) => typeof moduleRoute !== 'string' && moduleRoute.isFedramp === true) : undefined;
-
-  if (typeof result === 'boolean') {
-    return result;
-  }
-  /**
-   * Global module setting has the lowest priority
-   */
-  return isFedramp;
-};
-
-const useRenderFedramp = (appId: string, linkHref: string) => {
-  const module = useSelector(({ chrome: { modules } }: ReduxState) => modules && modules[appId]);
-  const [shouldRender, setShouldRender] = useState(() => computeFedrampResult(isITLessEnv, linkHref, module));
-
-  useEffect(() => {
-    setShouldRender(computeFedrampResult(isITLessEnv, linkHref, module));
-  }, [appId, linkHref]);
-
-  return isITLessEnv ? shouldRender : true;
-};
-
-export default useRenderFedramp;

From 169ef2355ed9cefab146efe3422deed5253fe0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Maro=C5=A1i?= <marvusm.mmi@gmail.com>
Date: Thu, 31 Aug 2023 14:22:13 +0200
Subject: [PATCH 11/15] Use automatic public path for PF assets.

---
 config/webpack.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/webpack.config.js b/config/webpack.config.js
index 21ca19c115..a84daec37a 100644
--- a/config/webpack.config.js
+++ b/config/webpack.config.js
@@ -198,7 +198,7 @@ const pfConfig = {
     path: path.resolve(__dirname, '../build/js/pf'),
     // the HMR needs dynamic entry filename to remove name conflicts
     filename: '[name].js',
-    publicPath: `${publicPath}pf/`,
+    publicPath: `auto`,
   },
   plugins: [new MiniCssExtractPlugin()],
   stats: {

From 5e31031b031f56499ba6b52f8472a6ff8409369f Mon Sep 17 00:00:00 2001
From: lucasgarfield <lucas@redhat.com>
Date: Fri, 18 Aug 2023 09:49:25 +0200
Subject: [PATCH 12/15] Update fetch wrapper in iqeEnablement

The wrapper around fetch in iqeEnablement.ts was dropping headers if a
Request object was passed in as the input argument to fetch. This commit
ensures that if a Request object is passed that the headers are
preserved.

Note that this commit does NOT necessarily ensure full compatibility
with the fetch API... it simply takes one step in that direction by
making sure the headers are preserved.
---
 src/utils/iqeEnablement.ts | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/utils/iqeEnablement.ts b/src/utils/iqeEnablement.ts
index 586b98e176..28511d3ed8 100644
--- a/src/utils/iqeEnablement.ts
+++ b/src/utils/iqeEnablement.ts
@@ -103,10 +103,26 @@ function init(store: Store, libJwt?: () => LibJWT | undefined) {
    * Check response errors for cross_account requests.
    * If we get error response with specific cross account error message, we kick the user out of the corss account session.
    */
-  window.fetch = function fetchReplacement(path = '', options, ...rest) {
+  window.fetch = function fetchReplacement(path: URL | RequestInfo = '', options, ...rest) {
     const tid = Math.random().toString(36);
     const additionalHeaders: any = spreadAdditionalHeaders(options);
 
+    /**
+     * If path is a Request object, it may contain headers. Those headers will be overwritten, not merged,
+     * by the headers property containing the authorization headers and additionalHeaders in options. Therefore,
+     * we need to merge any headers present in the Request object into additionalHeaders.
+     */
+
+    function isRequest(p: URL | RequestInfo): p is Request {
+      return !(p instanceof URL) && typeof p !== 'string';
+    }
+
+    if (isRequest(path)) {
+      for (const pair of path.headers.entries()) {
+        additionalHeaders[pair[0]] = pair[1];
+      }
+    }
+
     const prom = oldFetch.apply(this, [
       path,
       {

From a288fa2772f41ea2ec3389a40b249349632004a5 Mon Sep 17 00:00:00 2001
From: Thomas Lavocat <tlavocat@redhat.com>
Date: Thu, 31 Aug 2023 17:16:10 +0200
Subject: [PATCH 13/15] Update fetch wrapper in iqeEnablement

Make the fetch wrapper compatible with the fetch API as it now exposes
the same interface as fetch is exposing.

To make it work, a Request is created with what is passed as a
parameter to the function. Request is taking the same parameters than
fetch which is quite handy in that case. Once we had a Request object
it can be upgraded with the custom header the way it was done before.
---
 src/utils/iqeEnablement.ts | 33 +++++----------------------------
 1 file changed, 5 insertions(+), 28 deletions(-)

diff --git a/src/utils/iqeEnablement.ts b/src/utils/iqeEnablement.ts
index 28511d3ed8..7bc852009d 100644
--- a/src/utils/iqeEnablement.ts
+++ b/src/utils/iqeEnablement.ts
@@ -103,38 +103,15 @@ function init(store: Store, libJwt?: () => LibJWT | undefined) {
    * Check response errors for cross_account requests.
    * If we get error response with specific cross account error message, we kick the user out of the corss account session.
    */
-  window.fetch = function fetchReplacement(path: URL | RequestInfo = '', options, ...rest) {
+  window.fetch = function fetchReplacement(input: URL | RequestInfo = '', init?: RequestInit | undefined, ...rest) {
     const tid = Math.random().toString(36);
-    const additionalHeaders: any = spreadAdditionalHeaders(options);
+    const request: Request = new Request(input, init);
 
-    /**
-     * If path is a Request object, it may contain headers. Those headers will be overwritten, not merged,
-     * by the headers property containing the authorization headers and additionalHeaders in options. Therefore,
-     * we need to merge any headers present in the Request object into additionalHeaders.
-     */
-
-    function isRequest(p: URL | RequestInfo): p is Request {
-      return !(p instanceof URL) && typeof p !== 'string';
-    }
-
-    if (isRequest(path)) {
-      for (const pair of path.headers.entries()) {
-        additionalHeaders[pair[0]] = pair[1];
-      }
+    if (checkOrigin(input) && libJwt?.()?.jwt.isAuthenticated()) {
+      request.headers.append('Authorization', `Bearer ${libJwt?.()?.jwt.getEncodedToken()}`);
     }
 
-    const prom = oldFetch.apply(this, [
-      path,
-      {
-        ...(options || {}),
-        headers: {
-          // If app wants to set its own Auth header it can do so
-          ...(checkOrigin(path) && libJwt?.()?.jwt.isAuthenticated() && { Authorization: `Bearer ${libJwt?.()?.jwt.getEncodedToken()}` }),
-          ...additionalHeaders,
-        },
-      },
-      ...rest,
-    ]);
+    const prom = oldFetch.apply(this, [request, ...rest]);
     if (iqeEnabled) {
       fetchResults[tid] = arguments[0];
       prom

From f1de4eb358aa65ab252497159695d011536d8f02 Mon Sep 17 00:00:00 2001
From: Karel Hala <khala@redhat.com>
Date: Mon, 4 Sep 2023 16:59:25 +0200
Subject: [PATCH 14/15] Add check not to append Auth header if already present

---
 src/utils/iqeEnablement.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/iqeEnablement.ts b/src/utils/iqeEnablement.ts
index 7bc852009d..f8d4adf27a 100644
--- a/src/utils/iqeEnablement.ts
+++ b/src/utils/iqeEnablement.ts
@@ -107,7 +107,7 @@ function init(store: Store, libJwt?: () => LibJWT | undefined) {
     const tid = Math.random().toString(36);
     const request: Request = new Request(input, init);
 
-    if (checkOrigin(input) && libJwt?.()?.jwt.isAuthenticated()) {
+    if (checkOrigin(input) && libJwt?.()?.jwt.isAuthenticated() && !request.headers.has('Authorization')) {
       request.headers.append('Authorization', `Bearer ${libJwt?.()?.jwt.getEncodedToken()}`);
     }
 

From 4899162c859e933a5d05bcf65e245e10c038e9e3 Mon Sep 17 00:00:00 2001
From: Karel Hala <khala@redhat.com>
Date: Tue, 5 Sep 2023 08:19:10 +0200
Subject: [PATCH 15/15] Use newest stable node version

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c3bc70a41a..3b9b016d9a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,12 @@
 language: node_js
 sudo: required
+dist: jammy
 notifications:
   email: false
   slack:
     secure: 'd3g5oKl5kfzi2L96QTrj2g77lzLWzjnM6Ct2OTXRrk90GxxhwHS8RH4Q1IgBqkQjw68nkq7CNE9oAs+pt3si8kT4GQ164YLoTMVkDPBGOoOoMACPyanxQOEluUfdLEDIzChy/7EdlY3l1J2IM+lOK4e95jUwsT9BSXBsSladP++1EUiZfon9JcQSiSZa0e1/cVxLpEDuBB2cruUSTZ9sUATe/XZ0uH1EGzrooQJMkRgdty5UyNSsMxkvAY0Haivq8u9/gWAsLar0bA/90M5CVK7yohh9fY9UfTUbXVqwR3dFAXuW+SURrFVnPAX4FLZt/D09cg/CVCvoasiZdNi9RAeKOCfN+FoxB2ZJNnuM+4KDJX3dxnatd/stmEH1bcd75i4mh9zOWE1HX5d23HuZ4sKdDPpvhG3l7SpZfhLv0/EKL10ld9RdIaiTO2uPI3rsoyDeArzeV+09+dbB1iPKnS/3/Iw5KLhbew3mdJXKVfRk6KYcJySjT8EltrNy5Y7mty7/JzWssSpIpkMCnu6RGAtXO2v/jUfFm1WvsKK5BeH5efbLi1sjMNbVTeA3Bp8pvRPuw+50l94uDfeQ1HUTrq5zKXMUaG9dTdaYZX4fEDMmrbM1TLudjb9Xj4elaA5ioBH0gRFxAnSVTmrKFtFoCRVaqfmj3ceqxttCLUpkfvI='
 node_js:
-- '16'
+- '18'
 before_install:
 - npm install -g npm@latest
 install:
@@ -38,4 +39,4 @@ env:
 cache:
   directories:
     - "$HOME/.npm"
-    - ".cache"
\ No newline at end of file
+    - ".cache"