[db] Drop d_b_oss_allow_list (WEB-91)

components/ee/payment-endpoint/src/accounting/subscription-service.ts

@@ -92,29 +92,6 @@ export class SubscriptionService {
         });
     }
 
-    /**
-     * Subscribes the given user to the "Professional Open Source" plan if they are not already
-     * @param user
-     * @param now
-     */
-    async checkAndSubscribeToOssSubscription(user: User, now: Date): Promise<void> {
-        const userId = user.id;
-
-        // don't override but keep an existing, not-yet cancelled Prof. OSS subscription
-        const subs = await this.getNotYetCancelledSubscriptions(user, now.toISOString());
-        const uncancelledOssSub = subs.find(
-            (s) => s.planId === Plans.FREE_OPEN_SOURCE.chargebeeId && !s.cancellationDate,
-        );
-        if (uncancelledOssSub) {
-            log.debug({ userId: userId }, "already has professional OSS subscription");
-            return;
-        }
-
-        const subscription = await this.subscribe(userId, Plans.FREE_OPEN_SOURCE, undefined, now.toISOString());
-        log.debug({ userId: userId }, "create new OSS subscription", { subscription });
-        return;
-    }
-
     async addCredit(userId: string, amount: number, date: string, expiryDate?: string): Promise<AccountEntry> {
         const entry = <AccountEntry>{
             userId,

components/gitpod-db/src/container-module.ts

@@ -57,8 +57,6 @@ import { ProjectDB } from "./project-db";
 import { ProjectDBImpl } from "./typeorm/project-db-impl";
 import { PersonalAccessTokenDB } from "./personal-access-token-db";
 import { EntityManager } from "typeorm";
-import { OssAllowListDB } from "./oss-allowlist-db";
-import { OssAllowListDBImpl } from "./typeorm/oss-allowlist-db-impl";
 import { TypeORMInstallationAdminImpl } from "./typeorm/installation-admin-db-impl";
 import { InstallationAdminDB } from "./installation-admin-db";
 import { TeamSubscription2DB } from "./team-subscription-2-db";
@@ -164,7 +162,6 @@ export const dbContainerModule = new ContainerModule((bind, unbind, isBound, reb
     bind(EmailDomainFilterDB).to(EmailDomainFilterDBImpl).inSingletonScope();
     bind(EduEmailDomainDB).to(EduEmailDomainDBImpl).inSingletonScope();
     bind(LicenseDB).to(LicenseDBImpl).inSingletonScope();
-    bind(OssAllowListDB).to(OssAllowListDBImpl).inSingletonScope();
     bind(UserToTeamMigrationService).toSelf().inSingletonScope();
     bind(WorkspaceOrganizationIdMigration).toSelf().inSingletonScope();
     bind(Synchronizer).toSelf().inSingletonScope();

components/gitpod-db/src/tables.ts

@@ -263,12 +263,6 @@ export class GitpodTableDescriptionProvider implements TableDescriptionProvider
             deletionColumn: "deleted",
             timeColumn: "_lastModified",
         },
-        {
-            name: "d_b_oss_allow_list",
-            primaryKeys: ["identity"],
-            deletionColumn: "deleted",
-            timeColumn: "_lastModified",
-        },
         {
             name: "d_b_project_env_var",
             primaryKeys: ["id", "projectId"],

components/gitpod-db/src/typeorm/migration/1680697625457-DropOSSAllowList.ts

@@ -0,0 +1,19 @@
+/**
+ * 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";
+
+export class DropOSSAllowList1680697625457 implements MigrationInterface {
+    public async up(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query("DROP TABLE IF EXISTS `d_b_oss_allow_list`");
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<any> {
+        await queryRunner.query(
+            "CREATE TABLE IF NOT EXISTS `d_b_oss_allow_list` (`identity` char(128) NOT NULL, `deleted` tinyint(4) NOT NULL DEFAULT 0, `_lastModified` timestamp(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6) ON UPDATE CURRENT_TIMESTAMP(6), PRIMARY KEY(`identity`)) ENGINE=InnoDB",
+        );
+    }
+}

components/server/ee/src/user/user-service.ts

@@ -8,13 +8,11 @@ import { UserService, CheckSignUpParams, CheckTermsParams } from "../../../src/u
 import { User } from "@gitpod/gitpod-protocol";
 import { inject } from "inversify";
 import { SubscriptionService } from "@gitpod/gitpod-payment-endpoint/lib/accounting";
-import { OssAllowListDB } from "@gitpod/gitpod-db/lib/oss-allowlist-db";
 import { HostContextProvider } from "../../../src/auth/host-context-provider";
 import { Config } from "../../../src/config";
 
 export class UserServiceEE extends UserService {
     @inject(SubscriptionService) protected readonly subscriptionService: SubscriptionService;
-    @inject(OssAllowListDB) protected readonly OssAllowListDb: OssAllowListDB;
     @inject(HostContextProvider) protected readonly hostContextProvider: HostContextProvider;
     @inject(Config) protected readonly config: Config;
 
@@ -39,19 +37,4 @@ export class UserServiceEE extends UserService {
 
         return true;
     }
-
-    async checkAutomaticOssEligibility(user: User): Promise<boolean> {
-        const idsWithHost = user.identities
-            .map((id) => {
-                const hostContext = this.hostContextProvider.findByAuthProviderId(id.authProviderId);
-                if (!hostContext) {
-                    return undefined;
-                }
-                const info = hostContext.authProvider.info;
-                return `${info.host}/${id.authName}`;
-            })
-            .filter((i) => !!i) as string[];
-
-        return this.OssAllowListDb.hasAny(idsWithHost);
-    }
 }

components/server/src/auth/login-completion-handler.ts

@@ -93,11 +93,6 @@ export class LoginCompletionHandler {
             );
         }
 
-        // Check for and automatically subscribe to Professional OpenSource subscription
-        /** no await */ this.checkForAndSubscribeToProfessionalOss(user).catch((err) => {
-            /** ignore */
-        });
-
         response.redirect(returnTo);
     }
 
@@ -115,15 +110,6 @@ export class LoginCompletionHandler {
             }
         }
     }
-
-    protected async checkForAndSubscribeToProfessionalOss(user: User) {
-        const eligible = await this.userService.checkAutomaticOssEligibility(user);
-        log.debug({ userId: user.id }, "user eligible for OSS subscription?", { eligible });
-        if (!eligible) {
-            return;
-        }
-        await this.subscriptionService.checkAndSubscribeToOssSubscription(user, new Date());
-    }
 }
 export namespace LoginCompletionHandler {
     export interface CompleteParams {

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

@@ -364,11 +364,6 @@ export class UserService {
         // return !!accepted && (accepted.termsRevision === terms.revision);
     }
 
-    async checkAutomaticOssEligibility(user: User): Promise<boolean> {
-        // EE implementation
-        return false;
-    }
-
     async isBlocked(params: CheckIsBlockedParams): Promise<boolean> {
         if (params.user && params.user.blocked) {
             return true;