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: Allow inviting existing users when login form is disabled #19048

Merged
merged 3 commits into from
Sep 12, 2019
Merged

Auth: Allow inviting existing users when login form is disabled #19048

merged 3 commits into from
Sep 12, 2019

Conversation

548017
Copy link
Contributor

@548017 548017 commented Sep 12, 2019

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).

Copy link
Contributor

@marefr marefr left a 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 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
@marefr marefr merged commit 09b434b into grafana:master Sep 12, 2019
@marefr
Copy link
Contributor

marefr commented Sep 12, 2019

@548017 Thank you for contributing to Grafana!

@marefr marefr added this to the 6.4.0-beta1 milestone Sep 12, 2019
ryantxu added a commit that referenced this pull request Sep 12, 2019
…aded

* grafana/master:
  toolkit: fix master build, avoid null check (#19055)
  Auth: Allow inviting existing users when login form is disabled (#19048)
  MSSQL: Fix memory leak when debug enabled (#19049)
  Update CONTRIBUTING.md (#19051)
  Update README.md (#19047)
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)
@ying-jeanne ying-jeanne added the pr/external This PR is from external contributor label Apr 29, 2021
@mihai-satmarean
Copy link

Apologies for tagging a closed issue, but
the error message is not very informative
Captură de ecran din 2023-01-21 la 13 46 57

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
add to changelog pr/external This PR is from external contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants