[db] DBGitpodToken: drop deleted column (unused)

Author: geropl

components/gitpod-db/src/tables.ts

@@ -62,13 +62,6 @@ export class GitpodTableDescriptionProvider implements TableDescriptionProvider
             primaryKeys: ["id"],
             timeColumn: "_lastModified",
         },
-        {
-            name: "d_b_gitpod_token",
-            primaryKeys: ["tokenHash"],
-            deletionColumn: "deleted",
-            timeColumn: "_lastModified",
-            dependencies: ["d_b_user"],
-        },
         {
             name: "d_b_one_time_secret",
             primaryKeys: ["id"],

components/gitpod-db/src/typeorm/entity/db-gitpod-token.ts

@@ -32,7 +32,4 @@ export class DBGitpodToken implements GitpodToken {
 
     @Column()
     created: string;
-
-    @Column()
-    deleted?: boolean;
 }

components/gitpod-db/src/typeorm/migration/1695821079717-GitpodTokenDropDeleted.ts

@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2023 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License.AGPL.txt in the project root for license information.
+ */
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { columnExists } from "./helper/helper";
+
+const TABLE_NAME = "d_b_gitpod_token";
+const COLUMN_NAME = "deleted";
+
+export class GitpodTokenDropDeleted1695821079717 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        if (await columnExists(queryRunner, TABLE_NAME, COLUMN_NAME)) {
+            await queryRunner.query(`ALTER TABLE \`${TABLE_NAME}\` DROP COLUMN \`${COLUMN_NAME}\`, ALGORITHM=INSTANT`);
+        }
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        if (!(await columnExists(queryRunner, TABLE_NAME, COLUMN_NAME))) {
+            await queryRunner.query(
+                `ALTER TABLE \`${TABLE_NAME}\` ADD COLUMN \`${COLUMN_NAME}\` tinyint(4) NOT NULL DEFAULT '0', ALGORITHM=INSTANT`,
+            );
+        }
+    }
+}

components/gitpod-db/src/typeorm/user-db-impl.ts

@@ -221,7 +221,6 @@ export class TypeORMUserDBImpl extends TransactionalDBImpl<UserDB> implements Us
         } else {
             qBuilder.where("gitpodToken.tokenHash = :tokenHash", { tokenHash });
         }
-        qBuilder.andWhere("gitpodToken.deleted <> TRUE");
         const token = await qBuilder.getOne();
         if (!token) {
             return;

components/gitpod-protocol/src/protocol.ts

@@ -680,9 +680,6 @@ export interface GitpodToken {
 
     /** Created timestamp */
     created: string;
-
-    // token is deleted on the database and about to be collected by periodic deleter
-    deleted?: boolean;
 }
 
 export enum GitpodTokenType {

components/server/src/user/gitpod-token-service.ts

@@ -21,7 +21,7 @@ export class GitpodTokenService {
     async getGitpodTokens(requestorId: string, userId: string): Promise<GitpodToken[]> {
         await this.auth.checkPermissionOnUser(requestorId, "read_tokens", userId);
         const gitpodTokens = await this.userDB.findAllGitpodTokensOfUser(userId);
-        return gitpodTokens.filter((v) => !v.deleted);
+        return gitpodTokens;
     }
 
     async generateNewGitpodToken(
@@ -56,9 +56,6 @@ export class GitpodTokenService {
         } catch (error) {
             log.error({ userId }, "failed to resolve gitpod token: ", error);
         }
-        if (token?.deleted) {
-            token = undefined;
-        }
         return token;
     }