💄

Author: jeanp413

components/gitpod-db/go/personal_access_token.go

@@ -87,7 +87,15 @@ func CreatePersonalAccessToken(ctx context.Context, conn *gorm.DB, req PersonalA
 	return token, nil
 }
 
-func DeletePersonalAccessTokenForUser(ctx context.Context, conn *gorm.DB, tokenID uuid.UUID, userID uuid.UUID) error {
+func DeletePersonalAccessTokenForUser(ctx context.Context, conn *gorm.DB, tokenID uuid.UUID, userID uuid.UUID) (int64, error) {
+	if tokenID == uuid.Nil {
+		return 0, fmt.Errorf("Invalid or empty tokenID")
+	}
+
+	if userID == uuid.Nil {
+		return 0, fmt.Errorf("Invalid or empty userID")
+	}
+
 	db := conn.WithContext(ctx)
 
 	db = db.
@@ -97,13 +105,10 @@ func DeletePersonalAccessTokenForUser(ctx context.Context, conn *gorm.DB, tokenI
 		Where("deleted = ?", 0).
 		Update("deleted", 1)
 	if db.Error != nil {
-		if errors.Is(db.Error, gorm.ErrRecordNotFound) {
-			return fmt.Errorf("Token with ID %s does not exist: %w", tokenID, ErrorNotFound)
-		}
-		return fmt.Errorf("Failed to delete token: %v", db.Error)
+		return 0, fmt.Errorf("Failed to delete token: %v", db.Error)
 	}
 
-	return nil
+	return db.RowsAffected, nil
 }
 
 func ListPersonalAccessTokensForUser(ctx context.Context, conn *gorm.DB, userID uuid.UUID, pagination Pagination) (*PaginatedResult[PersonalAccessToken], error) {

components/gitpod-db/go/personal_access_token_test.go

@@ -88,23 +88,27 @@ func TestPersonalAccessToken_Delete(t *testing.T) {
 	dbtest.CreatePersonalAccessTokenRecords(t, conn, tokenEntries...)
 
 	t.Run("not matching user", func(t *testing.T) {
-		err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, token.ID, token2.UserID)
-		require.Error(t, err, db.ErrorNotFound)
+		count, err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, token.ID, token2.UserID)
+		require.NoError(t, err)
+		require.Equal(t, int64(0), count)
 	})
 
 	t.Run("not matching token", func(t *testing.T) {
-		err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, token2.ID, token.UserID)
-		require.Error(t, err, db.ErrorNotFound)
+		count, err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, token2.ID, token.UserID)
+		require.NoError(t, err)
+		require.Equal(t, int64(0), count)
 	})
 
 	t.Run("both token and user don't exist in the DB", func(t *testing.T) {
-		err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, uuid.New(), uuid.New())
-		require.Error(t, err, db.ErrorNotFound)
+		count, err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, uuid.New(), uuid.New())
+		require.NoError(t, err)
+		require.Equal(t, int64(0), count)
 	})
 
 	t.Run("valid", func(t *testing.T) {
-		err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, token.ID, token.UserID)
+		count, err := db.DeletePersonalAccessTokenForUser(context.Background(), conn, token.ID, token.UserID)
 		require.NoError(t, err)
+		require.Equal(t, int64(1), count)
 		_, err = db.GetPersonalAccessTokenForUser(context.Background(), conn, token.ID, token.UserID)
 		require.Error(t, err, db.ErrorNotFound)
 	})

components/public-api-server/pkg/apiv1/tokens.go

@@ -209,7 +209,7 @@ func (s *TokensService) DeletePersonalAccessToken(ctx context.Context, req *conn
 		return nil, err
 	}
 
-	err = db.DeletePersonalAccessTokenForUser(ctx, s.dbConn, tokenID, userID)
+	_, err = db.DeletePersonalAccessTokenForUser(ctx, s.dbConn, tokenID, userID)
 	if err != nil {
 		log.WithError(err).Errorf("Failed to delete personal access token for user %s", userID.String())
 		return nil, connect.NewError(connect.CodeInternal, errors.New("Failed to delete personal access token."))