Skip to content

Commit ba6aec9

Browse files
committed
try this
1 parent e62a070 commit ba6aec9

File tree

3 files changed

+11
-23
lines changed

3 files changed

+11
-23
lines changed

components/server/src/api/server.ts

Lines changed: 0 additions & 20 deletions
This file was deleted.

components/server/src/container-module.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,5 +318,4 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
318318

319319
// grpc / Connect API
320320
bind(APIUserService).toSelf().inSingletonScope();
321-
bind(APIRouter).toSelf().inSingletonScope();
322321
});

components/server/src/server.ts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ import { IamSessionApp } from "./iam/iam-session-app";
5454
import { LongRunningMigrationService } from "@gitpod/gitpod-db/lib/long-running-migration/long-running-migration";
5555
import { expressConnectMiddleware } from "@bufbuild/connect-express";
5656
import { APIRouter } from "./api/server";
57+
import { UserService as UserServiceDefinition } from "@gitpod/public-api/lib/gitpod/experimental/v1/user_connectweb";
58+
import { APIUserService } from "./api/user";
59+
import { ConnectRouter } from "@bufbuild/connect";
5760

5861
@injectable()
5962
export class Server<C extends GitpodClient, S extends GitpodServer> {
@@ -95,7 +98,7 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
9598
protected iamSessionApp?: express.Application;
9699
protected iamSessionAppServer?: http.Server;
97100

98-
@inject(APIRouter) protected readonly apiRouter: APIRouter;
101+
@inject(APIUserService) protected readonly apiUserService: APIUserService;
99102
protected apiServer?: http.Server;
100103

101104
protected readonly eventEmitter = new EventEmitter();
@@ -396,7 +399,13 @@ export class Server<C extends GitpodClient, S extends GitpodServer> {
396399

397400
{
398401
const apiApp = express();
399-
apiApp.use(expressConnectMiddleware({ routes: this.apiRouter.routes }));
402+
apiApp.use(
403+
expressConnectMiddleware({
404+
routes: (router: ConnectRouter) => {
405+
router.service(UserServiceDefinition, this.apiUserService);
406+
},
407+
}),
408+
);
400409
this.apiServer = apiApp.listen(9877, () => {
401410
log.info(`Connect API server listening on: ${<AddressInfo>this.apiServer!.address()}`);
402411
});

0 commit comments

Comments
 (0)