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

0.6.7 sync #2239

Merged
merged 17 commits into from
Nov 14, 2022
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
users: AddUserToOrg needs GetUserWithHashes or it will remove passwor… (
#2227)

users: AddUserToOrg needs GetUserWithHashes or it will remove password (#2226)

When AddUserToOrg rewrites the user record and local authentication is
in use, it clears the password fields.  We need to use GetUserWithHashes
instead.
  • Loading branch information
jeffmahoney authored and scudette committed Nov 11, 2022
commit 49396d58928ce4a2c18dd3772a1b4e3f514a091c
2 changes: 1 addition & 1 deletion users/add_org.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func AddUserToOrg(
user_manager := services.GetUserManager()

// Hold on to the error until after ACL check
user_record, err := user_manager.GetUser(ctx, username)
user_record, err := user_manager.GetUserWithHashes(ctx, username)
if err != nil {
if err == services.UserNotFoundError &&
options == UseExistingUser {
Expand Down