Skip to content

fix(common-auth): current user cannot be disabled #1852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2025

Conversation

karelhala
Copy link
Contributor

@karelhala karelhala commented Jun 6, 2025

Description

If logged in user disables itself and is last org admin they have to contact redhat in order to re-enable the account back. API doesn't have a check for this for now and so users could block themselves from accessing any redhat app. This PR checks if external ID is the same as currently logged in user's account ID and if so disable the option to disable / enable user activity.

RHCLOUD-40473


Screenshots

Before:

Screenshot 2025-06-06 at 11 01 33

After:

Screenshot 2025-06-06 at 11 01 03


Checklist ☑️

  • PR only fixes one issue or story
  • Change reviewed for extraneous code
  • UI best practices adhered to
  • Commits squashed and meaningfully named
  • All PR checks pass locally (build, lint, test, E2E)

  • [-] (Optional) QE: Needs QE attention (OUIA changed, perceived impact to tests, no test coverage)
  • [-] (Optional) QE: Has been mentioned
  • [-] (Optional) UX: Needs UX attention (end user UX modified, missing designs)
  • [-] (Optional) UX: Has been mentioned

Summary by Sourcery

Bug Fixes:

  • Disable the active/inactive switch for the currently authenticated user to avoid self-deactivation blocking access.

@karelhala karelhala requested a review from a team as a code owner June 6, 2025 09:04
Copy link
Contributor

sourcery-ai bot commented Jun 6, 2025

Reviewer's Guide

Disable the activation toggle for the currently logged-in user by integrating the frontend auth context and binding a disable state to the switch, preventing users from locking themselves out.

File-Level Changes

Change Details Files
Prevent users from disabling their own account
  • Retrieve current username via useChrome auth.getUser inside useEffect
  • Maintain an isDisabled state through useState based on username comparison
  • Pass isDisabled prop to the PatternFly Switch to disable the toggle for the current user
src/smart-components/user/ActivateToggle.tsx

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@karelhala karelhala force-pushed the fix-activate-curr-user branch from cb7917e to 0bd9092 Compare June 6, 2025 09:05
Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

Hey @karelhala - I've reviewed your changes - here's some feedback:

  • Consider moving the current username fetch out of each ActivateToggle into a parent/context so you don’t call auth.getUser for every row (and avoid flicker/performance hits).
  • Initialize isDisabled to a boolean (e.g. false) instead of undefined to prevent the Switch from being in an indeterminate state before the async effect resolves.
  • Use strict equality (===) when comparing user.username and the fetched username to avoid unintended type coercion.
Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

Comment on lines 16 to 22
useEffect(() => {
const getUser = async () => {
const username = (await auth.getUser())?.identity?.user?.username as string;
setIsDisabled(user.username == username);
};
getUser();
}, [auth]);
Copy link
Contributor

Choose a reason for hiding this comment

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

issue (bug_risk): Include user.username in the dependency array

Since isDisabled depends on user.username, include it in the dependency array to ensure the effect updates when user changes.

@karelhala karelhala force-pushed the fix-activate-curr-user branch from 0bd9092 to 3f01099 Compare June 6, 2025 11:25
Copy link
Contributor

@Hyperkid123 Hyperkid123 left a comment

Choose a reason for hiding this comment

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

Code looks good. Do we need some tooltip or message? Is it clear to the user what they have to do?

@karelhala karelhala force-pushed the fix-activate-curr-user branch from 3f01099 to 838e29d Compare June 6, 2025 11:39
@karelhala
Copy link
Contributor Author

@Hyperkid123 good point on the tooltip. The option to mark user as org admin or not is disabled as well. Let's see if customers will want some tooltip or not.

FYI I've changed the logic as username felt too britle (users can change their username) so I'm comparing external source ID and account ID.

@karelhala karelhala merged commit e1af3a1 into RedHatInsights:master Jun 6, 2025
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants