From 24e9a031dee15477ca0be3b97c79aa71b1460f6b Mon Sep 17 00:00:00 2001 From: Tao Zhou Date: Sun, 12 Jan 2020 15:57:02 +0100 Subject: [PATCH] Use `baseUrl` for auth-check api Change-Id: I23d955e04c02b88705a515edde8186bb6772d862 --- .../app/elements/shared/gr-rest-api-interface/gr-auth.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-auth.js b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-auth.js index 0af1d9746e..59e52b7891 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-auth.js +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-auth.js @@ -39,6 +39,10 @@ this._last_auth_check_time = Date.now(); } + get baseUrl() { + return Gerrit.BaseUrlBehavior.getBaseUrl(); + } + /** * Returns if user is authed or not. * @@ -49,7 +53,7 @@ (Date.now() - this._last_auth_check_time > MAX_AUTH_CHECK_WAIT_TIME_MS) ) { // Refetch after last check expired - this._authCheckPromise = fetch('/auth-check'); + this._authCheckPromise = fetch(`${this.baseUrl}/auth-check`); this._last_auth_check_time = Date.now(); } @@ -209,7 +213,7 @@ if (accessToken) { params.push(`access_token=${accessToken}`); - const baseUrl = Gerrit.BaseUrlBehavior.getBaseUrl(); + const baseUrl = this.baseUrl; const pathname = baseUrl ? url.substring(url.indexOf(baseUrl) + baseUrl.length) : url; if (!pathname.startsWith('/a/')) {