fix

Author: easyCZ

components/server/ee/src/container-module.ts

@@ -63,7 +63,7 @@ import { EntitlementServiceImpl } from "./billing/entitlement-service";
 import { EntitlementServiceUBP } from "./billing/entitlement-service-ubp";
 import { UsageService, UsageServiceImpl, NoOpUsageService } from "../../src/user/usage-service";
 import { APIUserService } from "../../src/api/user";
-import { Router } from "../../src/api/server";
+import { APIRouter } from "../../src/api/server";
 
 export const productionEEContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     rebind(Server).to(ServerEE).inSingletonScope();
@@ -139,5 +139,5 @@ export const productionEEContainerModule = new ContainerModule((bind, unbind, is
         .inSingletonScope();
 
     bind(APIUserService).toSelf().inSingletonScope();
-    bind(Router).toSelf().inSingletonScope();
+    bind(APIRouter).toSelf().inSingletonScope();
 });

components/server/src/api/server.ts

@@ -9,7 +9,7 @@ import { inject, injectable } from "inversify";
 import { APIUserService } from "./user";
 
 @injectable()
-export class Router {
+export class APIRouter {
     @inject(APIUserService) protected readonly userService: APIUserService;
 
     public routes(router: ConnectRouter) {

components/server/src/container-module.ts

@@ -113,7 +113,7 @@ import { IamSessionApp } from "./iam/iam-session-app";
 import { spicedbClientFromEnv, SpiceDBClient } from "./authorization/spicedb";
 import { Authorizer, PermissionChecker } from "./authorization/perms";
 import { EnvVarService } from "./workspace/env-var-service";
-import { Router } from "./api/server";
+import { APIRouter } from "./api/server";
 import { APIUserService } from "./api/user";
 
 export const productionContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
@@ -318,5 +318,5 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
 
     // grpc / Connect API
     bind(APIUserService).toSelf().inSingletonScope();
-    bind(Router).toSelf().inSingletonScope();
+    bind(APIRouter).toSelf().inSingletonScope();
 });

components/server/src/server.ts

@@ -53,7 +53,7 @@ import { LivenessController } from "./liveness/liveness-controller";
 import { IamSessionApp } from "./iam/iam-session-app";
 import { LongRunningMigrationService } from "@gitpod/gitpod-db/lib/long-running-migration/long-running-migration";
 import { expressConnectMiddleware } from "@bufbuild/connect-express";
-import { Router } from "./api/server";
+import { APIRouter } from "./api/server";
 
 @injectable()
 export class Server<C extends GitpodClient, S extends GitpodServer> {
@@ -95,7 +95,7 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
     protected iamSessionApp?: express.Application;
     protected iamSessionAppServer?: http.Server;
 
-    @inject(Router) protected readonly apiRouter: Router;
+    @inject(APIRouter) protected readonly apiRouter: APIRouter;
     protected apiServer?: http.Server;
 
     protected readonly eventEmitter = new EventEmitter();