Add static redirect page to sso and then to requested page #438

aneelac22 · 2024-06-24T14:30:08Z

[RHCLOUD-32115]

openshift-ci · 2024-06-24T14:30:16Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: aneelac22
Once this PR has been reviewed and has the lgtm label, please assign mfrancisc for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2024-06-24T14:30:21Z

Hi @aneelac22. Thanks for your PR.

I'm waiting for a codeready-toolchain member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

pkg/assets/static/redirectpage.js

alexeykazakov · 2024-09-05T23:57:21Z

/ok-to-test

[RHCLOUD-32115]

alexeykazakov · 2024-09-11T23:40:08Z

pkg/assets/static/redirectpage.html

+      </head>
+      <body>
+      </body>
+      <script src="redirectpage.js"></script>


Doesn't seem to be working...

This is what I tried: {baseURL}/redirectpage.html?link="import"
And I expect to get redirected to {consoleURL}/import/ns/alexeykazakov-dev
But the JS failed with:

redirectpage.js:19 Uncaught SyntaxError: Unexpected token 'export' jquery.min.js:14 [Deprecation] Listener added for a 'DOMSubtreeModified' mutation event. Support for this event type has been removed, and this event will no longer be fired. See https://chromestatus.com/feature/5083947249172480 for more information. add @ jquery.min.js:14

alexeykazakov · 2024-09-11T23:47:22Z

redirectpage-tests/README.adoc

+    `${baseUrl}?link="catalogName"&keyword="keyword"&selectedId="selectedId"`
+2. If the user is not authenticated, it redirects to sso page for user to login
+3. Once the user is authenticated it redirects to the page user wants to access which is in the format
+    `${consoleUrl}/${link}/ns/${defaultUserNamespace}?keyword="keyword"&selectedId="selectedId"` with


Hm...
What URL should I use if I want to get redirected to

{consoleURL}/catalog/ns/alexeykazakov-dev?category=databases&selectedId=8ef58d8f-edcc-4284-96bb-5006360b6e73

Where alexeykazakov-dev is my default namespace.
What should I use for keyword to get category=databases as the result?

In the google doc there is no URL with category as a param, Am I missing something?

Yeah, you are rigth.
But could you please clarify what URL should be used to access

{consoleURL}/catalog/ns/alexeykazakov-dev?keyword=jboss&selectedId=openshift-helm-charts--https%3A%2F%2Fgithub.com%2Fopenshift-helm-charts%2Fcharts%2Freleases%2Fdownload%2Fredhat-eap8-1.1.2%2Feap8-1.1.2.tgz

?
Should we use

{baseURL}/redirectpage.html?link="catalog"&keyword=jboss&selectedId=openshift-helm-charts--https%3A%2F%2Fgithub.com%2Fopenshift-helm-charts%2Fcharts%2Freleases%2Fdownload%2Fredhat-eap8-1.1.2%2Feap8-1.1.2.tgz

?

Yes, that is correct

alexeykazakov

