opendev/gerrit
Code Issues Proposed changes

Merge "Use baseUrl for auth-check api"

Browse Source
This commit is contained in:
Tao Zhou
2020-01-13 10:43:56 +00:00
committed by Gerrit Code Review
parent c35ec6aed4 24e9a031de
commit 005d2bb7d7
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-auth.js
View File

@@ -39,6 +39,10 @@
this._last_auth_check_time = Date.now(); this._last_auth_check_time = Date.now();
} }
get baseUrl() {
return Gerrit.BaseUrlBehavior.getBaseUrl();
}
/** /**
* Returns if user is authed or not. * Returns if user is authed or not.
* *
@@ -49,7 +53,7 @@
(Date.now() - this._last_auth_check_time > MAX_AUTH_CHECK_WAIT_TIME_MS) (Date.now() - this._last_auth_check_time > MAX_AUTH_CHECK_WAIT_TIME_MS)
) { ) {
// Refetch after last check expired // Refetch after last check expired
this._authCheckPromise = fetch('/auth-check'); this._authCheckPromise = fetch(`${this.baseUrl}/auth-check`);
this._last_auth_check_time = Date.now(); this._last_auth_check_time = Date.now();
} }
@@ -209,7 +213,7 @@
if (accessToken) { if (accessToken) {
params.push(`access_token=${accessToken}`); params.push(`access_token=${accessToken}`);
const baseUrl = Gerrit.BaseUrlBehavior.getBaseUrl(); const baseUrl = this.baseUrl;
const pathname = baseUrl ? const pathname = baseUrl ?
url.substring(url.indexOf(baseUrl) + baseUrl.length) : url; url.substring(url.indexOf(baseUrl) + baseUrl.length) : url;
if (!pathname.startsWith('/a/')) { if (!pathname.startsWith('/a/')) {