Skip to content

Commit 6c02e7c

Browse files
committed
Fix
1 parent e36ca4d commit 6c02e7c

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

components/server/src/api/server.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
import { ConnectRouter } from "@bufbuild/connect";
77
import { UserService as UserServiceDefinition } from "@gitpod/public-api/lib/gitpod/experimental/v1/user_connectweb";
88
import { inject, injectable } from "inversify";
9-
import { UserService } from "./user";
9+
import { APIUserService } from "./user";
1010

1111
@injectable()
1212
export class Router {
13-
@inject(UserService) protected readonly user: UserService;
13+
@inject(APIUserService) protected readonly userService: APIUserService;
1414

1515
public routes(router: ConnectRouter) {
16-
console.log("routes", router, this.user);
17-
router.service(UserServiceDefinition, this.user);
16+
console.log("routes", router);
17+
console.log("userservice", this.userService);
18+
router.service(UserServiceDefinition, this.userService);
1819
}
1920
}

components/server/src/api/user.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import {
2525
} from "@gitpod/public-api/lib/gitpod/experimental/v1/user_pb";
2626

2727
@injectable()
28-
export class UserService implements ServiceImpl<typeof UserServiceInterface> {
28+
export class APIUserService implements ServiceImpl<typeof UserServiceInterface> {
2929
public async getAuthenticatedUser(req: GetAuthenticatedUserRequest): Promise<GetAuthenticatedUserResponse> {
3030
throw new ConnectError("unimplemented", Code.Unimplemented);
3131
}

components/server/src/container-module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ import { spicedbClientFromEnv, SpiceDBClient } from "./authorization/spicedb";
114114
import { Authorizer, PermissionChecker } from "./authorization/perms";
115115
import { EnvVarService } from "./workspace/env-var-service";
116116
import { Router } from "./api/server";
117-
import { UserService as APIUserService } from "./api/user";
117+
import { APIUserService as APIUserService } from "./api/user";
118118

119119
export const productionContainerModule = new ContainerModule((bind, unbind, isBound, rebind) => {
120120
bind(Config).toConstantValue(ConfigFile.fromFile());
@@ -317,6 +317,6 @@ export const productionContainerModule = new ContainerModule((bind, unbind, isBo
317317
bind(PermissionChecker).to(Authorizer).inSingletonScope();
318318

319319
// grpc / Connect API
320-
bind(Router).toSelf().inSingletonScope();
321320
bind(APIUserService).toSelf().inSingletonScope();
321+
bind(Router).toSelf().inSingletonScope();
322322
});

0 commit comments

Comments
 (0)