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

@@ -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 {
+	if err := a.Srv.Store.UserAccessToken().Delete(token.Id); err != nil {
-		return result.Err
+		return err
 	}
 
 	if session == nil {

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 {
+func (s SqlUserAccessTokenStore) Delete(tokenId string) *model.AppError {
-	return store.Do(func(result *store.StoreResult) {
+	transaction, err := s.GetMaster().Begin()
-		transaction, err := s.GetMaster().Begin()
+	if err != nil {
-		if err != nil {
+		return model.NewAppError("SqlUserAccessTokenStore.Delete", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
-			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
-			}
 
-			if result.Err == nil {
+	defer finalizeTransaction(transaction)
-				if err := transaction.Commit(); err != nil {
+
-					// don't need to rollback here since the transaction is already closed
+	if err := s.deleteSessionsAndTokensById(transaction, tokenId); err == nil {
-					result.Err = model.NewAppError("SqlUserAccessTokenStore.Delete", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
+		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 {
+func (s SqlUserAccessTokenStore) deleteSessionsAndTokensById(transaction *gorp.Transaction, tokenId string) *model.AppError {
-	result := store.StoreResult{}
 
 	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 model.NewAppError("SqlUserAccessTokenStore.deleteSessionsById", "store.sql_user_access_token.delete.app_error", nil, "id="+tokenId+", err="+err.Error(), http.StatusInternalServerError)
-		return result
 	}
 
 	return s.deleteTokensById(transaction, tokenId)
 }
 
-func (s SqlUserAccessTokenStore) deleteTokensById(transaction *gorp.Transaction, tokenId string) store.StoreResult {
+func (s SqlUserAccessTokenStore) deleteTokensById(transaction *gorp.Transaction, tokenId string) *model.AppError {
-	result := store.StoreResult{}
 
 	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 {

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)

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
+	var r0 *model.AppError
-	if rf, ok := ret.Get(0).(func(string) store.StoreChannel); ok {
+	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)
 		}
 	}
 

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 {
+	if err = ss.UserAccessToken().Delete(uat.Id); err != nil {
-		t.Fatal(result.Err)
+		t.Fatal(err)
 	}
 
 	if _, err = ss.Session().Get(s1.Token); err == nil {