From d9defb213f1e336086a9bca47c44418b8017d162 Mon Sep 17 00:00:00 2001 From: Gero Posmyk-Leinemann Date: Thu, 4 Aug 2022 16:00:31 +0000 Subject: [PATCH] [server] Follow-up: Code cleanup --- components/server/ee/src/container-module.ts | 3 --- components/server/ee/src/user/user-controller.ts | 13 ------------- .../server/src/billing/entitlement-service.ts | 4 ---- 3 files changed, 20 deletions(-) delete mode 100644 components/server/ee/src/user/user-controller.ts diff --git a/components/server/ee/src/container-module.ts b/components/server/ee/src/container-module.ts index 2738309db45d41..3c756be60c7f78 100644 --- a/components/server/ee/src/container-module.ts +++ b/components/server/ee/src/container-module.ts @@ -9,8 +9,6 @@ import { GitpodServerImpl } from "../../src/workspace/gitpod-server-impl"; import { GitpodServerEEImpl } from "./workspace/gitpod-server-impl"; import { Server } from "../../src/server"; import { ServerEE } from "./server"; -import { UserController } from "../../src/user/user-controller"; -import { UserControllerEE } from "./user/user-controller"; import { LicenseKeySource } from "@gitpod/licensor/lib"; import { DBLicenseKeySource } from "./license-source"; import { UserService } from "../../src/user/user-service"; @@ -100,7 +98,6 @@ export const productionEEContainerModule = new ContainerModule((bind, unbind, is rebind(HostContainerMapping).to(HostContainerMappingEE).inSingletonScope(); bind(EMailDomainService).to(EMailDomainServiceImpl).inSingletonScope(); rebind(BlockedUserFilter).toService(EMailDomainService); - rebind(UserController).to(UserControllerEE).inSingletonScope(); bind(SnapshotService).toSelf().inSingletonScope(); bind(UserDeletionServiceEE).toSelf().inSingletonScope(); diff --git a/components/server/ee/src/user/user-controller.ts b/components/server/ee/src/user/user-controller.ts deleted file mode 100644 index 8fa620e3ff8bb2..00000000000000 --- a/components/server/ee/src/user/user-controller.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) 2020 Gitpod GmbH. All rights reserved. - * Licensed under the Gitpod Enterprise Source Code License, - * See License.enterprise.txt in the project root folder. - */ - -import { UserController } from "../../../src/user/user-controller"; -import { inject } from "inversify"; -import { LicenseEvaluator } from "@gitpod/licensor/lib"; - -export class UserControllerEE extends UserController { - @inject(LicenseEvaluator) protected evaluator: LicenseEvaluator; -} diff --git a/components/server/src/billing/entitlement-service.ts b/components/server/src/billing/entitlement-service.ts index dcbda95b37220d..d7093cab222bf4 100644 --- a/components/server/src/billing/entitlement-service.ts +++ b/components/server/src/billing/entitlement-service.ts @@ -66,10 +66,6 @@ export class CommunityEntitlementService implements EntitlementService { return true; } - async hasFixedWorkspaceResources(user: User, date: Date = new Date()): Promise { - return true; - } - async getDefaultWorkspaceTimeout(user: User, date: Date): Promise { return WORKSPACE_TIMEOUT_DEFAULT_SHORT; }