@gitpod/gitpod-protocol 0.1.5-server-vscode-ouath2.18 → 0.1.5-server-vscode-oauth2.11

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

@@ -22,87 +22,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
+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 generate_workspace_id_1.generateWorkspaceID();
+                expect(new gitpod_host_url_1.GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
             }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+        });
     }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var mocha_typescript_1 = require("mocha-typescript");
-var chai = require("chai");
-var generate_workspace_id_1 = require("./generate-workspace-id");
-var gitpod_host_url_1 = require("./gitpod-host-url");
-var expect = chai.expect;
-var TestGenerateWorkspaceId = /** @class */ (function () {
-    function TestGenerateWorkspaceId() {
+    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;
     }
-    TestGenerateWorkspaceId.prototype.testGenerateWorkspaceId = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var i, id;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        i = 0;
-                        _a.label = 1;
-                    case 1:
-                        if (!(i < 100)) return [3 /*break*/, 4];
-                        return [4 /*yield*/, generate_workspace_id_1.generateWorkspaceID()];
-                    case 2:
-                        id = _a.sent();
-                        expect(new gitpod_host_url_1.GitpodHostUrl().withWorkspacePrefix(id, "eu").workspaceId).to.equal(id);
-                        _a.label = 3;
-                    case 3:
-                        i++;
-                        return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    TestGenerateWorkspaceId.prototype.testLongestName = function () {
-        var longestColor = generate_workspace_id_1.colors.sort(function (a, b) { return b.length - a.length; })[0];
-        var longestAnimal = generate_workspace_id_1.animals.sort(function (a, b) { return b.length - a.length; })[0];
-        var longestName = longestColor + "-" + longestAnimal + "-12345678";
-        expect(longestName.length <= 36, "\"" + longestName + "\" is longer than 36 chars (" + longestName.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);
-    TestGenerateWorkspaceId = __decorate([
-        mocha_typescript_1.suite
-    ], TestGenerateWorkspaceId);
-    return TestGenerateWorkspaceId;
-}());
+};
+__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);
+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

@@ -1 +1 @@
-{"version":3,"file":"generate-workspace-id.spec.js","sourceRoot":"","sources":["../../src/util/generate-workspace-id.spec.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,qDAA8C;AAC9C,2BAA4B;AAC5B,iEAA+E;AAC/E,qDAAkD;AAElD,IAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAA;AAEnB;IAAA;IAgBP,CAAC;IAdsB,yDAAuB,GAApC;;;;;;wBACO,CAAC,GAAG,CAAC;;;6BAAE,CAAA,CAAC,GAAG,GAAG,CAAA;wBACR,qBAAM,2CAAmB,EAAE,EAAA;;wBAAhC,EAAE,GAAG,SAA2B;wBACtC,MAAM,CAAC,IAAI,+BAAa,EAAE,CAAC,mBAAmB,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;;;wBAF9D,CAAC,EAAE,CAAA;;;;;;KAI/B;IAEY,iDAAe,GAAtB;QACF,IAAM,YAAY,GAAG,8BAAM,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,EAAnB,CAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QACnE,IAAM,aAAa,GAAG,+BAAO,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,EAAnB,CAAmB,CAAC,CAAC,CAAC,CAAC,CAAC;QACrE,IAAM,WAAW,GAAM,YAAY,SAAI,aAAa,cAAW,CAAC;QAChE,MAAM,CAAC,WAAW,CAAC,MAAM,IAAI,EAAE,EAAE,OAAI,WAAW,oCAA8B,WAAW,CAAC,MAAM,MAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC;IACpH,CAAC;IAZK;QAAL,uBAAI;;;;0EAKJ;IAEK;QAAL,uBAAI;;;;kEAKJ;IAdQ,uBAAuB;QAAnC,wBAAK;OAAO,uBAAuB,CAgBnC;IAAD,8BAAC;CAAA,AAhBM,IAgBN;AACD,MAAM,CAAC,OAAO,GAAG,IAAI,uBAAuB,EAAE,CAAA"}
+{"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,2CAAmB,EAAE,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;CAEJ,CAAA;AAdS;IAAL,uBAAI;;;;sEAKJ;AAEK;IAAL,uBAAI;;;;8DAKJ;AAdQ,uBAAuB;IAAnC,wBAAK;GAAO,uBAAuB,CAgBnC;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}`,
+    };
+}
+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;KACvB,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.js

@@ -6,15 +6,15 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitpodHostUrl = void 0;
-var URL = require('url').URL || window.URL;
-var logging_1 = require("./logging");
-var basewoWkspaceIDRegex = "(([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}))";
+const URL = require('url').URL || window.URL;
+const logging_1 = require("./logging");
+const basewoWkspaceIDRegex = "(([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}))";
 // this pattern matches v4 UUIDs as well as the new generated workspace ids (e.g. pink-panda-ns35kd21)
-var workspaceIDRegex = RegExp("^" + basewoWkspaceIDRegex + "$");
+const workspaceIDRegex = RegExp(`^${basewoWkspaceIDRegex}$`);
 // this pattern matches URL prefixes of workspaces
-var workspaceUrlPrefixRegex = RegExp("^([0-9]{4,6}-)?" + basewoWkspaceIDRegex + "\\.");
-var GitpodHostUrl = /** @class */ (function () {
-    function GitpodHostUrl(urlParam) {
+const workspaceUrlPrefixRegex = RegExp(`^([0-9]{4,6}-)?${basewoWkspaceIDRegex}\\.`);
+class GitpodHostUrl {
+    constructor(urlParam) {
         if (urlParam === undefined || typeof urlParam === 'string') {
             this.url = new URL(urlParam || 'https://gitpod.io');
             this.url.search = '';
@@ -25,125 +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.fromWorkspaceUrl = function (url) {
+    static fromWorkspaceUrl(url) {
         return new GitpodHostUrl(new URL(url));
-    };
-    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 }); });
+    }
+    withWorkspacePrefix(workspaceId, region) {
+        return this.withDomainPrefix(`${workspaceId}.ws-${region}.`);
+    }
+    withDomainPrefix(prefix) {
+        return this.with(url => ({ host: prefix + url.host }));
         ;
-    };
-    GitpodHostUrl.prototype.withoutWorkspacePrefix = function () {
+    }
+    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: '/plans/' }); });
-    };
-    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: '/workspaces/' }));
+    }
+    asLogin() {
+        return this.with(url => ({ pathname: '/login/' }));
+    }
+    asUpgradeSubscription() {
+        return this.with(url => ({ pathname: '/plans/' }));
+    }
+    asAccessControl() {
+        return this.with(url => ({ pathname: '/access-control/' }));
+    }
+    asSettings() {
+        return this.with(url => ({ pathname: '/settings/' }));
+    }
+    asGraphQLApi() {
+        return this.with(url => ({ pathname: '/graphql/' }));
+    }
+    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) {
-                var matchResults = hostSegs[0].match(workspaceIDRegex);
-                if (matchResults) {
-                    // URL has a workspace prefix
-                    // port prefixes are excluded
-                    return matchResults[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;
+    }
+    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
+                // port prefixes are excluded
+                return matchResults[0];
             }
-            var pathSegments = this.url.pathname.split("/");
-            return pathSegments[0] === "blobserve";
-        },
-        enumerable: false,
-        configurable: true
-    });
-    GitpodHostUrl.prototype.asSorry = function (message) {
+        }
+        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 });
-    };
-    GitpodHostUrl.prototype.asApiLogout = function () {
-        return this.withApi(function (url) { return ({ pathname: '/logout/' }); });
-    };
-    return GitpodHostUrl;
-}());
+    }
+    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":"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"}