Skip to content
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

Auth: Show user sync external Authentication status #62721

Merged
merged 5 commits into from Mar 15, 2023
Merged

Auth: Show user sync external Authentication status #62721

merged 5 commits into from Mar 15, 2023

Conversation

lokeswaran-aj
Copy link
Contributor

@lokeswaran-aj lokeswaran-aj commented Feb 1, 2023

What is this feature?
related #56189.
Checks if user is sign in with external authentication and show Synced via [authenticator] text beside Change role button.

Why do we need this feature?
When assigning roles for users in Grafana that have been synced via an external auth provider it clearly says the admin why he/she could not change the role of the user.

Which issue(s) does this PR fix?:
related #56189

Fixes #

Special notes for your reviewer:

@lokeswaran-aj lokeswaran-aj requested a review from a team as a code owner February 1, 2023 18:54
@lokeswaran-aj lokeswaran-aj requested review from vtorosyan and alexanderzobnin and removed request for a team February 1, 2023 18:54
@CLAassistant
Copy link

CLAassistant commented Feb 1, 2023

CLA assistant check
All committers have signed the CLA.

@grafanabot grafanabot added pr/external This PR is from external contributor area/frontend labels Feb 1, 2023
@grafanabot
Copy link
Contributor

This pull request has been automatically marked as stale because it has not had activity in the last 30 days. It will be closed in 2 weeks if no further activity occurs. Please feel free to give a status update now, ping for review, or re-open when it's ready. Thank you for your contributions!

@grafanabot grafanabot added the stale Issue with no recent activity label Mar 5, 2023
@Jguer Jguer added this to the 9.5.0 milestone Mar 13, 2023
@Jguer Jguer added add to changelog no-backport Skip backport of PR and removed stale Issue with no recent activity labels Mar 13, 2023
@Jguer Jguer changed the title Auth: show users synced through external Authentication Auth: Show user sync external Authentication status Mar 13, 2023
@Jguer
Copy link
Contributor

Jguer commented Mar 13, 2023

Hey @lokeswaran-aj , we are interested in merging your PR

can we move to the option 1 you proposed?

image

@Jguer Jguer self-requested a review March 13, 2023 17:06
@lokeswaran-aj
Copy link
Contributor Author

@Jguer I have updated the branch to the latest commit. I could not remember the context, what do you mean by option 1?

@Jguer
Copy link
Contributor

Jguer commented Mar 14, 2023

The tooltip on the right of the "Synced via x" instead of on the left 🙂

@lokeswaran-aj
Copy link
Contributor Author

@Jguer Sure, will update the code and push the code

@lokeswaran-aj
Copy link
Contributor Author

@Jguer update the code and pushed it, now you can review and merge this branch
When authenticated using Oauth2:
Screenshot 2023-03-14 at 10 15 22 PM

When authenticated with email and password:
Screenshot 2023-03-14 at 10 15 14 PM

@Jguer
Copy link
Contributor

Jguer commented Mar 15, 2023

Hey @lokeswaran-aj , I've made some small tweaks to account for licensed AC. We'll be merging this, thanks for your contribution 😄

licensed AC after changes:

synced:
image

unsynced:

image

OSS AC:

synced:
image

unsynced:
image

@Jguer Jguer merged commit d2fa019 into grafana:main Mar 15, 2023
6 checks passed
@lokeswaran-aj lokeswaran-aj deleted the fix-external-synced-user branch March 15, 2023 16:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog area/frontend no-backport Skip backport of PR pr/external This PR is from external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants