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

server/channels/web/handlers_test.go

@@ -171,7 +171,7 @@ func TestHandlerServeCSRFToken(t *testing.T) {
 	}
 	session.GenerateCSRF()
 	th.App.SetSessionExpireInHours(session, 24)
-	session, err := th.App.CreateSession(session)
+	session, err := th.App.CreateSession(th.Context, session)
 	if err != nil {
 		t.Errorf("Expected nil, got %s", err)
 	}

server/channels/web/oauth.go

@@ -69,7 +69,7 @@ func authorizeOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
 	defer c.LogAuditRec(auditRec)
 	c.LogAudit("attempt")
 
-	redirectURL, appErr := c.App.AllowOAuthAppAccessToUser(c.AppContext.Session().UserId, authRequest)
+	redirectURL, appErr := c.App.AllowOAuthAppAccessToUser(c.AppContext, c.AppContext.Session().UserId, authRequest)
 	if appErr != nil {
 		c.Err = appErr
 		return
@@ -93,7 +93,7 @@ func deauthorizeOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
 	auditRec := c.MakeAuditRecord("deauthorizeOAuthApp", audit.Fail)
 	defer c.LogAuditRec(auditRec)
 
-	err := c.App.DeauthorizeOAuthAppForUser(c.AppContext.Session().UserId, clientId)
+	err := c.App.DeauthorizeOAuthAppForUser(c.AppContext, c.AppContext.Session().UserId, clientId)
 	if err != nil {
 		c.Err = err
 		return
@@ -166,7 +166,7 @@ func authorizeOAuthPage(c *Context, w http.ResponseWriter, r *http.Request) {
 
 	// Automatically allow if the app is trusted
 	if oauthApp.IsTrusted || isAuthorized {
-		redirectURL, err := c.App.AllowOAuthAppAccessToUser(c.AppContext.Session().UserId, authRequest)
+		redirectURL, err := c.App.AllowOAuthAppAccessToUser(c.AppContext, c.AppContext.Session().UserId, authRequest)
 
 		if err != nil {
 			utils.RenderWebAppError(c.App.Config(), w, r, err, c.App.AsymmetricSigningKey())
@@ -229,7 +229,7 @@ func getAccessToken(c *Context, w http.ResponseWriter, r *http.Request) {
 	auditRec.AddMeta("client_id", clientId)
 	c.LogAudit("attempt")
 
-	accessRsp, err := c.App.GetOAuthAccessTokenForCodeFlow(clientId, grantType, redirectURI, code, secret, refreshToken)
+	accessRsp, err := c.App.GetOAuthAccessTokenForCodeFlow(c.AppContext, clientId, grantType, redirectURI, code, secret, refreshToken)
 	if err != nil {
 		c.Err = err
 		return

server/channels/web/oauth_test.go

@@ -746,7 +746,7 @@ func (th *TestHelper) Login(client *model.Client4, user *model.User) {
 		Roles:   user.GetRawRoles(),
 		IsOAuth: false,
 	}
-	session, _ = th.App.CreateSession(session)
+	session, _ = th.App.CreateSession(th.Context, session)
 	client.AuthToken = session.Token
 	client.AuthType = model.HeaderBearer
 }

server/channels/web/saml.go

@@ -160,7 +160,7 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) {
 			c.App.AddDirectChannels(c.AppContext, teamId, user)
 		}
 	case model.OAuthActionEmailToSSO:
-		if err = c.App.RevokeAllSessions(user.Id); err != nil {
+		if err = c.App.RevokeAllSessions(c.AppContext, user.Id); err != nil {
 			c.Err = err
 			return
 		}