From eb9415a66840cebb1bf0d597907a81920dfa211e Mon Sep 17 00:00:00 2001 From: Micah Thompson Date: Mon, 24 Jun 2019 17:25:19 -0400 Subject: [PATCH] MM-16482 Migrate UserAccessToken.Delete to Sync by default (#11356) * MM-16482 Migrate UserAccessToken.Delete to Sync by default * err mistake * [Requested Change] Removed else block * gofmt change * gofmt change --- app/session.go | 4 +- store/sqlstore/user_access_token_store.go | 45 +++++++++---------- store/store.go | 2 +- store/storetest/mocks/UserAccessTokenStore.go | 8 ++-- store/storetest/user_access_token_store.go | 4 +- 5 files changed, 29 insertions(+), 34 deletions(-) diff --git a/app/session.go b/app/session.go index 11f722b4ca..0b4845a178 100644 --- a/app/session.go +++ b/app/session.go @@ -312,8 +312,8 @@ func (a *App) RevokeUserAccessToken(token *model.UserAccessToken) *model.AppErro var session *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 + if err := a.Srv.Store.UserAccessToken().Delete(token.Id); err != nil { + return err } if session == nil { diff --git a/store/sqlstore/user_access_token_store.go b/store/sqlstore/user_access_token_store.go index e4e16bc481..0c0f2c4665 100644 --- a/store/sqlstore/user_access_token_store.go +++ b/store/sqlstore/user_access_token_store.go @@ -48,29 +48,26 @@ func (s SqlUserAccessTokenStore) Save(token *model.UserAccessToken) (*model.User return token, nil } -func (s SqlUserAccessTokenStore) Delete(tokenId string) store.StoreChannel { - return store.Do(func(result *store.StoreResult) { - transaction, err := s.GetMaster().Begin() - if err != nil { - result.Err = model.NewAppError("SqlUserAccessTokenStore.Delete", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError) - } else { - defer finalizeTransaction(transaction) - if extrasResult := s.deleteSessionsAndTokensById(transaction, tokenId); extrasResult.Err != nil { - *result = extrasResult - } +func (s SqlUserAccessTokenStore) Delete(tokenId string) *model.AppError { + transaction, err := s.GetMaster().Begin() + if err != nil { + return model.NewAppError("SqlUserAccessTokenStore.Delete", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError) + } - if result.Err == nil { - if err := transaction.Commit(); err != nil { - // don't need to rollback here since the transaction is already closed - result.Err = model.NewAppError("SqlUserAccessTokenStore.Delete", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError) - } - } + defer finalizeTransaction(transaction) + + if err := s.deleteSessionsAndTokensById(transaction, tokenId); err == nil { + if err := transaction.Commit(); err != nil { + // don't need to rollback here since the transaction is already closed + return model.NewAppError("SqlUserAccessTokenStore.Delete", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError) } - }) + } + + return nil + } -func (s SqlUserAccessTokenStore) deleteSessionsAndTokensById(transaction *gorp.Transaction, tokenId string) store.StoreResult { - result := store.StoreResult{} +func (s SqlUserAccessTokenStore) deleteSessionsAndTokensById(transaction *gorp.Transaction, tokenId string) *model.AppError { query := "" if s.DriverName() == model.DATABASE_DRIVER_POSTGRES { @@ -80,21 +77,19 @@ func (s SqlUserAccessTokenStore) deleteSessionsAndTokensById(transaction *gorp.T } if _, err := transaction.Exec(query, map[string]interface{}{"Id": tokenId}); err != nil { - result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteSessionsById", "store.sql_user_access_token.delete.app_error", nil, "id="+tokenId+", err="+err.Error(), http.StatusInternalServerError) - return result + return model.NewAppError("SqlUserAccessTokenStore.deleteSessionsById", "store.sql_user_access_token.delete.app_error", nil, "id="+tokenId+", err="+err.Error(), http.StatusInternalServerError) } return s.deleteTokensById(transaction, tokenId) } -func (s SqlUserAccessTokenStore) deleteTokensById(transaction *gorp.Transaction, tokenId string) store.StoreResult { - result := store.StoreResult{} +func (s SqlUserAccessTokenStore) deleteTokensById(transaction *gorp.Transaction, tokenId string) *model.AppError { if _, err := transaction.Exec("DELETE FROM UserAccessTokens WHERE Id = :Id", map[string]interface{}{"Id": tokenId}); err != nil { - result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteTokensById", "store.sql_user_access_token.delete.app_error", nil, "", http.StatusInternalServerError) + return model.NewAppError("SqlUserAccessTokenStore.deleteTokensById", "store.sql_user_access_token.delete.app_error", nil, "", http.StatusInternalServerError) } - return result + return nil } func (s SqlUserAccessTokenStore) DeleteAllForUser(userId string) store.StoreChannel { diff --git a/store/store.go b/store/store.go index fd13df5cfd..90139937a3 100644 --- a/store/store.go +++ b/store/store.go @@ -518,7 +518,7 @@ type JobStore interface { type UserAccessTokenStore interface { Save(token *model.UserAccessToken) (*model.UserAccessToken, *model.AppError) - Delete(tokenId string) StoreChannel + Delete(tokenId string) *model.AppError DeleteAllForUser(userId string) StoreChannel Get(tokenId string) (*model.UserAccessToken, *model.AppError) GetAll(offset int, limit int) ([]*model.UserAccessToken, *model.AppError) diff --git a/store/storetest/mocks/UserAccessTokenStore.go b/store/storetest/mocks/UserAccessTokenStore.go index fbfbba2aee..1183e494f1 100644 --- a/store/storetest/mocks/UserAccessTokenStore.go +++ b/store/storetest/mocks/UserAccessTokenStore.go @@ -14,15 +14,15 @@ type UserAccessTokenStore struct { } // Delete provides a mock function with given fields: tokenId -func (_m *UserAccessTokenStore) Delete(tokenId string) store.StoreChannel { +func (_m *UserAccessTokenStore) Delete(tokenId string) *model.AppError { ret := _m.Called(tokenId) - var r0 store.StoreChannel - if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok { + var r0 *model.AppError + if rf, ok := ret.Get(0).(func(string) *model.AppError); ok { r0 = rf(tokenId) } else { if ret.Get(0) != nil { - r0 = ret.Get(0).(store.StoreChannel) + r0 = ret.Get(0).(*model.AppError) } } diff --git a/store/storetest/user_access_token_store.go b/store/storetest/user_access_token_store.go index 0636aee51a..0bd803bb12 100644 --- a/store/storetest/user_access_token_store.go +++ b/store/storetest/user_access_token_store.go @@ -63,8 +63,8 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) { t.Fatal("received incorrect number of tokens after save") } - if result := <-ss.UserAccessToken().Delete(uat.Id); result.Err != nil { - t.Fatal(result.Err) + if err = ss.UserAccessToken().Delete(uat.Id); err != nil { + t.Fatal(err) } if _, err = ss.Session().Get(s1.Token); err == nil {