@gitpod/gitpod-protocol 0.1.5-svenefftinge-dashboard-invalid-2274.5 → 0.1.5-tar-telemetry-settings-data.0

package/lib/util/generate-workspace-id.spec.js

@@ -0,0 +1,87 @@
+"use strict";
+/**
+ * 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.
+ */
+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;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const mocha_typescript_1 = require("mocha-typescript");
+const chai = require("chai");
+const generate_workspace_id_1 = require("./generate-workspace-id");
+const gitpod_host_url_1 = require("./gitpod-host-url");
+const expect = chai.expect;
+let TestGenerateWorkspaceId = class TestGenerateWorkspaceId {
+    testGenerateWorkspaceId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            for (let i = 0; i < 100; i++) {
+                const id = yield (0, generate_workspace_id_1.generateWorkspaceID)();
+                expect(new gitpod_host_url_1.GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
+            }
+        });
+    }
+    testLongestName() {
+        const longestColor = generate_workspace_id_1.colors.sort((a, b) => b.length - a.length)[0];
+        const longestAnimal = generate_workspace_id_1.animals.sort((a, b) => b.length - a.length)[0];
+        const longestName = `${longestColor}-${longestAnimal}-12345678`;
+        expect(longestName.length <= 36, `"${longestName}" is longer than 36 chars (${longestName.length})`).to.be.true;
+    }
+    testCustomName() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = [
+                ['foo', 'bar', 'foo-bar-'],
+                ['f', 'bar', '.{2,16}-bar-'],
+                ['gitpod-io', 'gitpod', 'gitpodio-gitpod-'],
+                ['this is rather long and has some "§$"% special chars', 'also here pretty long and needs abbreviation', 'thisisratherlon-alsohere-'],
+                ['breatheco-de', 'python-flask-api-tutorial', 'breathecode-pythonflaska-'],
+                ['UPPER', "CaSe", "upper-case-"]
+            ];
+            for (const d of data) {
+                const id = yield (0, generate_workspace_id_1.generateWorkspaceID)(d[0], d[1]);
+                expect(id).match(new RegExp("^" + d[2]));
+                expect(new gitpod_host_url_1.GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
+                expect(id.length <= 36, `"${id}" is longer than 36 chars (${id.length})`).to.be.true;
+            }
+        });
+    }
+};
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], TestGenerateWorkspaceId.prototype, "testGenerateWorkspaceId", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], TestGenerateWorkspaceId.prototype, "testLongestName", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], TestGenerateWorkspaceId.prototype, "testCustomName", null);
+TestGenerateWorkspaceId = __decorate([
+    mocha_typescript_1.suite
+], TestGenerateWorkspaceId);
+module.exports = new TestGenerateWorkspaceId();
+//# sourceMappingURL=generate-workspace-id.spec.js.map

package/lib/util/generate-workspace-id.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-workspace-id.spec.js","sourceRoot":"","sources":["../../src/util/generate-workspace-id.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;AAEH,uDAA8C;AAC9C,6BAA4B;AAC5B,mEAA+E;AAC/E,uDAAkD;AAElD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;AAEnB,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAEb,uBAAuB;;YACtC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC1B,MAAM,EAAE,GAAG,MAAM,IAAA,2CAAmB,GAAE,CAAC;gBACvC,MAAM,CAAC,IAAI,+BAAa,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;aACtF;QACL,CAAC;KAAA;IAEY,eAAe;QACxB,MAAM,YAAY,GAAG,8BAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,aAAa,GAAG,+BAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,MAAM,WAAW,GAAG,GAAG,YAAY,IAAI,aAAa,WAAW,CAAC;QAChE,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,EAAE,EAAE,IAAI,WAAW,8BAA8B,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACpH,CAAC;IAEkB,cAAc;;YAC7B,MAAM,IAAI,GAAG;gBACT,CAAC,KAAK,EAAC,KAAK,EAAC,UAAU,CAAC;gBACxB,CAAC,GAAG,EAAC,KAAK,EAAC,cAAc,CAAC;gBAC1B,CAAC,WAAW,EAAC,QAAQ,EAAC,kBAAkB,CAAC;gBACzC,CAAC,sDAAsD,EAAC,8CAA8C,EAAC,2BAA2B,CAAC;gBACnI,CAAC,cAAc,EAAE,2BAA2B,EAAE,2BAA2B,CAAC;gBAC1E,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC;aACnC,CAAA;YACD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;gBAClB,MAAM,EAAE,GAAG,MAAM,IAAA,2CAAmB,EAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACjD,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,GAAG,GAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACvC,MAAM,CAAC,IAAI,+BAAa,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACnF,MAAM,CAAC,EAAE,CAAC,MAAM,IAAI,EAAE,EAAE,IAAI,EAAE,8BAA8B,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;aACxF;QACL,CAAC;KAAA;CAEJ,CAAA;AA/BS;IAAL,uBAAI;;;;sEAKJ;AAEK;IAAL,uBAAI;;;;8DAKJ;AAEK;IAAL,uBAAI;;;;6DAeJ;AA/BQ,uBAAuB;IAAnC,wBAAK;GAAO,uBAAuB,CAiCnC;AACD,MAAM,CAAC,OAAO,GAAG,IAAI,uBAAuB,EAAE,CAAA"}

package/lib/util/gitpod-cookie.d.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.
+ */
+import * as cookie from 'cookie';
+/**
+ * This cookie indicates whether the connected client is a Gitpod user (= "has logged in within the last year") or not.
+ * This is used by "gitpod.io" and "www.gitpod.io" to display different content/buttons.
+ */
+export declare const NAME = "gitpod-user";
+export declare const VALUE = "true";
+/**
+ * @param domain The domain the Gitpod installation is installed onto
+ * @returns
+ */
+export declare function options(domain: string): cookie.CookieSerializeOptions;
+export declare function generateCookie(domain: string): string;
+export declare function isPresent(cookies: string): boolean;
+//# sourceMappingURL=gitpod-cookie.d.ts.map

package/lib/util/gitpod-cookie.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitpod-cookie.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-cookie.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC;;;GAGG;AACH,eAAO,MAAM,IAAI,gBAAgB,CAAC;AAClC,eAAO,MAAM,KAAK,SAAS,CAAC;AAE5B;;;GAGG;AACH,wBAAgB,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,sBAAsB,CAUrE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGlD"}

package/lib/util/gitpod-cookie.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isPresent = exports.generateCookie = exports.options = exports.VALUE = exports.NAME = void 0;
+/**
+ * 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.
+ */
+const cookie = require("cookie");
+/**
+ * This cookie indicates whether the connected client is a Gitpod user (= "has logged in within the last year") or not.
+ * This is used by "gitpod.io" and "www.gitpod.io" to display different content/buttons.
+ */
+exports.NAME = "gitpod-user";
+exports.VALUE = "true";
+/**
+ * @param domain The domain the Gitpod installation is installed onto
+ * @returns
+ */
+function options(domain) {
+    // Reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies
+    return {
+        path: "/",
+        httpOnly: false,
+        secure: false,
+        maxAge: 60 * 60 * 24 * 365,
+        sameSite: "lax",
+        domain: `.${domain}`, // explicilty include subdomains to not only cover "gitpod.io", but also "www.gitpod.io" or workspaces
+    };
+}
+exports.options = options;
+;
+function generateCookie(domain) {
+    return cookie.serialize(exports.NAME, exports.VALUE, options(domain));
+}
+exports.generateCookie = generateCookie;
+;
+function isPresent(cookies) {
+    // needs to match the old (gitpod-user=loggedIn) and new (gitpod-user=true) values to ensure a smooth transition during rollout.
+    return !!cookies.match(`${exports.NAME}=`);
+}
+exports.isPresent = isPresent;
+;
+//# sourceMappingURL=gitpod-cookie.js.map

package/lib/util/gitpod-cookie.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitpod-cookie.js","sourceRoot":"","sources":["../../src/util/gitpod-cookie.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,iCAAiC;AAGjC;;;GAGG;AACU,QAAA,IAAI,GAAG,aAAa,CAAC;AACrB,QAAA,KAAK,GAAG,MAAM,CAAC;AAE5B;;;GAGG;AACH,SAAgB,OAAO,CAAC,MAAc;IAClC,uEAAuE;IACvE,OAAO;QACH,IAAI,EAAE,GAAG;QACT,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,KAAK;QACb,MAAM,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG;QAC1B,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,IAAI,MAAM,EAAE,EAAgB,sGAAsG;KAC7I,CAAC;AACN,CAAC;AAVD,0BAUC;AAAA,CAAC;AAEF,SAAgB,cAAc,CAAC,MAAc;IACzC,OAAO,MAAM,CAAC,SAAS,CAAC,YAAI,EAAE,aAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1D,CAAC;AAFD,wCAEC;AAAA,CAAC;AAEF,SAAgB,SAAS,CAAC,OAAe;IACrC,gIAAgI;IAChI,OAAO,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,YAAI,GAAG,CAAC,CAAC;AACvC,CAAC;AAHD,8BAGC;AAAA,CAAC"}

package/lib/util/gitpod-host-url.d.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.
  */
@@ -7,10 +7,10 @@ export interface UrlChange {
     (old: URL): Partial<URL>;
 }
 export declare type UrlUpdate = UrlChange | Partial<URL>;
