Uodate

Author: jeanp413

components/dashboard/src/service/json-rpc-installation-client.ts

@@ -18,7 +18,7 @@ import {
     ListBlockedEmailDomainsResponse,
     CreateBlockedEmailDomainRequest,
     CreateBlockedEmailDomainResponse,
-} from "@gitpod/public-api/lib/gitpod/v1/verification_pb";
+} from "@gitpod/public-api/lib/gitpod/v1/installation_pb";
 import { ApplicationError, ErrorCodes } from "@gitpod/gitpod-protocol/lib/messaging/error";
 import { getGitpodService } from "./service";
 import { converter } from "./public-api";

components/server/src/api/installation-service-api.ts

@@ -18,7 +18,7 @@ import {
     ListBlockedEmailDomainsResponse,
     ListBlockedRepositoriesRequest,
     ListBlockedRepositoriesResponse,
-} from "@gitpod/public-api/lib/gitpod/v1/verification_pb";
+} from "@gitpod/public-api/lib/gitpod/v1/installation_pb";
 import { inject, injectable } from "inversify";
 import { InstallationService } from "../auth/installation-service";
 import { ctxUserId } from "../util/request-context";

components/server/src/auth/installation-service.ts

@@ -1,21 +1,18 @@
 /**
- * Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+ * 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 { AdminGetListRequest, AdminGetListResult, EmailDomainFilterEntry } from "@gitpod/gitpod-protocol";
 import { inject, injectable } from "inversify";
-import { EmailDomainFilterDB, TeamDB, UserDB, WorkspaceDB } from "@gitpod/gitpod-db/lib";
+import { EmailDomainFilterDB } from "@gitpod/gitpod-db/lib";
 import { BlockedRepository } from "@gitpod/gitpod-protocol/lib/blocked-repositories-protocol";
 import { Authorizer } from "../authorization/authorizer";
 import { BlockedRepositoryDB } from "@gitpod/gitpod-db/lib/blocked-repository-db";
 
 @injectable()
 export class InstallationService {
-    @inject(WorkspaceDB) protected workspaceDB: WorkspaceDB;
-    @inject(UserDB) protected userDB: UserDB;
-    @inject(TeamDB) protected teamDB: TeamDB;
     @inject(Authorizer) private readonly auth: Authorizer;
     @inject(BlockedRepositoryDB) private readonly blockedRepositoryDB: BlockedRepositoryDB;
     @inject(EmailDomainFilterDB) private readonly emailDomainFilterDB: EmailDomainFilterDB;

components/server/src/workspace/gitpod-server-impl.ts

@@ -1880,7 +1880,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         traceAPIParams(ctx, { req: censor(req, "searchTerm") }); // searchTerm may contain PII
 
         const admin = await this.guardAdminAccess("adminGetBlockedRepositories", { req }, Permission.ADMIN_USERS);
-        await this.auth.checkPermissionOnInstallation(admin.id, "configure");
 
         try {
             return await this.installationService.adminGetBlockedRepositories(admin.id, req);
@@ -1901,7 +1900,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             { urlRegexp, blockUser },
             Permission.ADMIN_USERS,
         );
-        await this.auth.checkPermissionOnInstallation(admin.id, "configure");
 
         return await this.installationService.adminCreateBlockedRepository(admin.id, {
             urlRegexp,
@@ -1913,7 +1911,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         traceAPIParams(ctx, { id });
 
         const admin = await this.guardAdminAccess("adminDeleteBlockedRepository", { id }, Permission.ADMIN_USERS);
-        await this.auth.checkPermissionOnInstallation(admin.id, "configure");
 
         await this.installationService.adminDeleteBlockedRepository(admin.id, id);
     }
@@ -2975,8 +2972,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     async adminGetBlockedEmailDomains(ctx: TraceContextWithSpan): Promise<EmailDomainFilterEntry[]> {
         const user = await this.checkAndBlockUser("adminGetBlockedEmailDomains");
         await this.guardAdminAccess("adminGetBlockedEmailDomains", { id: user.id }, Permission.ADMIN_USERS);
-        await this.auth.checkPermissionOnInstallation(user.id, "configure");
-        return this.installationService.adminGetBlockedEmailDomains(user.id);
+        return await this.installationService.adminGetBlockedEmailDomains(user.id);
     }
 
     async adminSaveBlockedEmailDomain(
@@ -2985,7 +2981,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     ): Promise<void> {
         const user = await this.checkAndBlockUser("adminSaveBlockedEmailDomain");
         await this.guardAdminAccess("adminSaveBlockedEmailDomain", { id: user.id }, Permission.ADMIN_USERS);
-        await this.auth.checkPermissionOnInstallation(user.id, "configure");
         await this.installationService.adminCreateBlockedEmailDomain(user.id, domainFilterentry);
     }
 }