NuKVM/xen-orchestra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(xo-web/updater): support path prefix

Browse Source 
Related to #2775
This commit is contained in:
Julien Fontanet 2018-04-13 16:58:48 +02:00
parent 3e326c4e62
commit 83b8b5de61
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/xo-web/src/common/xoa-updater.js
View File

@ -47,21 +47,6 @@ export function blockXoaAccess (xoaState) {
return block return block
} }
function getCurrentUrl () {
if (typeof window === 'undefined') {
throw new Error('cannot get current URL')
}
return String(window.location)
}
function adaptUrl (url, port = null) {
const matches = /^http(s?):\/\/([^/:]*(?::[^/]*)?)(?:[^:]*)?$/.exec(url)
if (!matches || !matches[2]) {
throw new Error('current URL not recognized')
}
return 'ws' + matches[1] + '://' + matches[2] + '/api/updater'
}
// =================================================================== // ===================================================================
export const NotRegistered = makeError('NotRegistered') export const NotRegistered = makeError('NotRegistered')
@ -211,7 +196,7 @@ class XoaUpdater extends EventEmitter {
if (!this._client) { if (!this._client) {
try { try {
this._client = new Client(adaptUrl(getCurrentUrl())) this._client = new Client('./api/updater')
await this._client.open() await this._client.open()
handleOpen(this._client) handleOpen(this._client)
} catch (error) { } catch (error) {