fix

Author: easyCZ

components/server/src/api/server.ts

@@ -0,0 +1,44 @@
+/**
+ * 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 * as http from "http";
+import * as express from "express";
+import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
+import { inject, injectable } from "inversify";
+import { APITeamsService } from "./teams";
+import { APIUserService } from "./user";
+import { ConnectRouter } from "@bufbuild/connect";
+import { expressConnectMiddleware } from "@bufbuild/connect-express";
+import { UserService as UserServiceDefinition } from "@gitpod/public-api/lib/gitpod/experimental/v1/user_connectweb";
+import { TeamsService as TeamsServiceDefinition } from "@gitpod/public-api/lib/gitpod/experimental/v1/teams_connectweb";
+
+@injectable()
+export class API {
+    @inject(APIUserService) protected readonly apiUserService: APIUserService;
+    @inject(APITeamsService) protected readonly apiTeamService: APITeamsService;
+
+    public listen(port: number): http.Server {
+        const app = express();
+        this.register(app);
+
+        const server = app.listen(9877, () => {
+            log.info(`Connect API server listening on port: ${port}`);
+        });
+
+        return server;
+    }
+
+    private register(app: express.Application) {
+        app.use(
+            expressConnectMiddleware({
+                routes: (router: ConnectRouter) => {
+                    router.service(UserServiceDefinition, this.apiUserService);
+                    router.service(TeamsServiceDefinition, this.apiTeamService);
+                },
+            }),
+        );
+    }
+}

components/server/src/api/teams.spec.db.ts

@@ -3,3 +3,35 @@
  * Licensed under the GNU Affero General Public License (AGPL).
  * See License.AGPL.txt in the project root for license information.
  */
+import { suite, test } from "mocha-typescript";
+import { APIUserService } from "./user";
+import { Container } from "inversify";
+import { testContainer } from "@gitpod/gitpod-db/lib";
+import { WorkspaceStarter } from "../workspace/workspace-starter";
+import { UserService } from "../user/user-service";
+import { BlockUserRequest, BlockUserResponse } from "@gitpod/public-api/lib/gitpod/experimental/v1/user_pb";
+import { User } from "@gitpod/gitpod-protocol";
+import { StopWorkspacePolicy } from "@gitpod/ws-manager/lib";
+import { Workspace } from "@gitpod/gitpod-protocol/lib/protocol";
+import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
+import { v4 as uuidv4 } from "uuid";
+import { ConnectError, Code } from "@bufbuild/connect";
+import * as chai from "chai";
+
+const expect = chai.expect;
+
+@suite()
+export class APITeamsServiceSpec {
+    private container: Container;
+
+    async before() {
+        this.container = testContainer.createChild();
+        this.container.bind(APIUserService).toSelf().inSingletonScope();
+    }
+
+    @test async getTeam_respondsWithTeamMembersAndInvite() {
+        const sut = this.container.get<APIUserService>(APIUserService);
+
+        const;
+    }
+}

components/server/src/container-module.ts

@@ -114,7 +114,8 @@ import { spicedbClientFromEnv, SpiceDBClient } from "./authorization/spicedb";
 import { Authorizer, PermissionChecker } from "./authorization/perms";
 import { EnvVarService } from "./workspace/env-var-service";
 import { APIUserService } from "./api/user";
-import { APITeamService } from "./api/teams";
+import { APITeamsService } from "./api/teams";
+import { API } from "./api/server";
 
 export const productionContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(Config).toConstantValue(ConfigFile.fromFile());
@@ -318,5 +319,6 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
 
     // grpc / Connect API
     bind(APIUserService).toSelf().inSingletonScope();
-    bind(APITeamService).toSelf().inSingletonScope();
+    bind(APITeamsService).toSelf().inSingletonScope();
+    bind(API).toSelf().inSingletonScope();
 });

components/server/src/server.ts

@@ -58,6 +58,7 @@ import { TeamsService as TeamsServiceDefinition } from "@gitpod/public-api/lib/g
 import { APIUserService } from "./api/user";
 import { ConnectRouter } from "@bufbuild/connect";
 import { APITeamsService } from "./api/teams";
+import { API, APIServer } from "./api/server";
 
 @injectable()
 export class Server<C extends GitpodClient, S extends GitpodServer> {
@@ -99,8 +100,7 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
     protected iamSessionApp?: express.Application;
     protected iamSessionAppServer?: http.Server;
 
-    @inject(APIUserService) protected readonly apiUserService: APIUserService;
-    @inject(APITeamsService) protected readonly apiTeamService: APITeamsService;
+    @inject(API) protected readonly api: API;
     protected apiServer?: http.Server;
 
     protected readonly eventEmitter = new EventEmitter();
@@ -399,20 +399,7 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
             });
         }
 
-        {
-            const apiApp = express();
-            apiApp.use(
-                expressConnectMiddleware({
-                    routes: (router: ConnectRouter) => {
-                        router.service(UserServiceDefinition, this.apiUserService);
-                        router.service(TeamsServiceDefinition, this.apiTeamService);
-                    },
-                }),
-            );
-            this.apiServer = apiApp.listen(9877, () => {
-                log.info(`Connect API server listening on: ${<AddressInfo>this.apiServer!.address()}`);
-            });
-        }
+        this.apiServer = this.api.listen(9877);
 
         this.debugApp.start();
     }