-
Notifications
You must be signed in to change notification settings - Fork 12.1k
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: Allow inviting existing users when login form is disabled #19048
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
marefr
approved these changes
Sep 12, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change makes sense 👍
marefr
changed the title
Auth: allow inviting existing users when login form disabled
Auth: Allow inviting existing users when login form is disabled
Sep 12, 2019
@548017 Thank you for contributing to Grafana! |
ryantxu
added a commit
to ryantxu/grafana
that referenced
this pull request
Sep 12, 2019
* grafana/master: toolkit: fix master build, avoid null check (grafana#19055) Auth: Allow inviting existing users when login form is disabled (grafana#19048) MSSQL: Fix memory leak when debug enabled (grafana#19049) Update CONTRIBUTING.md (grafana#19051) Update README.md (grafana#19047) toolkit: pipe execa output to console.stdout (grafana#19052) QueryProcessing: Observable query interface and RxJS for query & stream processing (grafana#18899) Fix exit live mode icon: change back to Stop. (grafana#19043) Loki: Fix vertical alignment issue in label selector (grafana#18943) Fix: Align buttons and label in ToggleButtonGroup (grafana#19036) toolkit: run make for backend plugins (grafana#19029) Explore: Fix auto completion on label values for Loki (grafana#18988) TimeSeries: Replace fieldName with fieldIndex (grafana#19030) DataLinksInput - change the way enter key is handled (grafana#18985) TimeSeries: Add data frame index and field name (grafana#19005) Packages: update versioning and release process (grafana#18195)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it: It allows an Org admin to invite existing users into an Org.
Which issue(s) this PR fixes: #17824
Fixes (#17824)
Special notes for your reviewer:
API already has comprehensive error messages for different flows (user already in org, user not found, etc…) so just delaying the check for setting.DisableLoginForm is enough to fix issue (unless I'm missing something).