* Migrate "Session.Save" to Sync by default * fixing unreachable code * removing shadowing * whitespace changes, refactoring flow control logic * removing unnecessary whitespace
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
6aba17ff9d
Коммит
ae6fed827a
@@ -342,11 +342,10 @@ func (a *App) newSession(appName string, user *model.User) (*model.Session, *mod
|
||||
session.AddProp(model.SESSION_PROP_OS, "OAuth2")
|
||||
session.AddProp(model.SESSION_PROP_BROWSER, "OAuth2")
|
||||
|
||||
result := <-a.Srv.Store.Session().Save(session)
|
||||
if result.Err != nil {
|
||||
session, err := a.Srv.Store.Session().Save(session)
|
||||
if err != nil {
|
||||
return nil, model.NewAppError("newSession", "api.oauth.get_access_token.internal_session.app_error", nil, "", http.StatusInternalServerError)
|
||||
}
|
||||
session = result.Data.(*model.Session)
|
||||
|
||||
a.AddSessionToCache(session)
|
||||
|
||||
|
||||
@@ -14,11 +14,10 @@ import (
|
||||
func (a *App) CreateSession(session *model.Session) (*model.Session, *model.AppError) {
|
||||
session.Token = ""
|
||||
|
||||
result := <-a.Srv.Store.Session().Save(session)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
session, err := a.Srv.Store.Session().Save(session)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
session = result.Data.(*model.Session)
|
||||
|
||||
a.AddSessionToCache(session)
|
||||
|
||||
@@ -303,11 +302,10 @@ func (a *App) createSessionForUserAccessToken(tokenString string) (*model.Sessio
|
||||
session.AddProp(model.SESSION_PROP_TYPE, model.SESSION_TYPE_USER_ACCESS_TOKEN)
|
||||
session.SetExpireInDays(model.SESSION_USER_ACCESS_TOKEN_EXPIRY)
|
||||
|
||||
result = <-a.Srv.Store.Session().Save(session)
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
session, err = a.Srv.Store.Session().Save(session)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
session = result.Data.(*model.Session)
|
||||
|
||||
a.AddSessionToCache(session)
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user