MM-15794 Migrate "Session.Get" to Sync by default (#10990)

app/session.go

@@ -28,6 +28,7 @@ func (a *App) GetSession(token string) (*model.Session, *model.AppError) {
 	metrics := a.Metrics
 
 	var session *model.Session
+	var err *model.AppError
 	if ts, ok := a.Srv.sessionCache.Get(token); ok {
 		session = ts.(*model.Session)
 		if metrics != nil {
@@ -40,9 +41,7 @@ func (a *App) GetSession(token string) (*model.Session, *model.AppError) {
 	}
 
 	if session == nil {
-		if sessionResult := <-a.Srv.Store.Session().Get(token); sessionResult.Err == nil {
-			session = sessionResult.Data.(*model.Session)
-
+		if session, err = a.Srv.Store.Session().Get(token); err == nil {
 			if session != nil {
 				if session.Token != token {
 					return nil, model.NewAppError("GetSession", "api.context.invalid_token.error", map[string]interface{}{"Token": token, "Error": ""}, "", http.StatusUnauthorized)
@@ -52,13 +51,12 @@ func (a *App) GetSession(token string) (*model.Session, *model.AppError) {
 					a.AddSessionToCache(session)
 				}
 			}
-		} else if sessionResult.Err.StatusCode == http.StatusInternalServerError {
-			return nil, sessionResult.Err
+		} else if err.StatusCode == http.StatusInternalServerError {
+			return nil, err
 		}
 	}
 
 	if session == nil {
-		var err *model.AppError
 		session, err = a.createSessionForUserAccessToken(token)
 		if err != nil {
 			detailedError := ""
@@ -180,21 +178,21 @@ func (a *App) RevokeSessionsForDeviceId(userId string, deviceId string, currentS
 }
 
 func (a *App) GetSessionById(sessionId string) (*model.Session, *model.AppError) {
-	result := <-a.Srv.Store.Session().Get(sessionId)
-	if result.Err != nil {
-		result.Err.StatusCode = http.StatusBadRequest
-		return nil, result.Err
+	session, err := a.Srv.Store.Session().Get(sessionId)
+	if err != nil {
+		err.StatusCode = http.StatusBadRequest
+		return nil, err
 	}
-	return result.Data.(*model.Session), nil
+	return session, nil
 }
 
 func (a *App) RevokeSessionById(sessionId string) *model.AppError {
-	result := <-a.Srv.Store.Session().Get(sessionId)
-	if result.Err != nil {
-		result.Err.StatusCode = http.StatusBadRequest
-		return result.Err
+	session, err := a.Srv.Store.Session().Get(sessionId)
+	if err != nil {
+		err.StatusCode = http.StatusBadRequest
+		return err
 	}
-	return a.RevokeSession(result.Data.(*model.Session))
+	return a.RevokeSession(session)
 
 }
 
@@ -315,9 +313,7 @@ func (a *App) createSessionForUserAccessToken(tokenString string) (*model.Sessio
 
 func (a *App) RevokeUserAccessToken(token *model.UserAccessToken) *model.AppError {
 	var session *model.Session
-	if result := <-a.Srv.Store.Session().Get(token.Token); result.Err == nil {
-		session = result.Data.(*model.Session)
-	}
+	session, _ = a.Srv.Store.Session().Get(token.Token)
 
 	if result := <-a.Srv.Store.UserAccessToken().Delete(token.Id); result.Err != nil {
 		return result.Err
@@ -332,9 +328,7 @@ func (a *App) RevokeUserAccessToken(token *model.UserAccessToken) *model.AppErro
 
 func (a *App) DisableUserAccessToken(token *model.UserAccessToken) *model.AppError {
 	var session *model.Session
-	if result := <-a.Srv.Store.Session().Get(token.Token); result.Err == nil {
-		session = result.Data.(*model.Session)
-	}
+	session, _ = a.Srv.Store.Session().Get(token.Token)
 
 	if result := <-a.Srv.Store.UserAccessToken().UpdateTokenDisable(token.Id); result.Err != nil {
 		return result.Err
@@ -349,9 +343,7 @@ func (a *App) DisableUserAccessToken(token *model.UserAccessToken) *model.AppErr
 
 func (a *App) EnableUserAccessToken(token *model.UserAccessToken) *model.AppError {
 	var session *model.Session
-	if result := <-a.Srv.Store.Session().Get(token.Token); result.Err == nil {
-		session = result.Data.(*model.Session)
-	}
+	session, _ = a.Srv.Store.Session().Get(token.Token)
 
 	if result := <-a.Srv.Store.UserAccessToken().UpdateTokenEnable(token.Id); result.Err != nil {
 		return result.Err