Skip to content

Conversation

Leo6Leo
Copy link
Contributor

@Leo6Leo Leo6Leo commented Sep 22, 2025

Description

This is a manual backport for the #15434

…howing empty content (openshift#15434)

* fix: add the new auth type under the case that will resolve the issue that the case cannot be found.

* fix: retore to the original version

* fix: wrap AuthenticationErrorPage with HelmetProvider for proper context

* fix: move HelmetProvider to higher up in the tree

* refactor: streamline Helmet usage and remove redundant branding details

* Update frontend/public/components/app.tsx

Co-authored-by: logonoff <[email protected]>

* refactor: use the variable name productName

---------

Co-authored-by: logonoff <[email protected]>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Sep 22, 2025
@openshift-ci-robot
Copy link
Contributor

@Leo6Leo: This pull request references Jira Issue OCPBUGS-62083, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Description

This is a manual backport for the #15434

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Sep 22, 2025
@openshift-ci openshift-ci bot requested review from jhadvig and kyoto September 22, 2025 19:24
@openshift-ci openshift-ci bot added component/core Related to console core functionality kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated labels Sep 22, 2025
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 22, 2025

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Sep 22, 2025
@openshift-ci-robot
Copy link
Contributor

@Leo6Leo: This pull request references Jira Issue OCPBUGS-62083, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.z) matches configured target version for branch (4.19.z)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-60912 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-60912 targets the "4.20.0" version, which is one of the valid target versions: 4.20.0
  • bug has dependents

Requesting review from QA contact:
/cc @yapei

In response to this:

/jira refresh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested a review from yapei September 22, 2025 19:28
@vikram-raj
Copy link
Member

/retest

Copy link
Member

@logonoff logonoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/label backport-risk-assessed

@logonoff
Copy link
Member

/retitle [release-4.19] OCPBUGS-62083: /auth/error?error=missing_state&error_type=auth is showing blank page

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 23, 2025
@openshift-ci openshift-ci bot changed the title [Release-4.19] OCPBUGS-62083: /auth/error?error=missing_state&error_type=auth is showing blank page [release-4.19] OCPBUGS-62083: /auth/error?error=missing_state&error_type=auth is showing blank page Sep 23, 2025
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 23, 2025

/hold

#15511 I think I can merge this PR to this backport? @logonoff

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 23, 2025
@logonoff
Copy link
Member

logonoff commented Sep 23, 2025

#15511 I think I can merge this PR to this backport? @logonoff

Maybe? But I don't want to affect i18n more than needed

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Sep 23, 2025
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 23, 2025

#15511 I think I can merge this PR to this backport? @logonoff

Maybe? But I don't want to affect i18n more than needed

Or I can only fix the button link, since it is redirecting to /logout, which doesn't exist. For that link, currently I'm directing it to /, which is the home page of the dashboard, do you think it is reasonable? Or calling logout function would make more sense? @logonoff @TheRealJon

@logonoff
Copy link
Member

Or I can only fix the button link, since it is redirecting to /logout, which doesn't exist. For that link, currently I'm directing it to /, which is the home page of the dashboard, do you think it is reasonable? Or calling logout function would make more sense? @logonoff @TheRealJon

I think fixing the button link is reasonable here

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 23, 2025

Can I re-get the tags plz? @logonoff @krishagarwal278

@logonoff
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 23, 2025
// When the error type is set as auth
switch (error) {
case 'missing_state':
return t('public~There was an error parsing your state cookie');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

period is missing here

case 'login_state_error':
return t('public~There was an error generating login state.');
case 'cookie_error':
return t('public~There was an error setting login state cookie');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall we update message to include period?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like this one also needs to be updated

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Opps I missed it, thanks for catching that @yapei , updated.

@yapei
Copy link
Contributor

yapei commented Sep 24, 2025

@Leo6Leo It looks like we already have partial change(Try again button redirect link changes) of https://github.com/openshift/console/pull/15511/files here, how about bringing all changes together?
That means we manually backport both #15434 and #15511 changes in this PR, HDYT?

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2025
@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 25, 2025

I have manually merged the backport for both #15434 and #15511 as @yapei suggested. I will do the same for release 4.18, 4.17, 4.16, as the backport process has finished for 4.20. I will update the corresponding Jira issues to keep track the process clearly.

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 25, 2025

For getting lgtm tags:
/cc @logonoff

@openshift-ci openshift-ci bot requested a review from logonoff September 25, 2025 00:17
@Leo6Leo Leo6Leo requested a review from yapei September 25, 2025 02:15
Copy link
Member

@logonoff logonoff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2025
Copy link
Contributor

openshift-ci bot commented Sep 25, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Leo6Leo, logonoff

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 25, 2025

For verification:
@yapei

@yapei
Copy link
Contributor

yapei commented Sep 29, 2025

visit /auth/error?error_type=cookie_error
Screenshot 2025-09-29 at 10 29 04 AM

visit /auth/error?error=missing_state&error_type=auth
Screenshot 2025-09-29 at 10 29 31 AM

@yapei
Copy link
Contributor

yapei commented Sep 29, 2025

/verified by @yapei

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Sep 29, 2025
@openshift-ci-robot
Copy link
Contributor

@yapei: This PR has been marked as verified by @yapei.

In response to this:

/verified by @yapei

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link
Contributor

/retest-required

Remaining retests: 0 against base HEAD 34a9f3b and 2 for PR HEAD b5c402e in total

Copy link
Contributor

openshift-ci bot commented Sep 29, 2025

@Leo6Leo: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-bot openshift-merge-bot bot merged commit c200672 into openshift:release-4.19 Sep 29, 2025
8 checks passed
@openshift-ci-robot
Copy link
Contributor

@Leo6Leo: Jira Issue Verification Checks: Jira Issue OCPBUGS-62083
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-62083 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

Description

This is a manual backport for the #15434

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 openshift-eng/jira-lifecycle-plugin repository.

@Leo6Leo
Copy link
Contributor Author

Leo6Leo commented Sep 29, 2025

/cherry-pick release-4.18

@openshift-cherrypick-robot

@Leo6Leo: #15523 failed to apply on top of branch "release-4.18":

Applying: OCPBUGS-60912: `/auth/error?error=missing_state&error_type=auth` is showing empty content (#15434)
Using index info to reconstruct a base tree...
M	frontend/public/components/app.jsx
M	frontend/public/components/error.tsx
M	frontend/public/locales/en/public.json
Falling back to patching base and 3-way merge...
Auto-merging frontend/public/locales/en/public.json
Auto-merging frontend/public/components/error.tsx
CONFLICT (content): Merge conflict in frontend/public/components/error.tsx
Auto-merging frontend/public/components/app.jsx
CONFLICT (content): Merge conflict in frontend/public/components/app.jsx
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 OCPBUGS-60912: `/auth/error?error=missing_state&error_type=auth` is showing empty content (#15434)

In response to this:

/cherry-pick release-4.18

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.

Leo6Leo added a commit to Leo6Leo/console that referenced this pull request Sep 29, 2025
…9/auth-error-page

[release-4.19] OCPBUGS-62083: `/auth/error?error=missing_state&error_type=auth` is showing blank page
openshift-cherrypick-robot pushed a commit to openshift-cherrypick-robot/console that referenced this pull request Oct 1, 2025
…9/auth-error-page

[release-4.19] OCPBUGS-62083: `/auth/error?error=missing_state&error_type=auth` is showing blank page
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. component/core Related to console core functionality jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants