@gitpod/gitpod-protocol 0.1.5-test.6 → 0.1.5-tweak-workspaceconfig-origin-docs-fork.0

package/src/messaging/proxy-factory.ts

@@ -105,13 +105,19 @@ export class JsonRpcProxyFactory<T extends object> implements ProxyHandler<T> {
             this.connectionPromiseResolve = resolve
         );
         this.connectionPromise.then(connection => {
-            connection.onClose(() =>
-                this.onDidCloseConnectionEmitter.fire(undefined)
-            );
-            this.onDidOpenConnectionEmitter.fire(undefined);
+            connection.onClose(() => this.fireConnectionClosed());
+            this.fireConnectionOpened();
         });
     }
 
+    fireConnectionClosed() {
+        this.onDidCloseConnectionEmitter.fire(undefined)
+    }
+
+    fireConnectionOpened() {
+        this.onDidOpenConnectionEmitter.fire(undefined);
+    }
+
     /**
      * Connect a MessageConnection to the factory.
      *
@@ -119,14 +125,8 @@ export class JsonRpcProxyFactory<T extends object> implements ProxyHandler<T> {
      * response.
      */
     listen(connection: MessageConnection) {
-        if (this.target) {
-            for (const prop in this.target) {
-                if (typeof this.target[prop] === 'function') {
-                    connection.onRequest(prop, (...args) => this.onRequest(prop, ...args));
-                    connection.onNotification(prop, (...args) => this.onNotification(prop, ...args));
-                }
-            }
-        }
+        connection.onRequest((method: string, ...params: any[]) => this.onRequest(method, ...params));
+        connection.onNotification((method: string, ...params: any[]) => this.onNotification(method, ...params));
         connection.onDispose(() => this.waitForConnection());
         connection.listen();
         this.connectionPromiseResolve(connection);
@@ -164,7 +164,9 @@ export class JsonRpcProxyFactory<T extends object> implements ProxyHandler<T> {
      * methods calls.
      */
     protected onNotification(method: string, ...args: any[]): void {
-        this.target[method](...args);
+        if (this.target[method]) {
+            this.target[method](...args);
+        }
     }
 
     /**
@@ -220,7 +222,7 @@ export class JsonRpcProxyFactory<T extends object> implements ProxyHandler<T> {
                     try {
                         if (isNotify) {
                             connection.sendNotification(p.toString(), ...args);
-                            resolve();
+                            resolve(undefined);
                         } else {
                             const resultPromise = connection.sendRequest(p.toString(), ...args) as Promise<any>;
                             resultPromise

package/src/payment-protocol.ts

@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2021 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.
+ */
+
+ export namespace PaymentProtocol {
+    export const UPDATE_GITPOD_SUBSCRIPTION_PATH = '/payment/chargebee'
+}
+
+export interface PlanCoupon {
+    chargebeePlanID: string;
+    newPrice: number;
+    description: string;
+}
+
+export interface GithubUpgradeURL {
+    url: string;
+    planID: number;
+}

package/src/permission.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 TypeFox GmbH. All rights reserved.
+ * Copyright (c) 2020 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.
  */
@@ -13,7 +13,9 @@ export const Permissions = {
     "registry-access": undefined,
     "admin-users": undefined,
     "admin-workspaces": undefined,
-    "admin-api": undefined
+    "admin-api": undefined,
+    "ide-settings": undefined,
+    "new-workspace-cluster": undefined,
 };
 export type PermissionName = keyof (typeof Permissions);
 export const Roles = {"devops": undefined, "viewer": undefined, "admin": undefined };
@@ -39,9 +41,6 @@ export namespace Permission {
     /** The permission for actions like block user, stop workspace, etc. */
     export const ENFORCEMENT: PermissionName = "enforcement";
 
-    /** The permission to start privileged workspaces */
-    export const PRIVILEGED_WORKSPACE: PermissionName = "privileged-ws";
-
     /** The permission for registry access (start workspaces referencing gitpod-internal Docker images) */
     export const REGISTRY_ACCESS: PermissionName = "registry-access";
 
@@ -54,6 +53,9 @@ export namespace Permission {
     /** The permission to access the admin API */
     export const ADMIN_API: PermissionName = "admin-api";
 
+    /** The permission to access the IDE settings */
+    export const IDE_SETTINGS: PermissionName = "ide-settings";
+
     export const is = (o: any): o is PermissionName => {
         return typeof(o) === 'string'
             && Permission.all().some(p => p === o);
@@ -67,14 +69,14 @@ export namespace Permission {
 }
 
 export namespace Role {
-    /** The default role for all Typefox developers */
+    /** The default role for all Gitpod developers */
     export const DEVOPS: Role = {
         name: "devops",
         permissions: [
             Permission.MONITOR,
             Permission.ENFORCEMENT,
-            Permission.PRIVILEGED_WORKSPACE,
             Permission.REGISTRY_ACCESS,
+            Permission.IDE_SETTINGS
         ]
     };
 
@@ -84,7 +86,6 @@ export namespace Role {
         permissions: [
             Permission.MONITOR,
             Permission.REGISTRY_ACCESS,
-            Permission.PRIVILEGED_WORKSPACE,
         ]
     };