Migrate 'UserAccessToken.DeleteAllForUser' to Sync by default (#11320)

app/user.go

@@ -1438,8 +1438,8 @@ func (a *App) PermanentDeleteUser(user *model.User) *model.AppError {
 		return err
 	}
 
-	if result := <-a.Srv.Store.UserAccessToken().DeleteAllForUser(user.Id); result.Err != nil {
+	if err := a.Srv.Store.UserAccessToken().DeleteAllForUser(user.Id); err != nil {
-		return result.Err
+		return err
 	}
 
 	if err := a.Srv.Store.OAuth().PermanentDeleteAuthDataByUser(user.Id); err != nil {

store/sqlstore/user_access_token_store.go

@@ -92,30 +92,24 @@ func (s SqlUserAccessTokenStore) deleteTokensById(transaction *gorp.Transaction,
 	return nil
 }
 
-func (s SqlUserAccessTokenStore) DeleteAllForUser(userId string) store.StoreChannel {
+func (s SqlUserAccessTokenStore) DeleteAllForUser(userId 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.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
-			result.Err = model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
-		} else {
+	defer finalizeTransaction(transaction)
-			defer finalizeTransaction(transaction)
+	if err := s.deleteSessionsandTokensByUser(transaction, userId); err != nil {
-			if extrasResult := s.deleteSessionsandTokensByUser(transaction, userId); extrasResult.Err != nil {
+		return err
-				*result = extrasResult
+	}
-			}
 
-			if result.Err == nil {
+	if err := transaction.Commit(); err != nil {
-				if err := transaction.Commit(); err != nil {
+		// don't need to rollback here since the transaction is already closed
-					// don't need to rollback here since the transaction is already closed
+		return model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
-					result.Err = model.NewAppError("SqlUserAccessTokenStore.DeleteAllForUser", "store.sql_user_access_token.delete.app_error", nil, err.Error(), http.StatusInternalServerError)
+	}
-				}
+	return nil
-			}
-		}
-	})
 }
 
-func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp.Transaction, userId string) store.StoreResult {
+func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp.Transaction, userId string) *model.AppError {
-	result := store.StoreResult{}
-
 	query := ""
 	if s.DriverName() == model.DATABASE_DRIVER_POSTGRES {
 		query = "DELETE FROM Sessions s USING UserAccessTokens o WHERE o.Token = s.Token AND o.UserId = :UserId"
@@ -124,21 +118,18 @@ func (s SqlUserAccessTokenStore) deleteSessionsandTokensByUser(transaction *gorp
 	}
 
 	if _, err := transaction.Exec(query, map[string]interface{}{"UserId": userId}); err != nil {
-		result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteSessionsByUser", "store.sql_user_access_token.delete.app_error", nil, "user_id="+userId+", err="+err.Error(), http.StatusInternalServerError)
+		return model.NewAppError("SqlUserAccessTokenStore.deleteSessionsByUser", "store.sql_user_access_token.delete.app_error", nil, "user_id="+userId+", err="+err.Error(), http.StatusInternalServerError)
-		return result
 	}
 
 	return s.deleteTokensByUser(transaction, userId)
 }
 
-func (s SqlUserAccessTokenStore) deleteTokensByUser(transaction *gorp.Transaction, userId string) store.StoreResult {
+func (s SqlUserAccessTokenStore) deleteTokensByUser(transaction *gorp.Transaction, userId string) *model.AppError {
-	result := store.StoreResult{}
-
 	if _, err := transaction.Exec("DELETE FROM UserAccessTokens WHERE UserId = :UserId", map[string]interface{}{"UserId": userId}); err != nil {
-		result.Err = model.NewAppError("SqlUserAccessTokenStore.deleteTokensByUser", "store.sql_user_access_token.delete.app_error", nil, "", http.StatusInternalServerError)
+		return model.NewAppError("SqlUserAccessTokenStore.deleteTokensByUser", "store.sql_user_access_token.delete.app_error", nil, "", http.StatusInternalServerError)
 	}
 
-	return result
+	return nil
 }
 
 func (s SqlUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, *model.AppError) {

store/store.go

@@ -519,8 +519,8 @@ type JobStore interface {
 
 type UserAccessTokenStore interface {
 	Save(token *model.UserAccessToken) (*model.UserAccessToken, *model.AppError)
+	DeleteAllForUser(userId string) *model.AppError
 	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)
 	GetByToken(tokenString string) (*model.UserAccessToken, *model.AppError)

store/storetest/mocks/UserAccessTokenStore.go

@@ -30,15 +30,15 @@ func (_m *UserAccessTokenStore) Delete(tokenId string) *model.AppError {
 }
 
 // DeleteAllForUser provides a mock function with given fields: userId
-func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) store.StoreChannel {
+func (_m *UserAccessTokenStore) DeleteAllForUser(userId string) *model.AppError {
 	ret := _m.Called(userId)
 
-	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(userId)
 	} 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

@@ -86,8 +86,8 @@ func testUserAccessTokenSaveGetDelete(t *testing.T, ss store.Store) {
 		t.Fatal(err)
 	}
 
-	if result := <-ss.UserAccessToken().DeleteAllForUser(uat.UserId); result.Err != nil {
+	if err := ss.UserAccessToken().DeleteAllForUser(uat.UserId); err != nil {
-		t.Fatal(result.Err)
+		t.Fatal(err)
 	}
 
 	if _, err := ss.Session().Get(s2.Token); err == nil {