@gitpod/gitpod-protocol 0.1.5-pd-timeout-16089.2 → 0.1.5-pd-port-15915.6

package/src/accounting-protocol.ts

@@ -5,6 +5,7 @@
  */
 
 import { v4 as uuidv4 } from "uuid";
+import { Plans } from "./plans";
 import { User } from "./protocol";
 import { oneMonthLater } from "./util/timeutil";
 
@@ -213,6 +214,14 @@ export namespace Subscription {
         } while (nextStartDate < now.toISOString());
         return { startDate, endDate: nextStartDate };
     }
+
+    export function isOldTeamSubscription(s: Subscription): boolean {
+        return Plans.isTeamPlan(s.planId) && !s.teamMembershipId;
+    }
+
+    export function isTeamSubscription2(s: Subscription): boolean {
+        return Plans.isTeamPlan(s.planId) && !!s.teamMembershipId;
+    }
 }
 
 export type MaybeSubscription = Subscription | undefined;

package/src/gitpod-service.ts

@@ -27,6 +27,7 @@ import {
     UserSSHPublicKeyValue,
     SSHPublicKeyValue,
     IDESettings,
+    EnvVarWithValue,
 } from "./protocol";
 import {
     Team,
@@ -153,6 +154,9 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     getUserStorageResource(options: GitpodServer.GetUserStorageResourceOptions): Promise<string>;
     updateUserStorageResource(options: GitpodServer.UpdateUserStorageResourceOptions): Promise<void>;
 
+    // Workspace env vars
+    getWorkspaceEnvVars(workspaceId: string): Promise<EnvVarWithValue[]>;
+
     // User env vars
     getEnvVars(): Promise<UserEnvVarValue[]>;
     getAllEnvVars(): Promise<UserEnvVarValue[]>;
@@ -305,11 +309,25 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
     /**
      * Frontend notifications
      */
-    getNotifications(): Promise<string[]>;
+    getNotifications(): Promise<AppNotification[]>;
 
     getSupportedWorkspaceClasses(): Promise<SupportedWorkspaceClass[]>;
 }
 
+export interface AppNotification {
+    message: string;
+    action?: {
+        url: string;
+        label: string;
+    };
+    notClosable?: boolean;
+}
+export namespace AppNotification {
+    export function is(data: any): data is AppNotification {
+        return data && typeof data === "object" && data.hasOwnProperty("message");
+    }
+}
+
 export interface RateLimiterError {
     method?: string;
 

package/src/plans.ts

@@ -490,6 +490,22 @@ export namespace Plans {
         return chargebeeId === Plans.FREE_OPEN_SOURCE.chargebeeId;
     }
 
+    export function isPersonalPlan(planId: string | undefined): boolean {
+        const plan = Plans.getById(planId);
+        if (!plan) {
+            return false;
+        }
+        return !plan.team;
+    }
+
+    export function isTeamPlan(planId: string | undefined): boolean {
+        const plan = Plans.getById(planId);
+        if (!plan) {
+            return false;
+        }
+        return !!plan.team;
+    }
+
     export function getHoursPerMonth(plan: Plan): number {
         return plan.hoursPerMonth == "unlimited" ? ABSOLUTE_MAX_USAGE : plan.hoursPerMonth;
     }

package/src/protocol.ts

@@ -4,7 +4,7 @@
  * See License.AGPL.txt in the project root for license information.
  */
 
-import { WorkspaceInstance, PortVisibility } from "./workspace-instance";
+import { WorkspaceInstance, PortVisibility, PortProtocol } from "./workspace-instance";
 import { RoleOrPermission } from "./permission";
 import { Project } from "./teams-projects-protocol";
 import { createHash } from "crypto";
@@ -230,9 +230,6 @@ export interface AdditionalUserData {
     // whether the user has been migrated to team attribution.
     // a corresponding feature flag (team_only_attribution) triggers the migration.
     isMigratedToTeamOnlyAttribution?: boolean;
-    // user globol workspace timeout
-    workspaceTimeout?: string;
-    disabledClosedTimeout?: boolean;
 }
 export namespace AdditionalUserData {
     export function set(user: User, partialData: Partial<AdditionalUserData>): User {
@@ -257,6 +254,16 @@ export interface ProfileDetails {
     companyName?: string;
     // the user's email
     emailAddress?: string;
+    // the user's company website
+    companyWebsite?: string;
+    // type of role user has in their job
+    jobRole?: string;
+    // freeform entry for job role user works in (when jobRole is "other")
+    jobRoleOther?: string;
+    // what user hopes to accomplish when they signed up
+    signupGoals?: string;
+    // freeform entry for signup goals (when signupGoals is "other")
+    signupGoalsOther?: string;
 }
 
 export interface EmailNotificationSettings {
@@ -326,6 +333,8 @@ export namespace NamedWorkspaceFeatureFlag {
     }
 }
 
+export type EnvVar = UserEnvVar | ProjectEnvVarWithValue | EnvVarWithValue;
+
 export interface EnvVarWithValue {
     name: string;
     value: string;
@@ -980,6 +989,7 @@ export interface PortConfig {
     port: number;
     onOpen?: PortOnOpen;
     visibility?: PortVisibility;
+    protocol?: PortProtocol;
     description?: string;
     name?: string;
 }

package/src/workspace-instance.ts

@@ -186,6 +186,9 @@ export type AdmissionLevel = "owner_only" | "everyone";
 // PortVisibility describes how a port can be accessed
 export type PortVisibility = "public" | "private";
 
+// PortProtocol
+export type PortProtocol = "http" | "https";
+
 // WorkspaceInstancePort describes a port exposed on a workspace instance
 export interface WorkspaceInstancePort {
     // The outward-facing port number
@@ -196,6 +199,8 @@ export interface WorkspaceInstancePort {
 
     // Public, outward-facing URL where the port can be accessed on.
     url?: string;
+
+    protocol?: PortProtocol;
 }
 
 // WorkspaceInstanceRepoStatus describes the status of th Git working copy of a workspace