-export declare const workspaceIDRegex: RegExp;
 export declare class GitpodHostUrl {
     readonly url: URL;
     constructor(urlParam?: string | URL);
+    static fromWorkspaceUrl(url: string): GitpodHostUrl;
     withWorkspacePrefix(workspaceId: string, region: string): GitpodHostUrl;
     withDomainPrefix(prefix: string): GitpodHostUrl;
     withoutWorkspacePrefix(): GitpodHostUrl;
@@ -24,12 +24,14 @@ export declare class GitpodHostUrl {
     asUpgradeSubscription(): GitpodHostUrl;
     asAccessControl(): GitpodHostUrl;
     asSettings(): GitpodHostUrl;
-    asGraphQLApi(): GitpodHostUrl;
+    asPreferences(): GitpodHostUrl;
     asStart(workspaceId?: string | undefined): GitpodHostUrl;
     asWorkspaceAuth(instanceID: string, redirect?: boolean): GitpodHostUrl;
     toString(): string;
     toStringWoRootSlash(): string;
     get workspaceId(): string | undefined;
     get blobServe(): boolean;
+    asSorry(message: string): GitpodHostUrl;
+    asApiLogout(): GitpodHostUrl;
 }
 //# sourceMappingURL=gitpod-host-url.d.ts.map

package/lib/util/gitpod-host-url.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitpod-host-url.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CAC3B;AACD,oBAAY,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAEjD,eAAO,MAAM,gBAAgB,QAAoC,CAAC;AAElE,qBAAa,aAAa;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEN,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAanC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI/C,sBAAsB,IAAI,aAAa;IASvC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,GAAG,aAAa;IAI/D,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;IAK7B,WAAW,CAAC,UAAU,EAAE,MAAM;IAI9B,WAAW,IAAI,aAAa;IAI5B,WAAW,IAAI,aAAa;IAI5B,OAAO,IAAI,aAAa;IAIxB,qBAAqB,IAAI,aAAa;IAItC,eAAe,IAAI,aAAa;IAIhC,UAAU,IAAI,aAAa;IAI3B,YAAY,IAAI,aAAa;IAI7B,OAAO,CAAC,WAAW,qBAAmB,GAAG,aAAa;IAOtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa;IAItE,QAAQ;IAIR,mBAAmB;IAQnB,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAapC;IAED,IAAI,SAAS,IAAI,OAAO,CAQvB;CAEJ"}
+{"version":3,"file":"gitpod-host-url.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,MAAM,WAAW,SAAS;IACtB,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;CAC3B;AACD,oBAAY,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAUjD,qBAAa,aAAa;IACtB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;gBAEN,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG;IAanC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM;IAInC,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAIvD,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI/C,sBAAsB,IAAI,aAAa;IASvC,mBAAmB,CAAC,mBAAmB,EAAE,MAAM,GAAG,aAAa;IAI/D,IAAI,CAAC,SAAS,EAAE,SAAS;IAUzB,OAAO,CAAC,SAAS,CAAC,EAAE,SAAS;IAK7B,WAAW,CAAC,UAAU,EAAE,MAAM;IAI9B,WAAW,IAAI,aAAa;IAI5B,WAAW,IAAI,aAAa;IAI5B,OAAO,IAAI,aAAa;IAIxB,qBAAqB,IAAI,aAAa;IAItC,eAAe,IAAI,aAAa;IAIhC,UAAU,IAAI,aAAa;IAI3B,aAAa,IAAI,aAAa;IAI9B,OAAO,CAAC,WAAW,qBAAmB,GAAG,aAAa;IAOtD,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,aAAa;IAItE,QAAQ;IAIR,mBAAmB;IAQnB,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAiBpC;IAED,IAAI,SAAS,IAAI,OAAO,CAQvB;IAED,OAAO,CAAC,OAAO,EAAE,MAAM;IAIvB,WAAW,IAAI,aAAa;CAI/B"}

package/lib/util/gitpod-host-url.js

@@ -1,16 +1,20 @@
 "use strict";
 /**
- * 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.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GitpodHostUrl = exports.workspaceIDRegex = void 0;
-var URL = require('url').URL || window.URL;
-var logging_1 = require("./logging");
-exports.workspaceIDRegex = /([a-z0-9]{4,8}-)+([a-z0-9]{12})/;
-var GitpodHostUrl = /** @class */ (function () {
-    function GitpodHostUrl(urlParam) {
+exports.GitpodHostUrl = void 0;
+const URL = require('url').URL || window.URL;
+const logging_1 = require("./logging");
+const baseWorkspaceIDRegex = "(([a-f][0-9a-f]{7}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})|([0-9a-z]{2,16}-[0-9a-z]{2,16}-[0-9a-z]{8,11}))";
+// this pattern matches v4 UUIDs as well as the new generated workspace ids (e.g. pink-panda-ns35kd21)
+const workspaceIDRegex = RegExp(`^${baseWorkspaceIDRegex}$`);
+// this pattern matches URL prefixes of workspaces
+const workspaceUrlPrefixRegex = RegExp(`^([0-9]{4,6}-)?${baseWorkspaceIDRegex}\\.`);
+class GitpodHostUrl {
+    constructor(urlParam) {
         if (urlParam === undefined || typeof urlParam === 'string') {
             this.url = new URL(urlParam || 'https://gitpod.io');
             this.url.search = '';
@@ -21,112 +25,115 @@ var GitpodHostUrl = /** @class */ (function () {
             this.url = urlParam;
         }
         else {
-            logging_1.log.error('Unexpected urlParam', { urlParam: urlParam });
+            logging_1.log.error('Unexpected urlParam', { urlParam });
         }
     }
-    GitpodHostUrl.prototype.withWorkspacePrefix = function (workspaceId, region) {
-        return this.withDomainPrefix(workspaceId + ".ws-" + region + ".");
-    };
-    GitpodHostUrl.prototype.withDomainPrefix = function (prefix) {
-        return this.with(function (url) { return ({ host: prefix + url.host }); });
+    static fromWorkspaceUrl(url) {
+        return new GitpodHostUrl(new URL(url));
+    }
+    withWorkspacePrefix(workspaceId, region) {
+        return this.withDomainPrefix(`${workspaceId}.ws-${region}.`);
+    }
+    withDomainPrefix(prefix) {
+        return this.with(url => ({ host: prefix + url.host }));
         ;
-    };
-    GitpodHostUrl.prototype.withoutWorkspacePrefix = function () {
-        if (!this.url.host.match(exports.workspaceIDRegex)) {
+    }
+    withoutWorkspacePrefix() {
+        if (!this.url.host.match(workspaceUrlPrefixRegex)) {
             // URL has no workspace prefix
             return this;
         }
         return this.withoutDomainPrefix(2);
-    };
-    GitpodHostUrl.prototype.withoutDomainPrefix = function (removeSegmentsCount) {
-        return this.with(function (url) { return ({ host: url.host.split('.').splice(removeSegmentsCount).join('.') }); });
-    };
-    GitpodHostUrl.prototype.with = function (urlUpdate) {
-        var update = typeof urlUpdate === 'function' ? urlUpdate(this.url) : urlUpdate;
-        var addSlashToPath = update.pathname && update.pathname.length > 0 && !update.pathname.startsWith('/');
+    }
+    withoutDomainPrefix(removeSegmentsCount) {
+        return this.with(url => ({ host: url.host.split('.').splice(removeSegmentsCount).join('.') }));
+    }
+    with(urlUpdate) {
+        const update = typeof urlUpdate === 'function' ? urlUpdate(this.url) : urlUpdate;
+        const addSlashToPath = update.pathname && update.pathname.length > 0 && !update.pathname.startsWith('/');
         if (addSlashToPath) {
             update.pathname = '/' + update.pathname;
         }
-        var result = Object.assign(new URL(this.toString()), update);
+        const result = Object.assign(new URL(this.toString()), update);
         return new GitpodHostUrl(result);
-    };
-    GitpodHostUrl.prototype.withApi = function (urlUpdate) {
-        var updated = urlUpdate ? this.with(urlUpdate) : this;
-        return updated.with(function (url) { return ({ pathname: "/api" + url.pathname }); });
-    };
-    GitpodHostUrl.prototype.withContext = function (contextUrl) {
-        return this.with(function (url) { return ({ hash: contextUrl }); });
-    };
-    GitpodHostUrl.prototype.asWebsocket = function () {
-        return this.with(function (url) { return ({ protocol: url.protocol === 'https:' ? 'wss:' : 'ws:' }); });
-    };
-    GitpodHostUrl.prototype.asDashboard = function () {
-        return this.with(function (url) { return ({ pathname: '/workspaces/' }); });
-    };
-    GitpodHostUrl.prototype.asLogin = function () {
-        return this.with(function (url) { return ({ pathname: '/login/' }); });
-    };
-    GitpodHostUrl.prototype.asUpgradeSubscription = function () {
-        return this.with(function (url) { return ({ pathname: '/upgrade-subscription/' }); });
-    };
-    GitpodHostUrl.prototype.asAccessControl = function () {
-        return this.with(function (url) { return ({ pathname: '/access-control/' }); });
-    };
-    GitpodHostUrl.prototype.asSettings = function () {
-        return this.with(function (url) { return ({ pathname: '/settings/' }); });
-    };
-    GitpodHostUrl.prototype.asGraphQLApi = function () {
-        return this.with(function (url) { return ({ pathname: '/graphql/' }); });
-    };
-    GitpodHostUrl.prototype.asStart = function (workspaceId) {
-        if (workspaceId === void 0) { workspaceId = this.workspaceId; }
+    }
+    withApi(urlUpdate) {
+        const updated = urlUpdate ? this.with(urlUpdate) : this;
+        return updated.with(url => ({ pathname: `/api${url.pathname}` }));
+    }
+    withContext(contextUrl) {
+        return this.with(url => ({ hash: contextUrl }));
+    }
+    asWebsocket() {
+        return this.with(url => ({ protocol: url.protocol === 'https:' ? 'wss:' : 'ws:' }));
+    }
+    asDashboard() {
+        return this.with(url => ({ pathname: '/' }));
+    }
+    asLogin() {
+        return this.with(url => ({ pathname: '/login' }));
+    }
+    asUpgradeSubscription() {
+        return this.with(url => ({ pathname: '/plans' }));
+    }
+    asAccessControl() {
+        return this.with(url => ({ pathname: '/integrations' }));
+    }
+    asSettings() {
+        return this.with(url => ({ pathname: '/settings' }));
+    }
+    asPreferences() {
+        return this.with(url => ({ pathname: '/preferences' }));
+    }
+    asStart(workspaceId = this.workspaceId) {
         return this.withoutWorkspacePrefix().with({
             pathname: '/start/',
             hash: '#' + workspaceId
         });
-    };
-    GitpodHostUrl.prototype.asWorkspaceAuth = function (instanceID, redirect) {
-        return this.with(function (url) { return ({ pathname: "/api/auth/workspace-cookie/" + instanceID, search: redirect ? "redirect" : "" }); });
-    };
-    GitpodHostUrl.prototype.toString = function () {
+    }
+    asWorkspaceAuth(instanceID, redirect) {
+        return this.with(url => ({ pathname: `/api/auth/workspace-cookie/${instanceID}`, search: redirect ? "redirect" : "" }));
+    }
+    toString() {
         return this.url.toString();
-    };
-    GitpodHostUrl.prototype.toStringWoRootSlash = function () {
-        var result = this.toString();
+    }
+    toStringWoRootSlash() {
+        let result = this.toString();
         if (result.endsWith('/')) {
             result = result.slice(0, result.length - 1);
         }
         return result;
-    };
-    Object.defineProperty(GitpodHostUrl.prototype, "workspaceId", {
-        get: function () {
-            var hostSegs = this.url.host.split(".");
-            if (hostSegs.length > 1 && hostSegs[0].match(exports.workspaceIDRegex)) {
+    }
+    get workspaceId() {
+        const hostSegs = this.url.host.split(".");
+        if (hostSegs.length > 1) {
+            const matchResults = hostSegs[0].match(workspaceIDRegex);
+            if (matchResults) {
                 // URL has a workspace prefix
-                return hostSegs[0];
-            }
-            var pathSegs = this.url.pathname.split("/");
-            if (pathSegs.length > 3 && pathSegs[1] === "workspace") {
-                return pathSegs[2];
-            }
-            return undefined;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(GitpodHostUrl.prototype, "blobServe", {
-        get: function () {
-            var hostSegments = this.url.host.split(".");
-            if (hostSegments[0] === 'blobserve') {
-                return true;
+                // port prefixes are excluded
+                return matchResults[0];
             }
-            var pathSegments = this.url.pathname.split("/");
-            return pathSegments[0] === "blobserve";
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return GitpodHostUrl;
-}());
+        }
+        const pathSegs = this.url.pathname.split("/");
+        if (pathSegs.length > 3 && pathSegs[1] === "workspace") {
+            return pathSegs[2];
+        }
+        return undefined;
+    }
+    get blobServe() {
+        const hostSegments = this.url.host.split(".");
+        if (hostSegments[0] === 'blobserve') {
+            return true;
+        }
+        const pathSegments = this.url.pathname.split("/");
+        return pathSegments[0] === "blobserve";
+    }
+    asSorry(message) {
+        return this.with({ pathname: '/sorry', hash: message });
+    }
+    asApiLogout() {
+        return this.withApi(url => ({ pathname: '/logout/' }));
+    }
+}
 exports.GitpodHostUrl = GitpodHostUrl;
 //# sourceMappingURL=gitpod-host-url.js.map

package/lib/util/gitpod-host-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"gitpod-host-url.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gitpod-host-url.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;AAEH,MAAM,GAAG,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;AAC7C,uCAAgC;AAOhC,MAAM,oBAAoB,GAAG,sHAAsH,CAAC;AAEpJ,sGAAsG;AACtG,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,oBAAoB,GAAG,CAAC,CAAC;AAE7D,kDAAkD;AAClD,MAAM,uBAAuB,GAAG,MAAM,CAAC,kBAAkB,oBAAoB,KAAK,CAAC,CAAC;AAEpF,MAAa,aAAa;IAGtB,YAAY,QAAuB;QAC/B,IAAI,QAAQ,KAAK,SAAS,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;YACxD,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,CAAC,QAAQ,IAAI,mBAAmB,CAAC,CAAC;YACpD,IAAI,CAAC,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,QAAQ,GAAG,EAAE,CAAC;SAC1B;aAAM,IAAI,QAAQ,YAAY,GAAG,EAAE;YAChC,IAAI,CAAC,GAAG,GAAG,QAAQ,CAAC;SACvB;aAAM;YACH,aAAG,CAAC,KAAK,CAAC,qBAAqB,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;SAClD;IACL,CAAC;IAED,MAAM,CAAC,gBAAgB,CAAC,GAAW;QAC/B,OAAO,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAC3C,CAAC;IAED,mBAAmB,CAAC,WAAmB,EAAE,MAAc;QACnD,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,WAAW,OAAO,MAAM,GAAG,CAAC,CAAC;IACjE,CAAC;IAED,gBAAgB,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAAA,CAAC;IAC5D,CAAC;IAED,sBAAsB;QAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,EAAE;YAC/C,8BAA8B;YAC9B,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,mBAAmB,CAAC,mBAA2B;QAC3C,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACnG,CAAC;IAED,IAAI,CAAC,SAAoB;QACrB,MAAM,MAAM,GAAG,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACjF,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACzG,IAAI,cAAc,EAAE;YAChB,MAAM,CAAC,QAAQ,GAAG,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC;SAC3C;QACD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC/D,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAED,OAAO,CAAC,SAAqB;QACzB,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACxD,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,WAAW,CAAC,UAAkB;QAC1B,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACxF,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACjD,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,qBAAqB;QACjB,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;IAC7D,CAAC;IAED,UAAU;QACN,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,aAAa;QACT,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW;QAClC,OAAO,IAAI,CAAC,sBAAsB,EAAE,CAAC,IAAI,CAAC;YACtC,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,GAAG,GAAG,WAAW;SAC1B,CAAC,CAAC;IACP,CAAC;IAED,eAAe,CAAC,UAAkB,EAAE,QAAkB;QAClD,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,8BAA8B,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5H,CAAC;IAED,QAAQ;QACJ,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;IAC/B,CAAC;IAED,mBAAmB;QACf,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC7B,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACtB,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SAC/C;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,IAAI,WAAW;QACX,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACrB,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACzD,IAAI,YAAY,EAAE;gBACd,6BAA6B;gBAC7B,6BAA6B;gBAC7B,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC;aAC1B;SACJ;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC7C,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;YACpD,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;SACtB;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,IAAI,SAAS;QACT,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACjD,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC;IAC3C,CAAC;IAED,OAAO,CAAC,OAAe;QACnB,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,WAAW;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;CAEJ;AApJD,sCAoJC"}

package/lib/util/gitpod-host-url.spec.d.ts

@@ -0,0 +1,16 @@
+/**
+ * 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.
+ */
+export declare class GitpodHostUrlTest {
+    parseWorkspaceId_pathBased(): void;
+    parseWorkspaceId_hosts_withEnvVarsInjected(): void;
+    testWithoutWorkspacePrefix(): Promise<void>;
+    testWithoutWorkspacePrefix2(): Promise<void>;
+    testWithoutWorkspacePrefix3(): Promise<void>;
+    testWithoutWorkspacePrefix4(): Promise<void>;
+    testWithoutWorkspacePrefix5(): Promise<void>;
+    testWithoutWorkspacePrefix6(): Promise<void>;
+}
+//# sourceMappingURL=gitpod-host-url.spec.d.ts.map

package/lib/util/gitpod-host-url.spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitpod-host-url.spec.d.ts","sourceRoot":"","sources":["../../src/util/gitpod-host-url.spec.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,qBACa,iBAAiB;IAEb,0BAA0B;IAK1B,0CAA0C;IAKpC,0BAA0B;IAI1B,2BAA2B;IAI3B,2BAA2B;IAI3B,2BAA2B;IAI3B,2BAA2B;IAI3B,2BAA2B;CAGjD"}

package/lib/util/gitpod-host-url.spec.js

@@ -0,0 +1,124 @@
+"use strict";
+/**
+ * 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.
+ */
+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;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GitpodHostUrlTest = void 0;
+const chai = require("chai");
+const mocha_typescript_1 = require("mocha-typescript");
+const gitpod_host_url_1 = require("./gitpod-host-url");
+const expect = chai.expect;
+let GitpodHostUrlTest = class GitpodHostUrlTest {
+    parseWorkspaceId_pathBased() {
+        const actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("http://35.223.201.195/workspace/bc77e03d-c781-4235-bca0-e24087f5e472/").workspaceId;
+        expect(actual).to.equal("bc77e03d-c781-4235-bca0-e24087f5e472");
+    }
+    parseWorkspaceId_hosts_withEnvVarsInjected() {
+        const actual = gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gray-grasshopper-nfbitfia.ws-eu02.gitpod-staging.com/#passedin=test%20value/https://github.com/gitpod-io/gitpod-test-repo").workspaceId;
+        expect(actual).to.equal("gray-grasshopper-nfbitfia");
+    }
+    testWithoutWorkspacePrefix() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://3000-moccasin-ferret-155799b3.ws-eu02.gitpod-staging.com/").withoutWorkspacePrefix().toString()).to.equal("https://gitpod-staging.com/");
+        });
+    }
+    testWithoutWorkspacePrefix2() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gitpod-staging.com/").withoutWorkspacePrefix().toString()).to.equal("https://gitpod-staging.com/");
+        });
+    }
+    testWithoutWorkspacePrefix3() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gray-rook-5523v5d8.ws-dev.my-branch-1234.staging.gitpod-dev.com/").withoutWorkspacePrefix().toString()).to.equal("https://my-branch-1234.staging.gitpod-dev.com/");
+        });
+    }
+    testWithoutWorkspacePrefix4() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://my-branch-1234.staging.gitpod-dev.com/").withoutWorkspacePrefix().toString()).to.equal("https://my-branch-1234.staging.gitpod-dev.com/");
+        });
+    }
+    testWithoutWorkspacePrefix5() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://abc-nice-brunch-4224.staging.gitpod-dev.com/").withoutWorkspacePrefix().toString()).to.equal("https://abc-nice-brunch-4224.staging.gitpod-dev.com/");
+        });
+    }
+    testWithoutWorkspacePrefix6() {
+        return __awaiter(this, void 0, void 0, function* () {
+            expect(gitpod_host_url_1.GitpodHostUrl.fromWorkspaceUrl("https://gray-rook-5523v5d8.ws-dev.abc-nice-brunch-4224.staging.gitpod-dev.com/").withoutWorkspacePrefix().toString()).to.equal("https://abc-nice-brunch-4224.staging.gitpod-dev.com/");
+        });
+    }
+};
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], GitpodHostUrlTest.prototype, "parseWorkspaceId_pathBased", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
+], GitpodHostUrlTest.prototype, "parseWorkspaceId_hosts_withEnvVarsInjected", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix2", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix3", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix4", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix5", null);
+__decorate([
+    mocha_typescript_1.test,
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], GitpodHostUrlTest.prototype, "testWithoutWorkspacePrefix6", null);
+GitpodHostUrlTest = __decorate([
+    mocha_typescript_1.suite
+], GitpodHostUrlTest);
+exports.GitpodHostUrlTest = GitpodHostUrlTest;
+module.exports = new GitpodHostUrlTest();
+//# sourceMappingURL=gitpod-host-url.spec.js.map

package/lib/util/gitpod-host-url.spec.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"gitpod-host-url.spec.js","sourceRoot":"","sources":["../../src/util/gitpod-host-url.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;AAEH,6BAA6B;AAC7B,uDAA+C;AAC/C,uDAAkD;AAClD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;AAG3B,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAEb,0BAA0B;QACnC,MAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CAAC,uEAAuE,CAAC,CAAC,WAAW,CAAC;QACnI,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;IACpE,CAAC;IAEY,0CAA0C;QACnD,MAAM,MAAM,GAAG,+BAAa,CAAC,gBAAgB,CAAC,mIAAmI,CAAC,CAAC,WAAW,CAAC;QAC/L,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IACzD,CAAC;IAEkB,0BAA0B;;YACzC,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,mEAAmE,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAC5L,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QACtJ,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,0EAA0E,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACtN,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,gDAAgD,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC5L,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,sDAAsD,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QACxM,CAAC;KAAA;IAEkB,2BAA2B;;YAC1C,MAAM,CAAC,+BAAa,CAAC,gBAAgB,CAAC,gFAAgF,CAAC,CAAC,sBAAsB,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAClO,CAAC;KAAA;CACJ,CAAA;AAjCS;IAAL,uBAAI;;;;mEAGJ;AAEK;IAAL,uBAAI;;;;mFAGJ;AAEK;IAAL,uBAAI;;;;mEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAEK;IAAL,uBAAI;;;;oEAEJ;AAlCQ,iBAAiB;IAD7B,wBAAK;GACO,iBAAiB,CAmC7B;AAnCY,8CAAiB;AAoC9B,MAAM,CAAC,OAAO,GAAG,IAAI,iBAAiB,EAAE,CAAA"}