@gitpod/gitpod-protocol 0.1.5-wth-test.41 → 0.1.5-wv-add-image-builds-to-dashboard.0

package/lib/attribution.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2022 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 { User } from "./protocol";
+import { Team } from "./teams-projects-protocol";
+export declare type AttributionId = UserAttributionId | TeamAttributionId;
+export declare type AttributionTarget = "user" | "team";
+export interface UserAttributionId {
+    kind: "user";
+    userId: string;
+}
+export interface TeamAttributionId {
+    kind: "team";
+    teamId: string;
+}
+export declare namespace AttributionId {
+    function create(userOrTeam: User | Team): AttributionId;
+    function parse(s: string): UserAttributionId | TeamAttributionId | undefined;
+    function render(id: AttributionId): string;
+    function equals(a: AttributionId, b: AttributionId): boolean;
+}
+//# sourceMappingURL=attribution.d.ts.map

package/lib/attribution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"attribution.d.ts","sourceRoot":"","sources":["../src/attribution.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,2BAA2B,CAAC;AAEjD,oBAAY,aAAa,GAAG,iBAAiB,GAAG,iBAAiB,CAAC;AAClE,oBAAY,iBAAiB,GAAG,MAAM,GAAG,MAAM,CAAC;AAEhD,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AACD,MAAM,WAAW,iBAAiB;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,yBAAiB,aAAa,CAAC;IAG3B,SAAgB,MAAM,CAAC,UAAU,EAAE,IAAI,GAAG,IAAI,GAAG,aAAa,CAM7D;IAED,SAAgB,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,iBAAiB,GAAG,SAAS,CAgBlF;IAED,SAAgB,MAAM,CAAC,EAAE,EAAE,aAAa,GAAG,MAAM,CAOhD;IAED,SAAgB,MAAM,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,GAAG,OAAO,CAElE;CACJ"}

package/lib/attribution.js

@@ -0,0 +1,54 @@
+"use strict";
+/**
+ * Copyright (c) 2022 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AttributionId = void 0;
+const protocol_1 = require("./protocol");
+var AttributionId;
+(function (AttributionId) {
+    const SEPARATOR = ":";
+    function create(userOrTeam) {
+        if (protocol_1.User.is(userOrTeam)) {
+            return { kind: "user", userId: userOrTeam.id };
+        }
+        else {
+            return { kind: "team", teamId: userOrTeam.id };
+        }
+    }
+    AttributionId.create = create;
+    function parse(s) {
+        if (!s) {
+            return undefined;
+        }
+        const parts = s.split(":");
+        if (parts.length !== 2) {
+            return undefined;
+        }
+        switch (parts[0]) {
+            case "user":
+                return { kind: "user", userId: parts[1] };
+            case "team":
+                return { kind: "team", teamId: parts[1] };
+            default:
+                return undefined;
+        }
+    }
+    AttributionId.parse = parse;
+    function render(id) {
+        switch (id.kind) {
+            case "user":
+                return `user${SEPARATOR}${id.userId}`;
+            case "team":
+                return `team${SEPARATOR}${id.teamId}`;
+        }
+    }
+    AttributionId.render = render;
+    function equals(a, b) {
+        return render(a) === render(b);
+    }
+    AttributionId.equals = equals;
+})(AttributionId = exports.AttributionId || (exports.AttributionId = {}));
+//# sourceMappingURL=attribution.js.map

package/lib/attribution.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"attribution.js","sourceRoot":"","sources":["../src/attribution.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,yCAAkC;AAelC,IAAiB,aAAa,CAyC7B;AAzCD,WAAiB,aAAa;IAC1B,MAAM,SAAS,GAAG,GAAG,CAAC;IAEtB,SAAgB,MAAM,CAAC,UAAuB;QAC1C,IAAI,eAAI,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE;YACrB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;SAClD;aAAM;YACH,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;SAClD;IACL,CAAC;IANe,oBAAM,SAMrB,CAAA;IAED,SAAgB,KAAK,CAAC,CAAS;QAC3B,IAAI,CAAC,CAAC,EAAE;YACJ,OAAO,SAAS,CAAC;SACpB;QACD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;YACpB,OAAO,SAAS,CAAC;SACpB;QACD,QAAQ,KAAK,CAAC,CAAC,CAAC,EAAE;YACd,KAAK,MAAM;gBACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9C,KAAK,MAAM;gBACP,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9C;gBACI,OAAO,SAAS,CAAC;SACxB;IACL,CAAC;IAhBe,mBAAK,QAgBpB,CAAA;IAED,SAAgB,MAAM,CAAC,EAAiB;QACpC,QAAQ,EAAE,CAAC,IAAI,EAAE;YACb,KAAK,MAAM;gBACP,OAAO,OAAO,SAAS,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;YAC1C,KAAK,MAAM;gBACP,OAAO,OAAO,SAAS,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC;SAC7C;IACL,CAAC;IAPe,oBAAM,SAOrB,CAAA;IAED,SAAgB,MAAM,CAAC,CAAgB,EAAE,CAAgB;QACrD,OAAO,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC;IACnC,CAAC;IAFe,oBAAM,SAErB,CAAA;AACL,CAAC,EAzCgB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAyC7B"}

package/lib/auth.d.ts

@@ -1,7 +1,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 export interface SelectAccountPayload {
     currentUser: {

package/lib/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,oBAAoB;IACjC,WAAW,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,SAAS,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,MAAM,CAAC;KAC5B,CAAA;CACJ;AACD,yBAAiB,oBAAoB,CAAC;IAClC,SAAgB,EAAE,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,oBAAoB,CAE1D;CACJ"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,oBAAoB;IACjC,WAAW,EAAE;QACT,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,MAAM,CAAC;KAC5B,CAAC;IACF,SAAS,EAAE;QACP,IAAI,EAAE,MAAM,CAAC;QACb,SAAS,EAAE,MAAM,CAAC;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,gBAAgB,EAAE,MAAM,CAAC;KAC5B,CAAC;CACL;AACD,yBAAiB,oBAAoB,CAAC;IAClC,SAAgB,EAAE,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,oBAAoB,CAE1D;CACJ"}

package/lib/auth.js

@@ -2,7 +2,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SelectAccountPayload = void 0;

package/lib/billing-mode.d.ts

@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) 2022 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.
+ */
+/**
+ * BillingMode is used to answer the following questions:
+ *  - Should UI piece x be displayed for this user/team? (getBillingModeForUser/Team)
+ *  - What model should be used to limit this workspace's capabilities (mayStartWorkspace, setTimeout, workspace class, etc...) (getBillingMode(workspaceInstance.attributionId))
+ *  - How is a workspace session charged for? (getBillingMode(workspaceInstance.attributionId))
+ */
+export declare type BillingMode = None | Chargebee | UsageBased;
+export declare namespace BillingMode {
+    const NONE: None;
+    /** Incl. upgrade and status */
+    function showUsageBasedBilling(billingMode?: BillingMode): boolean;
+    function showTeamSubscriptionUI(billingMode?: BillingMode): boolean;
+    function canSetWorkspaceClass(billingMode?: BillingMode): boolean;
+    function canSetCostCenter(billingMode: BillingMode): boolean;
+}
+/** Payment is disabled */
+interface None {
+    mode: "none";
+}
+/** Sessions is handled with old subscription logic based on Chargebee */
+interface Chargebee {
+    mode: "chargebee";
+    /** True iff this is a team, and is based on a paid plan. Currently only set for teams! */
+    paid?: boolean;
+    canUpgradeToUBB?: boolean;
+    /** Name of team(s) that block switching to usage-based */
+    teamNames?: string[];
+}
+/** Session is handld with new usage-based logic */
+interface UsageBased {
+    mode: "usage-based";
+    /** True iff this is a team, and is based on a paid plan. Currently only set for teams! */
+    paid?: boolean;
+    /** User is already converted, but is member with at least one Chargebee-based "Team Plan" */
+    hasChargebeeTeamPlan?: boolean;
+    /** User is already converted, but is member or owner in at least one Chargebee-based "Team Subscription" */
+    hasChargebeeTeamSubscription?: boolean;
+}
+export {};
+//# sourceMappingURL=billing-mode.d.ts.map

package/lib/billing-mode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"billing-mode.d.ts","sourceRoot":"","sources":["../src/billing-mode.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AACH,oBAAY,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC;AACxD,yBAAiB,WAAW,CAAC;IAClB,MAAM,IAAI,EAAE,IAElB,CAAC;IAEF,+BAA+B;IAC/B,SAAgB,qBAAqB,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAOxE;IAED,SAAgB,sBAAsB,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAQzE;IAED,SAAgB,oBAAoB,CAAC,WAAW,CAAC,EAAE,WAAW,GAAG,OAAO,CAOvE;IAED,SAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAGlE;CACJ;AAED,0BAA0B;AAC1B,UAAU,IAAI;IACV,IAAI,EAAE,MAAM,CAAC;CAChB;AAED,yEAAyE;AACzE,UAAU,SAAS;IACf,IAAI,EAAE,WAAW,CAAC;IAElB,0FAA0F;IAC1F,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,0DAA0D;IAC1D,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,mDAAmD;AACnD,UAAU,UAAU;IAChB,IAAI,EAAE,aAAa,CAAC;IAEpB,0FAA0F;IAC1F,IAAI,CAAC,EAAE,OAAO,CAAC;IAEf,6FAA6F;IAC7F,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAE/B,4GAA4G;IAC5G,4BAA4B,CAAC,EAAE,OAAO,CAAC;CAC1C"}

package/lib/billing-mode.js

@@ -0,0 +1,44 @@
+"use strict";
+/**
+ * Copyright (c) 2022 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BillingMode = void 0;
+var BillingMode;
+(function (BillingMode) {
+    BillingMode.NONE = {
+        mode: "none",
+    };
+    /** Incl. upgrade and status */
+    function showUsageBasedBilling(billingMode) {
+        if (!billingMode) {
+            return false;
+        }
+        return (billingMode.mode === "usage-based" || (billingMode.mode === "chargebee" && !!billingMode.canUpgradeToUBB));
+    }
+    BillingMode.showUsageBasedBilling = showUsageBasedBilling;
+    function showTeamSubscriptionUI(billingMode) {
+        if (!billingMode) {
+            return false;
+        }
+        return (billingMode.mode === "chargebee" ||
+            (billingMode.mode === "usage-based" && !!billingMode.hasChargebeeTeamSubscription));
+    }
+    BillingMode.showTeamSubscriptionUI = showTeamSubscriptionUI;
+    function canSetWorkspaceClass(billingMode) {
+        if (!billingMode) {
+            return false;
+        }
+        // if has any Stripe subscription, either directly or per team
+        return billingMode.mode === "usage-based";
+    }
+    BillingMode.canSetWorkspaceClass = canSetWorkspaceClass;
+    function canSetCostCenter(billingMode) {
+        // if has any Stripe Subscription, either directly or per team
+        return billingMode.mode === "usage-based";
+    }
+    BillingMode.canSetCostCenter = canSetCostCenter;
+})(BillingMode = exports.BillingMode || (exports.BillingMode = {}));
+//# sourceMappingURL=billing-mode.js.map

package/lib/billing-mode.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"billing-mode.js","sourceRoot":"","sources":["../src/billing-mode.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AASH,IAAiB,WAAW,CAsC3B;AAtCD,WAAiB,WAAW;IACX,gBAAI,GAAS;QACtB,IAAI,EAAE,MAAM;KACf,CAAC;IAEF,+BAA+B;IAC/B,SAAgB,qBAAqB,CAAC,WAAyB;QAC3D,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,CACH,WAAW,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,CAC5G,CAAC;IACN,CAAC;IAPe,iCAAqB,wBAOpC,CAAA;IAED,SAAgB,sBAAsB,CAAC,WAAyB;QAC5D,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,CACH,WAAW,CAAC,IAAI,KAAK,WAAW;YAChC,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa,IAAI,CAAC,CAAC,WAAW,CAAC,4BAA4B,CAAC,CACrF,CAAC;IACN,CAAC;IARe,kCAAsB,yBAQrC,CAAA;IAED,SAAgB,oBAAoB,CAAC,WAAyB;QAC1D,IAAI,CAAC,WAAW,EAAE;YACd,OAAO,KAAK,CAAC;SAChB;QAED,8DAA8D;QAC9D,OAAO,WAAW,CAAC,IAAI,KAAK,aAAa,CAAC;IAC9C,CAAC;IAPe,gCAAoB,uBAOnC,CAAA;IAED,SAAgB,gBAAgB,CAAC,WAAwB;QACrD,8DAA8D;QAC9D,OAAO,WAAW,CAAC,IAAI,KAAK,aAAa,CAAC;IAC9C,CAAC;IAHe,4BAAgB,mBAG/B,CAAA;AACL,CAAC,EAtCgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAsC3B"}

package/lib/blocked-repositories-protocol.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright (c) 2022 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 interface BlockedRepository {
+    id: number;
+    urlRegexp: string;
+    blockUser: boolean;
+    createdAt: string;
+    updatedAt: string;
+}
+//# sourceMappingURL=blocked-repositories-protocol.d.ts.map

package/lib/blocked-repositories-protocol.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"blocked-repositories-protocol.d.ts","sourceRoot":"","sources":["../src/blocked-repositories-protocol.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB"}

package/lib/blocked-repositories-protocol.js

@@ -0,0 +1,8 @@
+"use strict";
+/**
+ * Copyright (c) 2022 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.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=blocked-repositories-protocol.js.map

package/lib/blocked-repositories-protocol.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"blocked-repositories-protocol.js","sourceRoot":"","sources":["../src/blocked-repositories-protocol.ts"],"names":[],"mappings":";AAAA;;;;GAIG"}

package/lib/context-url.d.ts

@@ -1,18 +1,30 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
+ */
+import { Workspace } from ".";
+/**
+ * The whole point of these methods is to overcome inconsistencies in our data model.
+ * Ideally we remove it at some point once we fixed our model, as it:
+ *  - duplicates logic
+ *  - but additional burden on clients (using this, copying this to other languages!)
+ *
+ * TODO(gpl) See if we can get this into `server` code to remove the burden from clients
  */
 export declare namespace ContextURL {
-    const INCREMENTAL_PREBUILD_PREFIX = "incremental-prebuild";
     const PREBUILD_PREFIX = "prebuild";
     const IMAGEBUILD_PREFIX = "imagebuild";
+    const SNAPSHOT_PREFIX = "snapshot";
+    const REFERRER_PREFIX = "referrer:";
     /**
-     * The field "contextUrl" might contain prefixes like:
-     *  - envvar1=value1/...
-     *  - prebuild/...
-     * This is the analogon to the (Prefix)ContextParser structure in "server".
+     * This function will (try to) return the HTTP(S) URL of the context the user originally created this workspace on.
+     * Especially it will not contain any modifiers or be of different scheme than HTTP(S).
+     *
+     * Use this function if you need to provided a _working_ URL to the original context.
+     * @param ws
+     * @returns
      */
-    function parseToURL(contextUrl: string | undefined): URL | undefined;
+    function getNormalizedURL(ws: Pick<Workspace, "context" | "contextURL"> | undefined): URL | undefined;
 }
 //# sourceMappingURL=context-url.d.ts.map

package/lib/context-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-url.d.ts","sourceRoot":"","sources":["../src/context-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,yBAAiB,UAAU,CAAC;IACnB,MAAM,2BAA2B,yBAAyB,CAAC;IAC3D,MAAM,eAAe,aAAa,CAAC;IACnC,MAAM,iBAAiB,eAAe,CAAC;IAE9C;;;;;OAKG;IACH,SAAgB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAgC1E;CACF"}
+{"version":3,"file":"context-url.d.ts","sourceRoot":"","sources":["../src/context-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,CAAC;AAE9B;;;;;;;GAOG;AACH,yBAAiB,UAAU,CAAC;IACjB,MAAM,eAAe,aAAa,CAAC;IACnC,MAAM,iBAAiB,eAAe,CAAC;IACvC,MAAM,eAAe,aAAa,CAAC;IACnC,MAAM,eAAe,cAAc,CAAC;IAE3C;;;;;;;OAOG;IACH,SAAgB,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC,GAAG,SAAS,GAAG,GAAG,GAAG,SAAS,CAY3G;CAgEJ"}

package/lib/context-url.js

@@ -2,40 +2,92 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextURL = void 0;
+/**
+ * The whole point of these methods is to overcome inconsistencies in our data model.
+ * Ideally we remove it at some point once we fixed our model, as it:
+ *  - duplicates logic
+ *  - but additional burden on clients (using this, copying this to other languages!)
+ *
+ * TODO(gpl) See if we can get this into `server` code to remove the burden from clients
+ */
 var ContextURL;
 (function (ContextURL) {
-    ContextURL.INCREMENTAL_PREBUILD_PREFIX = "incremental-prebuild";
     ContextURL.PREBUILD_PREFIX = "prebuild";
     ContextURL.IMAGEBUILD_PREFIX = "imagebuild";
+    ContextURL.SNAPSHOT_PREFIX = "snapshot";
+    ContextURL.REFERRER_PREFIX = "referrer:";
+    /**
+     * This function will (try to) return the HTTP(S) URL of the context the user originally created this workspace on.
+     * Especially it will not contain any modifiers or be of different scheme than HTTP(S).
+     *
+     * Use this function if you need to provided a _working_ URL to the original context.
+     * @param ws
+     * @returns
+     */
+    function getNormalizedURL(ws) {
+        const normalized = normalize(ws);
+        if (!normalized) {
+            return undefined;
+        }
+        try {
+            return new URL(normalized);
+        }
+        catch (err) {
+            console.debug(`unable to parse URL from normalized contextURL: '${normalized}'`);
+        }
+        return undefined;
+    }
+    ContextURL.getNormalizedURL = getNormalizedURL;
+    function normalize(ws) {
+        if (!ws) {
+            return undefined;
+        }
+        if (ws.context.normalizedContextURL) {
+            return ws.context.normalizedContextURL;
+        }
+        // fallback: we do not yet set normalizedContextURL on all workspaces, yet, let alone older existing workspaces
+        let fallback = undefined;
+        try {
+            fallback = removePrefixes(ws.contextURL);
+        }
+        catch (err) {
+            console.error(`unable to remove prefixes from contextURL: '${ws.contextURL}'`, err);
+        }
+        return fallback;
+    }
     /**
      * The field "contextUrl" might contain prefixes like:
      *  - envvar1=value1/...
      *  - prebuild/...
      * This is the analogon to the (Prefix)ContextParser structure in "server".
      */
-    function parseToURL(contextUrl) {
+    function removePrefixes(contextUrl) {
         if (contextUrl === undefined) {
             return undefined;
         }
         const segments = contextUrl.split("/");
         if (segments.length === 1) {
-            return new URL(segments[0]); // this might be something, we just try
+            return segments[0]; // this might be something, we just try
         }
         const segmentsToURL = (offset) => {
             let rest = segments.slice(offset).join("/");
+            if (/^git@[^:\/]+:/.test(rest)) {
+                rest = rest.replace(/^git@([^:\/]+):/, "https://$1/");
+            }
             if (!rest.startsWith("http")) {
-                rest = 'https://' + rest;
+                rest = "https://" + rest;
             }
-            return new URL(rest);
+            return rest;
         };
         const firstSegment = segments[0];
         if (firstSegment === ContextURL.PREBUILD_PREFIX ||
-            firstSegment === ContextURL.INCREMENTAL_PREBUILD_PREFIX ||
-            firstSegment === ContextURL.IMAGEBUILD_PREFIX) {
+            firstSegment === ContextURL.IMAGEBUILD_PREFIX ||
+            firstSegment === ContextURL.SNAPSHOT_PREFIX ||
+            firstSegment.startsWith(ContextURL.REFERRER_PREFIX)) {
             return segmentsToURL(1);
         }
         // check for env vars
@@ -44,6 +96,5 @@ var ContextURL;
         }
         return segmentsToURL(0);
     }
-    ContextURL.parseToURL = parseToURL;
 })(ContextURL = exports.ContextURL || (exports.ContextURL = {}));
 //# sourceMappingURL=context-url.js.map

package/lib/context-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-url.js","sourceRoot":"","sources":["../src/context-url.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,IAAiB,UAAU,CA4C1B;AA5CD,WAAiB,UAAU;IACZ,sCAA2B,GAAG,sBAAsB,CAAC;IACrD,0BAAe,GAAG,UAAU,CAAC;IAC7B,4BAAiB,GAAG,YAAY,CAAC;IAE9C;;;;;OAKG;IACH,SAAgB,UAAU,CAAC,UAA8B;QACvD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC5B,OAAO,SAAS,CAAC;SAClB;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,OAAO,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAE,uCAAuC;SACtE;QAED,MAAM,aAAa,GAAG,CAAC,MAAc,EAAO,EAAE;YAC5C,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC5B,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;aAC1B;YACD,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,CAAC;QAGF,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,YAAY,KAAK,WAAA,eAAe;YAChC,YAAY,KAAK,WAAA,2BAA2B;YAC5C,YAAY,KAAK,WAAA,iBAAiB,EAAE;YACtC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,qBAAqB;QACrB,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YACpC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;SACzB;QAED,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;IAhCe,qBAAU,aAgCzB,CAAA;AACH,CAAC,EA5CgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA4C1B"}
+{"version":3,"file":"context-url.js","sourceRoot":"","sources":["../src/context-url.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAIH;;;;;;;GAOG;AACH,IAAiB,UAAU,CA0F1B;AA1FD,WAAiB,UAAU;IACV,0BAAe,GAAG,UAAU,CAAC;IAC7B,4BAAiB,GAAG,YAAY,CAAC;IACjC,0BAAe,GAAG,UAAU,CAAC;IAC7B,0BAAe,GAAG,WAAW,CAAC;IAE3C;;;;;;;OAOG;IACH,SAAgB,gBAAgB,CAAC,EAAyD;QACtF,MAAM,UAAU,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,SAAS,CAAC;SACpB;QAED,IAAI;YACA,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,oDAAoD,UAAU,GAAG,CAAC,CAAC;SACpF;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAZe,2BAAgB,mBAY/B,CAAA;IAED,SAAS,SAAS,CAAC,EAAyD;QACxE,IAAI,CAAC,EAAE,EAAE;YACL,OAAO,SAAS,CAAC;SACpB;QACD,IAAI,EAAE,CAAC,OAAO,CAAC,oBAAoB,EAAE;YACjC,OAAO,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC;SAC1C;QAED,+GAA+G;QAC/G,IAAI,QAAQ,GAAuB,SAAS,CAAC;QAC7C,IAAI;YACA,QAAQ,GAAG,cAAc,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;SAC5C;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,+CAA+C,EAAE,CAAC,UAAU,GAAG,EAAE,GAAG,CAAC,CAAC;SACvF;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACH,SAAS,cAAc,CAAC,UAA8B;QAClD,IAAI,UAAU,KAAK,SAAS,EAAE;YAC1B,OAAO,SAAS,CAAC;SACpB;QAED,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;YACvB,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,uCAAuC;SAC9D;QAED,MAAM,aAAa,GAAG,CAAC,MAAc,EAAU,EAAE;YAC7C,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC5C,IAAI,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC5B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;aACzD;YACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBAC1B,IAAI,GAAG,UAAU,GAAG,IAAI,CAAC;aAC5B;YACD,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;QAEF,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QACjC,IACI,YAAY,KAAK,WAAA,eAAe;YAChC,YAAY,KAAK,WAAA,iBAAiB;YAClC,YAAY,KAAK,WAAA,eAAe;YAChC,YAAY,CAAC,UAAU,CAAC,WAAA,eAAe,CAAC,EAC1C;YACE,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;SAC3B;QAED,qBAAqB;QACrB,IAAI,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE;YAClC,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;SAC3B;QAED,OAAO,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC;AACL,CAAC,EA1FgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QA0F1B"}

package/lib/context-url.spec.d.ts

@@ -1,12 +1,12 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 export declare class ContextUrlTest {
     parseContextUrl_withEnvVar(): void;
     parseContextUrl_withEnvVar_withoutSchema(): void;
-    parseContextUrl_withPrebuild(): void;
-    parseContextUrl_withPrebuild_withoutSchema(): void;
+    parseContextUrl_withEnvVar_sshUrl(): void;
+    parseContextUrl_badUrl(): void;
 }
 //# sourceMappingURL=context-url.spec.d.ts.map

package/lib/context-url.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context-url.spec.d.ts","sourceRoot":"","sources":["../src/context-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,cAAc;IAEV,0BAA0B;IAM1B,wCAAwC;IAMxC,4BAA4B;IAM5B,0CAA0C;CAK1D"}
+{"version":3,"file":"context-url.spec.d.ts","sourceRoot":"","sources":["../src/context-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAUH,qBACa,cAAc;IACV,0BAA0B;IAS1B,wCAAwC;IASxC,iCAAiC;IASjC,sBAAsB;CAItC"}

package/lib/context-url.spec.js

@@ -2,7 +2,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -21,24 +21,32 @@ const context_url_1 = require("./context-url");
 const expect = chai.expect;
 let ContextUrlTest = class ContextUrlTest {
     parseContextUrl_withEnvVar() {
-        const actual = context_url_1.ContextURL.parseToURL("passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo");
+        const actual = context_url_1.ContextURL.getNormalizedURL({
+            contextURL: "passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo",
+            context: {},
+        });
         expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
         expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
     }
     parseContextUrl_withEnvVar_withoutSchema() {
-        const actual = context_url_1.ContextURL.parseToURL("passedin=test%20value/github.com/gitpod-io/gitpod-test-repo");
+        const actual = context_url_1.ContextURL.getNormalizedURL({
+            contextURL: "passedin=test%20value/github.com/gitpod-io/gitpod-test-repo",
+            context: {},
+        });
         expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
         expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
     }
-    parseContextUrl_withPrebuild() {
-        const actual = context_url_1.ContextURL.parseToURL("prebuild/https://github.com/gitpod-io/gitpod-test-repo");
+    parseContextUrl_withEnvVar_sshUrl() {
+        const actual = context_url_1.ContextURL.getNormalizedURL({
+            contextURL: "passedin=test%20value/git@github.com:gitpod-io/gitpod-test-repo.git",
+            context: {},
+        });
         expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
-        expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
+        expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo.git");
     }
-    parseContextUrl_withPrebuild_withoutSchema() {
-        const actual = context_url_1.ContextURL.parseToURL("prebuild/github.com/gitpod-io/gitpod-test-repo");
-        expect(actual === null || actual === void 0 ? void 0 : actual.host).to.equal("github.com");
-        expect(actual === null || actual === void 0 ? void 0 : actual.pathname).to.equal("/gitpod-io/gitpod-test-repo");
+    parseContextUrl_badUrl() {
+        const actual = context_url_1.ContextURL.getNormalizedURL({ contextURL: "[Object object]", context: {} });
+        expect(actual).to.be.undefined;
     }
 };
 __decorate([
@@ -58,13 +66,13 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], ContextUrlTest.prototype, "parseContextUrl_withPrebuild", null);
+], ContextUrlTest.prototype, "parseContextUrl_withEnvVar_sshUrl", null);
 __decorate([
     mocha_typescript_1.test,
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], ContextUrlTest.prototype, "parseContextUrl_withPrebuild_withoutSchema", null);
+], ContextUrlTest.prototype, "parseContextUrl_badUrl", null);
 ContextUrlTest = __decorate([
     mocha_typescript_1.suite
 ], ContextUrlTest);

package/lib/context-url.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"context-url.spec.js","sourceRoot":"","sources":["../src/context-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,6BAA6B;AAC7B,uDAA+C;AAC/C,+CAA2C;AAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B,IAAa,cAAc,GAA3B,MAAa,cAAc;IAEV,0BAA0B;QACnC,MAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,qEAAqE,CAAC,CAAC;QAC5G,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,wCAAwC;QACjD,MAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,6DAA6D,CAAC,CAAC;QACpG,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,4BAA4B;QACrC,MAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,wDAAwD,CAAC,CAAC;QAC/F,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,0CAA0C;QACnD,MAAM,MAAM,GAAG,wBAAU,CAAC,UAAU,CAAC,gDAAgD,CAAC,CAAC;QACvF,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;CACJ,CAAA;AAvBS;IAAL,uBAAI;;;;gEAIJ;AAEK;IAAL,uBAAI;;;;8EAIJ;AAEK;IAAL,uBAAI;;;;kEAIJ;AAEK;IAAL,uBAAI;;;;gFAIJ;AAxBQ,cAAc;IAD1B,wBAAK;GACO,cAAc,CAyB1B;AAzBY,wCAAc;AA0B3B,MAAM,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAA"}
+{"version":3,"file":"context-url.spec.js","sourceRoot":"","sources":["../src/context-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;AAEH,6BAA6B;AAC7B,uDAA+C;AAE/C,+CAA2C;AAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAK3B,IAAa,cAAc,GAA3B,MAAa,cAAc;IACV,0BAA0B;QACnC,MAAM,MAAM,GAAG,wBAAU,CAAC,gBAAgB,CAAC;YACvC,UAAU,EAAE,qEAAqE;YACjF,OAAO,EAAE,EAAE;SACE,CAAC,CAAC;QACnB,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,wCAAwC;QACjD,MAAM,MAAM,GAAG,wBAAU,CAAC,gBAAgB,CAAC;YACvC,UAAU,EAAE,6DAA6D;YACzE,OAAO,EAAE,EAAE;SACE,CAAC,CAAC;QACnB,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACrE,CAAC;IAEY,iCAAiC;QAC1C,MAAM,MAAM,GAAG,wBAAU,CAAC,gBAAgB,CAAC;YACvC,UAAU,EAAE,qEAAqE;YACjF,OAAO,EAAE,EAAE;SACE,CAAC,CAAC;QACnB,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACzE,CAAC;IAEY,sBAAsB;QAC/B,MAAM,MAAM,GAAG,wBAAU,CAAC,gBAAgB,CAAC,EAAE,UAAU,EAAE,iBAAiB,EAAE,OAAO,EAAE,EAAE,EAAkB,CAAC,CAAC;QAC3G,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,SAAS,CAAC;IACnC,CAAC;CACJ,CAAA;AA/BS;IAAL,uBAAI;;;;gEAOJ;AAEK;IAAL,uBAAI;;;;8EAOJ;AAEK;IAAL,uBAAI;;;;uEAOJ;AAEK;IAAL,uBAAI;;;;4DAGJ;AA/BQ,cAAc;IAD1B,wBAAK;GACO,cAAc,CAgC1B;AAhCY,wCAAc;AAiC3B,MAAM,CAAC,OAAO,GAAG,IAAI,cAAc,EAAE,CAAC"}

package/lib/encryption/container-module.d.ts

@@ -1,7 +1,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 import { interfaces } from "inversify";
 /**

package/lib/encryption/container-module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container-module.d.ts","sourceRoot":"","sources":["../../src/encryption/container-module.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,EAAE,UAAU,CAAC,uBAMzC,CAAC"}
+{"version":3,"file":"container-module.d.ts","sourceRoot":"","sources":["../../src/encryption/container-module.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAKvC;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,EAAE,UAAU,CAAC,uBAKzC,CAAC"}

package/lib/encryption/container-module.js

@@ -2,7 +2,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encryptionModule = void 0;
@@ -19,7 +19,7 @@ const encryption_service_1 = require("./encryption-service");
  *      };
  *  }).inSingletonScope();
  */
-const encryptionModule = bind => {
+const encryptionModule = (bind) => {
     bind(key_provider_1.KeyProvider).to(key_provider_1.KeyProviderImpl).inSingletonScope();
     bind(encryption_engine_1.EncryptionEngine).to(encryption_engine_1.EncryptionEngineImpl).inSingletonScope();
     bind(encryption_service_1.EncryptionService).to(encryption_service_1.EncryptionServiceImpl).inSingletonScope();

package/lib/encryption/container-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"container-module.js","sourceRoot":"","sources":["../../src/encryption/container-module.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,iDAA8D;AAC9D,2DAA6E;AAC7E,6DAAgF;AAEhF;;;;;;;;;GASG;AACI,MAAM,gBAAgB,GAAuC,IAAI,CAAC,EAAE;IAEvE,IAAI,CAAC,0BAAW,CAAC,CAAC,EAAE,CAAC,8BAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEzD,IAAI,CAAC,oCAAgB,CAAC,CAAC,EAAE,CAAC,wCAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnE,IAAI,CAAC,sCAAiB,CAAC,CAAC,EAAE,CAAC,0CAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACzE,CAAC,CAAC;AANW,QAAA,gBAAgB,oBAM3B"}
+{"version":3,"file":"container-module.js","sourceRoot":"","sources":["../../src/encryption/container-module.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAGH,iDAA8D;AAC9D,2DAA6E;AAC7E,6DAAgF;AAEhF;;;;;;;;;GASG;AACI,MAAM,gBAAgB,GAAuC,CAAC,IAAI,EAAE,EAAE;IACzE,IAAI,CAAC,0BAAW,CAAC,CAAC,EAAE,CAAC,8BAAe,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEzD,IAAI,CAAC,oCAAgB,CAAC,CAAC,EAAE,CAAC,wCAAoB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IACnE,IAAI,CAAC,sCAAiB,CAAC,CAAC,EAAE,CAAC,0CAAqB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACzE,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B"}

package/lib/encryption/encryption-engine.d.ts

@@ -1,7 +1,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 /// <reference types="node" />
 export interface KeyParams {

package/lib/encryption/encryption-engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encryption-engine.d.ts","sourceRoot":"","sources":["../../src/encryption/encryption-engine.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAKH,MAAM,WAAW,SAAS;IACtB,EAAE,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,aAAa;IAC1B,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAA;CACvB;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAClD,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9D;AAED;;;;;GAKG;AACF,qBACY,oBAAoB;IAC7B,QAAQ,CAAC,SAAS,iBAAiB;IACnC,QAAQ,CAAC,GAAG,YAAY;IAExB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa;IAajD,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;CAM7D"}
+{"version":3,"file":"encryption-engine.d.ts","sourceRoot":"","sources":["../../src/encryption/encryption-engine.ts"],"names":[],"mappings":"AAAA;;;;GAIG;;AAKH,MAAM,WAAW,SAAS;IACtB,EAAE,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,aAAa;IAC1B,0BAA0B;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;CACxB;AAED,eAAO,MAAM,gBAAgB,eAA6B,CAAC;AAC3D,MAAM,WAAW,gBAAgB;IAC7B;;OAEG;IACH,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAClD,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CAC9D;AAED;;;;;GAKG;AACH,qBACa,oBAAoB;IAC7B,QAAQ,CAAC,SAAS,iBAAiB;IACnC,QAAQ,CAAC,GAAG,YAAY;IAExB,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,aAAa;IAajD,OAAO,CAAC,aAAa,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;CAU7D"}

package/lib/encryption/encryption-engine.js

@@ -2,7 +2,7 @@
 /**
  * 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.
+ * See License.AGPL.txt in the project root for license information.
  */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EncryptionEngineImpl = exports.EncryptionEngine = void 0;
 const crypto = require("crypto");
 const inversify_1 = require("inversify");
-exports.EncryptionEngine = Symbol('EncryptionEngine');
+exports.EncryptionEngine = Symbol("EncryptionEngine");
 /**
  * For starters, let's use aes-cbc-256 with:
  * - 16 bytes/128 bits IV (the size of an aes-256-cbc block)
@@ -23,26 +23,26 @@ exports.EncryptionEngine = Symbol('EncryptionEngine');
  */
 let EncryptionEngineImpl = class EncryptionEngineImpl {
     constructor() {
-        this.algorithm = 'aes-256-cbc';
-        this.enc = 'base64';
+        this.algorithm = "aes-256-cbc";
+        this.enc = "base64";
     }
     encrypt(data, key) {
         const iv = crypto.randomBytes(16);
         const cipher = crypto.createCipheriv(this.algorithm, key, iv);
-        const encrypted = cipher.update(new Buffer(data, 'utf8'));
+        const encrypted = cipher.update(Buffer.from(data, "utf8"));
         const finalEncrypted = Buffer.concat([encrypted, cipher.final()]);
         return {
             data: finalEncrypted.toString(this.enc),
             keyParams: {
-                iv: iv.toString(this.enc)
-            }
+                iv: iv.toString(this.enc),
+            },
         };
     }
     decrypt(encryptedData, key) {
-        const decipher = crypto.createDecipheriv(this.algorithm, key, new Buffer(encryptedData.keyParams.iv, this.enc));
-        let decrypted = decipher.update(new Buffer(encryptedData.data, this.enc));
+        const decipher = crypto.createDecipheriv(this.algorithm, key, Buffer.from(encryptedData.keyParams.iv, this.enc));
+        let decrypted = decipher.update(Buffer.from(encryptedData.data, this.enc));
         const finalDecrypted = Buffer.concat([decrypted, decipher.final()]);
-        return finalDecrypted.toString('utf8');
+        return finalDecrypted.toString("utf8");
     }
 };
 EncryptionEngineImpl = __decorate([