IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue 25390 (#25403)

Browse Source
This commit is contained in:
Jesse Hallam
2023-11-10 21:55:33 -04:00
committed by GitHub
parent 10026972b5
commit 48bf4e9bd8
12 changed files with 175 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/channels/api4/saml_test.go
View File

@@ -60,7 +60,7 @@ func TestSamlResetId(t *testing.T) {
th.App.Channels().Saml = &mocks.SamlInterface{}
user := th.BasicUser
_, appErr := th.App.UpdateUserAuth(user.Id, &model.UserAuth{
_, appErr := th.App.UpdateUserAuth(nil, user.Id, &model.UserAuth{
AuthData: model.NewString(model.NewId()),
AuthService: model.UserAuthServiceSaml,
})

2
server/channels/api4/user.go
View File

@@ -1609,7 +1609,7 @@ func updateUserAuth(c *Context, w http.ResponseWriter, r *http.Request) {
auditRec.AddEventPriorState(user)
}
user, err := c.App.UpdateUserAuth(c.Params.UserId, &userAuth)
user, err := c.App.UpdateUserAuth(c.AppContext, c.Params.UserId, &userAuth)
if err != nil {
c.Err = err
return