Still not working for me :(
See my comments below. Please let me know if you need any help with setting up dev environment (see this comment in JIRA) so you can properly test it localy.

alexeykazakov · 2024-09-18T23:01:51Z

pkg/assets/static/redirectpage.js

+const link = urlParams.get("link");
+const keyword = urlParams.get("keyword");
+const selectedId = urlParams.get("selectedId");
+const consoleUrlMock = "https://console.redhat.com/openshift/sandbox";


Instead of hardcoding this consleURL (and why it's called consoleUrlMock btw?) let's load it from the config (/api/v1/authconfig)
So let's maybe do the following:

rename consoleUrlMock to something like signupURL.

try to load it from configURL JSON as signup-url.

if there is no signup-url defined in the config payload JSON then fall back to the default value (which is just the base URL: /)

We, the dev sandbox team, will add https://console.redhat.com/openshift/sandbox to the config API for our production sandbox.

We, the dev sandbox team, will add https://console.redhat.com/openshift/sandbox to the config API for our production sandbox.

See #464

alexeykazakov · 2024-09-18T23:15:46Z

pkg/assets/static/redirectpage.js

+async function getRedirectData() {
+  const xhr = new XMLHttpRequest();
+
+  xhr.open("GET", registrationURL, true);


Hm... I don't actually see in my browser any requests to "/api/v1/signup". This is what I see instead:

redirectpage.html redirects to sso (expected)

then it redirects to console.openshift.com/sandbox even if I already have an account in dev sandobx. So it doesn't seem to actually check /api/v1/signup unless I'm missing something. But anyway, no matter what I do I always end up in console.openshift.com

alexeykazakov · 2024-09-18T23:20:33Z

pkg/assets/static/redirectpage.js

+          handleError();
+        }
+      } else {
+        handleError();


If the signup api returns 404 it's not an error actually. It just means that user has to sign up first. So I wouldn't mix it with other cases when something went wrong.
And yes, in case of 404 we should redirect to the signup URL but we also need to redirect back to the redirectpage after user signs up successfully. See https://issues.redhat.com/browse/RHCLOUD-32115?focusedId=24554951&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-24554951 for details.
The redirect param is not currently supported in HCC but we can add this to our internal landing page for now and later add it to HCC too.

sonarcloud · 2024-10-01T06:53:31Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

openshift-ci bot added the do-not-merge/work-in-progress label Jun 24, 2024

openshift-ci bot added the needs-ok-to-test label Jun 24, 2024

alexeykazakov reviewed Jun 25, 2024

View reviewed changes

pkg/assets/static/redirectpage.js Outdated Show resolved Hide resolved

aneelac22 force-pushed the feature/RHCLOUD-32115 branch 3 times, most recently from 5727a5a to 93c5126 Compare August 13, 2024 14:06

aneelac22 marked this pull request as ready for review August 14, 2024 07:26

aneelac22 requested review from xcoulon, rajivnathan, ranakan19, sbryzak and mfrancisc as code owners August 14, 2024 07:26

openshift-ci bot removed the do-not-merge/work-in-progress label Aug 14, 2024

openshift-ci bot requested a review from MatousJobanek August 14, 2024 07:26

aneelac22 force-pushed the feature/RHCLOUD-32115 branch from 93c5126 to 2f333d5 Compare August 20, 2024 11:01

aneelac22 force-pushed the feature/RHCLOUD-32115 branch 3 times, most recently from 35a935a to 99c96c2 Compare September 3, 2024 09:45

aneelac22 requested a review from alexeykazakov September 3, 2024 09:51

openshift-ci bot added ok-to-test and removed needs-ok-to-test labels Sep 5, 2024

aneelac22 added 3 commits September 10, 2024 12:51

Add static redirect page to sso and then to requested page

37075cd

[RHCLOUD-32115]

Add documentation and tests

7ce0f44

updates for build

9d16ff1

aneelac22 force-pushed the feature/RHCLOUD-32115 branch from f75e520 to 9d16ff1 Compare September 10, 2024 10:52

Fix sonar reported issues

5359ec4

aneelac22 force-pushed the feature/RHCLOUD-32115 branch from 6acf10d to 5359ec4 Compare September 11, 2024 08:17

alexeykazakov reviewed Sep 11, 2024

View reviewed changes

Updates to fix ES6 export failure

c00ec62

alexeykazakov reviewed Sep 18, 2024

View reviewed changes

alexeykazakov mentioned this pull request Sep 20, 2024

Add signup URL to authconfig payload #464

Merged

Merge branch 'master' into feature/RHCLOUD-32115

c2e35fb

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add static redirect page to sso and then to requested page #438

Add static redirect page to sso and then to requested page #438

aneelac22 commented Jun 24, 2024

openshift-ci bot commented Jun 24, 2024

openshift-ci bot commented Jun 24, 2024

alexeykazakov commented Sep 5, 2024

alexeykazakov Sep 11, 2024

alexeykazakov Sep 11, 2024

aneelac22 Sep 16, 2024 •

edited

Loading

alexeykazakov Sep 18, 2024 •

edited

Loading

aneelac22 Sep 18, 2024

aneelac22 Sep 18, 2024

alexeykazakov left a comment

alexeykazakov Sep 18, 2024

alexeykazakov Sep 20, 2024

alexeykazakov Sep 18, 2024

alexeykazakov Sep 18, 2024

sonarcloud bot commented Oct 1, 2024

Add static redirect page to sso and then to requested page #438

Are you sure you want to change the base?

Add static redirect page to sso and then to requested page #438

Conversation

aneelac22 commented Jun 24, 2024

openshift-ci bot commented Jun 24, 2024

openshift-ci bot commented Jun 24, 2024

alexeykazakov commented Sep 5, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

aneelac22 Sep 16, 2024 • edited Loading

Choose a reason for hiding this comment

alexeykazakov Sep 18, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alexeykazakov left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Oct 1, 2024

Quality Gate passed

aneelac22 Sep 16, 2024 •

edited

Loading

alexeykazakov Sep 18, 2024 •

edited

Loading