mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Migrate store methods to use request.Context instead of context.Context (#24836)

Просмотр исходного кода
Этот коммит содержится в:
Ben Schumacher
2023-10-11 13:08:55 +02:00
коммит произвёл GitHub
родитель 0d5a8b8841
Коммит 13c05a571f
127 изменённых файлов: 1030 добавлений и 921 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
server/channels/api4/apitestlib.go
Просмотреть файл

@@ -1175,7 +1175,7 @@ func (th *TestHelper) MakeUserChannelAdmin(user *model.User, channel *model.Chan
}
func (th *TestHelper) UpdateUserToTeamAdmin(user *model.User, team *model.Team) {
if tm, err := th.App.Srv().Store().Team().GetMember(context.Background(), team.Id, user.Id); err == nil {
if tm, err := th.App.Srv().Store().Team().GetMember(th.Context, team.Id, user.Id); err == nil {
tm.SchemeAdmin = true
if _, err = th.App.Srv().Store().Team().UpdateMember(tm); err != nil {
panic(err)
@@ -1186,7 +1186,7 @@ func (th *TestHelper) UpdateUserToTeamAdmin(user *model.User, team *model.Team)
}
func (th *TestHelper) UpdateUserToNonTeamAdmin(user *model.User, team *model.Team) {
if tm, err := th.App.Srv().Store().Team().GetMember(context.Background(), team.Id, user.Id); err == nil {
if tm, err := th.App.Srv().Store().Team().GetMember(th.Context, team.Id, user.Id); err == nil {
tm.SchemeAdmin = false
if _, err = th.App.Srv().Store().Team().UpdateMember(tm); err != nil {
panic(err)

8
server/channels/api4/channel.go
Просмотреть файл

@@ -465,7 +465,7 @@ func createDirectChannel(c *Context, w http.ResponseWriter, r *http.Request) {
audit.AddEventParameter(auditRec, "user_id", otherUserId)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, otherUserId)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, otherUserId)
if err != nil {
c.Err = err
return
@@ -546,7 +546,7 @@ func createGroupChannel(c *Context, w http.ResponseWriter, r *http.Request) {
canSeeAll := true
for _, id := range userIds {
if c.AppContext.Session().UserId != id {
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, id)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, id)
if err != nil {
c.Err = err
return
@@ -1110,7 +1110,7 @@ func searchChannelsForTeam(c *Context, w http.ResponseWriter, r *http.Request) {
channels, appErr = c.App.SearchChannels(c.AppContext, c.Params.TeamId, props.Term)
} else {
// If the user is not a team member, return a 404
if _, appErr = c.App.GetTeamMember(c.Params.TeamId, c.AppContext.Session().UserId); appErr != nil {
if _, appErr = c.App.GetTeamMember(c.AppContext, c.Params.TeamId, c.AppContext.Session().UserId); appErr != nil {
c.Err = appErr
return
}
@@ -1149,7 +1149,7 @@ func searchArchivedChannelsForTeam(c *Context, w http.ResponseWriter, r *http.Re
channels, appErr = c.App.SearchArchivedChannels(c.AppContext, c.Params.TeamId, props.Term, c.AppContext.Session().UserId)
} else {
// If the user is not a team member, return a 404
if _, appErr = c.App.GetTeamMember(c.Params.TeamId, c.AppContext.Session().UserId); appErr != nil {
if _, appErr = c.App.GetTeamMember(c.AppContext, c.Params.TeamId, c.AppContext.Session().UserId); appErr != nil {
c.Err = appErr
return
}

4
server/channels/api4/emoji.go
Просмотреть файл

@@ -52,7 +52,7 @@ func createEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
defer c.LogAuditRec(auditRec)
// Allow any user with CREATE_EMOJIS permission at Team level to create emojis at system level
memberships, err := c.App.GetTeamMembersForUser(c.AppContext.Session().UserId, "", true)
memberships, err := c.App.GetTeamMembersForUser(c.AppContext, c.AppContext.Session().UserId, "", true)
if err != nil {
c.Err = err
@@ -144,7 +144,7 @@ func deleteEmoji(c *Context, w http.ResponseWriter, r *http.Request) {
auditRec.AddEventObjectType("emoji")
// Allow any user with DELETE_EMOJIS permission at Team level to delete emojis at system level
memberships, err := c.App.GetTeamMembersForUser(c.AppContext.Session().UserId, "", true)
memberships, err := c.App.GetTeamMembersForUser(c.AppContext, c.AppContext.Session().UserId, "", true)
if err != nil {
c.Err = err

8
server/channels/api4/group.go
Просмотреть файл

@@ -109,7 +109,7 @@ func getGroup(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -686,7 +686,7 @@ func getGroupMembers(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -1061,7 +1061,7 @@ func getGroups(c *Context, w http.ResponseWriter, r *http.Request) {
opts.Since = since
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -1073,7 +1073,7 @@ func getGroups(c *Context, w http.ResponseWriter, r *http.Request) {
)
if opts.FilterHasMember != "" {
canSee, appErr = c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, opts.FilterHasMember)
canSee, appErr = c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, opts.FilterHasMember)
if appErr != nil {
c.Err = appErr
return

6
server/channels/api4/post_test.go
Просмотреть файл

@@ -425,7 +425,7 @@ func TestCreatePostWithOAuthClient(t *testing.T) {
})
require.Nil(t, appErr, "should create an OAuthApp")
session, appErr := th.App.CreateSession(&model.Session{
session, appErr := th.App.CreateSession(th.Context, &model.Session{
UserId: th.BasicUser.Id,
Token: "token",
IsOAuth: true,
@@ -763,7 +763,7 @@ func TestCreatePostPublic(t *testing.T) {
th.App.UpdateUserRoles(th.Context, ruser.Id, model.SystemUserRoleId, false)
th.App.JoinUserToTeam(th.Context, th.BasicTeam, ruser, "")
th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, model.TeamUserRoleId+" "+model.TeamPostAllPublicRoleId)
th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, model.TeamUserRoleId+" "+model.TeamPostAllPublicRoleId)
th.App.Srv().InvalidateAllCaches()
client.Login(context.Background(), user.Email, user.Password)
@@ -816,7 +816,7 @@ func TestCreatePostAll(t *testing.T) {
th.App.UpdateUserRoles(th.Context, ruser.Id, model.SystemUserRoleId, false)
th.App.JoinUserToTeam(th.Context, th.BasicTeam, ruser, "")
th.App.UpdateTeamMemberRoles(th.BasicTeam.Id, ruser.Id, model.TeamUserRoleId+" "+model.TeamPostAllRoleId)
th.App.UpdateTeamMemberRoles(th.Context, th.BasicTeam.Id, ruser.Id, model.TeamUserRoleId+" "+model.TeamPostAllRoleId)
th.App.Srv().InvalidateAllCaches()
client.Login(context.Background(), user.Email, user.Password)

6
server/channels/api4/resolver.go
Просмотреть файл

@@ -151,7 +151,7 @@ func (r *resolver) TeamMembers(ctx context.Context, args struct {
return nil, c.Err
}
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, args.UserID)
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, args.UserID)
if appErr != nil {
return nil, appErr
}
@@ -167,7 +167,7 @@ func (r *resolver) TeamMembers(ctx context.Context, args struct {
return nil, c.Err
}
tm, appErr2 := c.App.GetTeamMember(args.TeamID, args.UserID)
tm, appErr2 := c.App.GetTeamMember(c.AppContext, args.TeamID, args.UserID)
if appErr2 != nil {
return nil, appErr2
}
@@ -181,7 +181,7 @@ func (r *resolver) TeamMembers(ctx context.Context, args struct {
}
// Do not return archived team members
members, appErr := c.App.GetTeamMembersForUser(args.UserID, excludeTeamID, false)
members, appErr := c.App.GetTeamMembersForUser(c.AppContext, args.UserID, excludeTeamID, false)
if appErr != nil {
return nil, appErr
}

4
server/channels/api4/resolver_user.go
Просмотреть файл

@@ -139,7 +139,7 @@ func (u *user) Sessions(ctx context.Context) ([]*model.Session, error) {
return nil, c.Err
}
sessions, appErr := c.App.GetSessions(u.Id)
sessions, appErr := c.App.GetSessions(c.AppContext, u.Id)
if appErr != nil {
return nil, appErr
}
@@ -183,7 +183,7 @@ func getGraphQLUsers(c *web.Context, userIDs []string) ([]*model.User, error) {
// and cached for the rest of the query. So it's not an issue
// to run this in a loop.
for _, id := range userIDs {
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, id)
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, id)
if appErr != nil || !canSee {
c.SetPermissionError(model.PermissionViewMembers)
return nil, c.Err

20
server/channels/api4/team.go
Просмотреть файл

@@ -537,7 +537,7 @@ func getTeamMember(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, c.Params.UserId)
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, c.Params.UserId)
if appErr != nil {
c.Err = appErr
return
@@ -548,7 +548,7 @@ func getTeamMember(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
team, appErr := c.App.GetTeamMember(c.Params.TeamId, c.Params.UserId)
team, appErr := c.App.GetTeamMember(c.AppContext, c.Params.TeamId, c.Params.UserId)
if appErr != nil {
c.Err = appErr
return
@@ -574,7 +574,7 @@ func getTeamMembers(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -612,7 +612,7 @@ func getTeamMembersForUser(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, c.Params.UserId)
canSee, appErr := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, c.Params.UserId)
if appErr != nil {
c.Err = appErr
return
@@ -623,7 +623,7 @@ func getTeamMembersForUser(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
members, appErr := c.App.GetTeamMembersForUser(c.Params.UserId, "", true)
members, appErr := c.App.GetTeamMembersForUser(c.AppContext, c.Params.UserId, "", true)
if appErr != nil {
c.Err = appErr
return
@@ -656,7 +656,7 @@ func getTeamMembersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -1007,7 +1007,7 @@ func getTeamStats(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, err := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, err := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if err != nil {
c.Err = err
return
@@ -1047,7 +1047,7 @@ func updateTeamMemberRoles(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
teamMember, err := c.App.UpdateTeamMemberRoles(c.Params.TeamId, c.Params.UserId, newRoles)
teamMember, err := c.App.UpdateTeamMemberRoles(c.AppContext, c.Params.TeamId, c.Params.UserId, newRoles)
if err != nil {
c.Err = err
return
@@ -1081,7 +1081,7 @@ func updateTeamMemberSchemeRoles(c *Context, w http.ResponseWriter, r *http.Requ
return
}
teamMember, err := c.App.UpdateTeamMemberSchemeRoles(c.Params.TeamId, c.Params.UserId, schemeRoles.SchemeGuest, schemeRoles.SchemeUser, schemeRoles.SchemeAdmin)
teamMember, err := c.App.UpdateTeamMemberSchemeRoles(c.AppContext, c.Params.TeamId, c.Params.UserId, schemeRoles.SchemeGuest, schemeRoles.SchemeUser, schemeRoles.SchemeAdmin)
if err != nil {
c.Err = err
return
@@ -1235,7 +1235,7 @@ func teamExists(c *Context, w http.ResponseWriter, r *http.Request) {
if team != nil {
var teamMember *model.TeamMember
teamMember, err = c.App.GetTeamMember(team.Id, c.AppContext.Session().UserId)
teamMember, err = c.App.GetTeamMember(c.AppContext, team.Id, c.AppContext.Session().UserId)
if err != nil && err.StatusCode != http.StatusNotFound {
c.Err = err
return

48
server/channels/api4/user.go
Просмотреть файл

@@ -182,7 +182,7 @@ func getUser(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, c.Params.UserId)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, c.Params.UserId)
if err != nil {
c.SetPermissionError(model.PermissionViewMembers)
return
@@ -238,7 +238,7 @@ func getUserByUsername(c *Context, w http.ResponseWriter, r *http.Request) {
user, err := c.App.GetUserByUsername(c.Params.Username)
if err != nil {
restrictions, err2 := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, err2 := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if err2 != nil {
c.Err = err2
return
@@ -251,7 +251,7 @@ func getUserByUsername(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, user.Id)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, user.Id)
if err != nil {
c.Err = err
return
@@ -306,7 +306,7 @@ func getUserByEmail(c *Context, w http.ResponseWriter, r *http.Request) {
user, err := c.App.GetUserByEmail(c.Params.Email)
if err != nil {
restrictions, err2 := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, err2 := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if err2 != nil {
c.Err = err2
return
@@ -319,7 +319,7 @@ func getUserByEmail(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, user.Id)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, user.Id)
if err != nil {
c.Err = err
return
@@ -349,7 +349,7 @@ func getDefaultProfileImage(c *Context, w http.ResponseWriter, r *http.Request)
return
}
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, c.Params.UserId)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, c.Params.UserId)
if err != nil {
c.Err = err
return
@@ -383,7 +383,7 @@ func getProfileImage(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext.Session().UserId, c.Params.UserId)
canSee, err := c.App.UserCanSeeOtherUser(c.AppContext, c.AppContext.Session().UserId, c.Params.UserId)
if err != nil {
c.Err = err
return
@@ -538,7 +538,7 @@ func getTotalUsersStats(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, err := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, err := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if err != nil {
c.Err = err
return
@@ -769,7 +769,7 @@ func getUsers(c *Context, w http.ResponseWriter, r *http.Request) {
}
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -906,7 +906,7 @@ func getUsers(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
} else {
userGetOptions, appErr = c.App.RestrictUsersGetByPermissions(c.AppContext.Session().UserId, userGetOptions)
userGetOptions, appErr = c.App.RestrictUsersGetByPermissions(c.AppContext, c.AppContext.Session().UserId, userGetOptions)
if appErr != nil {
c.Err = appErr
return
@@ -979,7 +979,7 @@ func getUsersByIds(c *Context, w http.ResponseWriter, r *http.Request) {
options.Since = since
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -1009,7 +1009,7 @@ func getUsersByNames(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext.Session().UserId)
restrictions, appErr := c.App.GetViewUsersRestrictions(c.AppContext, c.AppContext.Session().UserId)
if appErr != nil {
c.Err = appErr
return
@@ -1124,7 +1124,7 @@ func searchUsers(c *Context, w http.ResponseWriter, r *http.Request) {
options.AllowFullNames = *c.App.Config().PrivacySettings.ShowFullName
}
options, appErr := c.App.RestrictUsersSearchByPermissions(c.AppContext.Session().UserId, options)
options, appErr := c.App.RestrictUsersSearchByPermissions(c.AppContext, c.AppContext.Session().UserId, options)
if appErr != nil {
c.Err = appErr
return
@@ -1187,7 +1187,7 @@ func autocompleteUsers(c *Context, w http.ResponseWriter, r *http.Request) {
var autocomplete model.UserAutocomplete
var err *model.AppError
options, err = c.App.RestrictUsersSearchByPermissions(c.AppContext.Session().UserId, options)
options, err = c.App.RestrictUsersSearchByPermissions(c.AppContext, c.AppContext.Session().UserId, options)
if err != nil {
c.Err = err
return
@@ -2081,7 +2081,7 @@ func Logout(c *Context, w http.ResponseWriter, r *http.Request) {
c.RemoveSessionCookie(w, r)
if c.AppContext.Session().Id != "" {
if err := c.App.RevokeSessionById(c.AppContext.Session().Id); err != nil {
if err := c.App.RevokeSessionById(c.AppContext, c.AppContext.Session().Id); err != nil {
c.Err = err
return
}
@@ -2102,7 +2102,7 @@ func getSessions(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
sessions, appErr := c.App.GetSessions(c.Params.UserId)
sessions, appErr := c.App.GetSessions(c.AppContext, c.Params.UserId)
if appErr != nil {
c.Err = appErr
return
@@ -2143,7 +2143,7 @@ func revokeSession(c *Context, w http.ResponseWriter, r *http.Request) {
}
audit.AddEventParameter(auditRec, "session_id", sessionId)
session, err := c.App.GetSessionById(sessionId)
session, err := c.App.GetSessionById(c.AppContext, sessionId)
if err != nil {
c.Err = err
return
@@ -2157,7 +2157,7 @@ func revokeSession(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if err := c.App.RevokeSession(session); err != nil {
if err := c.App.RevokeSession(c.AppContext, session); err != nil {
c.Err = err
return
}
@@ -2183,7 +2183,7 @@ func revokeAllSessionsForUser(c *Context, w http.ResponseWriter, r *http.Request
return
}
if err := c.App.RevokeAllSessions(c.Params.UserId); err != nil {
if err := c.App.RevokeAllSessions(c.AppContext, c.Params.UserId); err != nil {
c.Err = err
return
}
@@ -2228,7 +2228,7 @@ func attachDeviceId(c *Context, w http.ResponseWriter, r *http.Request) {
audit.AddEventParameter(auditRec, "device_id", deviceId)
// A special case where we logout of all other sessions with the same device id
if err := c.App.RevokeSessionsForDeviceId(c.AppContext.Session().UserId, deviceId, c.AppContext.Session().Id); err != nil {
if err := c.App.RevokeSessionsForDeviceId(c.AppContext, c.AppContext.Session().UserId, deviceId, c.AppContext.Session().Id); err != nil {
c.Err = err
return
}
@@ -2388,7 +2388,7 @@ func switchAccountType(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
link, err = c.App.SwitchOAuthToEmail(switchRequest.Email, switchRequest.NewPassword, c.AppContext.Session().UserId)
link, err = c.App.SwitchOAuthToEmail(c.AppContext, switchRequest.Email, switchRequest.NewPassword, c.AppContext.Session().UserId)
} else if switchRequest.EmailToLdap() {
link, err = c.App.SwitchEmailToLdap(c.AppContext, switchRequest.Email, switchRequest.Password, switchRequest.MfaCode, switchRequest.LdapLoginId, switchRequest.NewPassword)
} else if switchRequest.LdapToEmail() {
@@ -2623,7 +2623,7 @@ func revokeUserAccessToken(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if err = c.App.RevokeUserAccessToken(accessToken); err != nil {
if err = c.App.RevokeUserAccessToken(c.AppContext, accessToken); err != nil {
c.Err = err
return
}
@@ -2668,7 +2668,7 @@ func disableUserAccessToken(c *Context, w http.ResponseWriter, r *http.Request)
return
}
if err = c.App.DisableUserAccessToken(accessToken); err != nil {
if err = c.App.DisableUserAccessToken(c.AppContext, accessToken); err != nil {
c.Err = err
return
}
@@ -2713,7 +2713,7 @@ func enableUserAccessToken(c *Context, w http.ResponseWriter, r *http.Request) {
return
}
if err = c.App.EnableUserAccessToken(accessToken); err != nil {
if err = c.App.EnableUserAccessToken(c.AppContext, accessToken); err != nil {
c.Err = err
return
}

14
server/channels/api4/user_test.go
Просмотреть файл

@@ -3475,7 +3475,7 @@ func TestRevokeSessions(t *testing.T) {
th.LoginBasic()
sessions, _ = th.App.GetSessions(th.SystemAdminUser.Id)
sessions, _ = th.App.GetSessions(th.Context, th.SystemAdminUser.Id)
session = sessions[0]
resp, err = th.Client.RevokeSession(context.Background(), user.Id, session.Id)
@@ -3559,10 +3559,10 @@ func TestRevokeSessionsFromAllUsers(t *testing.T) {
th.Client.Login(context.Background(), user.Email, user.Password)
admin := th.SystemAdminUser
th.Client.Login(context.Background(), admin.Email, admin.Password)
sessions, err := th.Server.Store().Session().GetSessions(user.Id)
sessions, err := th.Server.Store().Session().GetSessions(th.Context, user.Id)
require.NotEmpty(t, sessions)
require.NoError(t, err)
sessions, err = th.Server.Store().Session().GetSessions(admin.Id)
sessions, err = th.Server.Store().Session().GetSessions(th.Context, admin.Id)
require.NotEmpty(t, sessions)
require.NoError(t, err)
_, err = th.Client.RevokeSessionsFromAllUsers(context.Background())
@@ -3574,11 +3574,11 @@ func TestRevokeSessionsFromAllUsers(t *testing.T) {
require.Error(t, err)
CheckUnauthorizedStatus(t, resp)
sessions, err = th.Server.Store().Session().GetSessions(user.Id)
sessions, err = th.Server.Store().Session().GetSessions(th.Context, user.Id)
require.Empty(t, sessions)
require.NoError(t, err)
sessions, err = th.Server.Store().Session().GetSessions(admin.Id)
sessions, err = th.Server.Store().Session().GetSessions(th.Context, admin.Id)
require.Empty(t, sessions)
require.NoError(t, err)
}
@@ -3611,7 +3611,7 @@ func TestAttachDeviceId(t *testing.T) {
cookies := resp.Header.Get("Set-Cookie")
assert.Regexp(t, tc.ExpectedSetCookieHeaderRegexp, cookies)
sessions, appErr := th.App.GetSessions(th.BasicUser.Id)
sessions, appErr := th.App.GetSessions(th.Context, th.BasicUser.Id)
require.Nil(t, appErr)
assert.Equal(t, deviceId, sessions[0].DeviceId, "Missing device Id")
})
@@ -3889,7 +3889,7 @@ func TestLoginWithLag(t *testing.T) {
mainHelper.SQLStore.UpdateLicense(model.NewTestLicense("ldap"))
mainHelper.ToggleReplicasOff()
appErr := th.App.RevokeAllSessions(th.BasicUser.Id)
appErr := th.App.RevokeAllSessions(th.Context, th.BasicUser.Id)
require.Nil(t, appErr)
mainHelper.ToggleReplicasOn()