[dashboard, server] use maySetTimeout

Author: iQQBot

components/dashboard/src/user-settings/Preferences.tsx

@@ -42,7 +42,7 @@ export default function Preferences() {
     const [allowConfigureWorkspaceTimeout, setAllowConfigureWorkspaceTimeout] = useState<boolean>(false);
     useEffect(() => {
         getGitpodService()
-            .server.supportConfigureWorkspaceTimeout()
+            .server.maySetTimeout()
             .then((r) => setAllowConfigureWorkspaceTimeout(r));
     }, []);
 

components/gitpod-protocol/src/gitpod-service.ts

@@ -313,7 +313,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getNotifications(): Promise<AppNotification[]>;
 
     getSupportedWorkspaceClasses(): Promise<SupportedWorkspaceClass[]>;
-    supportConfigureWorkspaceTimeout(): Promise<boolean>;
+    maySetTimeout(): Promise<boolean>;
     updateWorkspaceTimeoutSetting(setting: Partial<WorkspaceTimeoutSetting>): Promise<void>;
 }
 

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

@@ -411,7 +411,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         await this.requireEELicense(Feature.FeatureSetTimeout);
         const user = this.checkUser("setWorkspaceTimeout");
 
-        if (!(await this.maySetTimeout(user))) {
+        if (!(await this.entitlementService.maySetTimeout(user, new Date()))) {
             throw new ResponseError(ErrorCodes.PLAN_PROFESSIONAL_REQUIRED, "Plan upgrade is required");
         }
 
@@ -455,7 +455,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
 
         const user = this.checkUser("getWorkspaceTimeout");
 
-        const canChange = await this.maySetTimeout(user);
+        const canChange = await this.entitlementService.maySetTimeout(user, new Date());
 
         const workspace = await this.internalGetWorkspace(workspaceId, this.workspaceDb.trace(ctx));
         const runningInstance = await this.workspaceDb.trace(ctx).findRunningInstance(workspaceId);
@@ -494,13 +494,6 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         return PrebuiltWorkspace.isDone(pws);
     }
 
-    /**
-     * gitpod.io Extension point for implementing eligibility checks. Throws a ResponseError if not eligible.
-     */
-    protected async maySetTimeout(user: User): Promise<boolean> {
-        return this.entitlementService.maySetTimeout(user, new Date());
-    }
-
     public async controlAdmission(ctx: TraceContext, workspaceId: string, level: "owner" | "everyone"): Promise<void> {
         traceAPIParams(ctx, { workspaceId, level });
         traceWI(ctx, { workspaceId });

components/server/src/auth/rate-limiter.ts

@@ -232,7 +232,7 @@ const defaultFunctions: FunctionsConfig = {
     setUsageLimit: { group: "default", points: 1 },
     getNotifications: { group: "default", points: 1 },
     getSupportedWorkspaceClasses: { group: "default", points: 1 },
-    supportConfigureWorkspaceTimeout: { group: "default", points: 1 },
+    maySetTimeout: { group: "default", points: 1 },
     updateWorkspaceTimeoutSetting: { group: "default", points: 1 },
 };
 

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

@@ -499,8 +499,8 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         return user;
     }
 
-    public async supportConfigureWorkspaceTimeout(ctx: TraceContext): Promise<boolean> {
-        const user = this.checkUser("supportConfigureWorkspaceTimeout");
+    public async maySetTimeout(ctx: TraceContext): Promise<boolean> {
+        const user = this.checkUser("maySetTimeout");
         await this.guardAccess({ kind: "user", subject: user }, "get");
 
         return await this.entitlementService.maySetTimeout(user, new Date());
@@ -515,7 +515,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
             WorkspaceTimeoutDuration.validate(setting.workspaceTimeout);
         }
 
-        const user = this.checkUser("updateWorkspaceTimeoutSetting");
+        const user = this.checkAndBlockUser("updateWorkspaceTimeoutSetting");
         await this.guardAccess({ kind: "user", subject: user }, "update");
 
         if (!(await this.entitlementService.maySetTimeout(user, new Date()))) {