diff options
| author | jc0b <j@jc0b.computer> | 2020-07-22 16:28:47 +0200 |
|---|---|---|
| committer | Fabian Mastenbroek <mail.fabianm@gmail.com> | 2020-08-24 19:48:21 +0200 |
| commit | d7469b9ebb01cf36a78cc98aab31fa8f307c4f65 (patch) | |
| tree | d0535fa0cfe95001302fbd2b0d046d51caab6ffd /frontend/src/api | |
| parent | 67b6ec800df8e023efadb60ae5f7919030b19789 (diff) | |
| parent | 9e7cb3bd367607b32e102c3a87b68b33c53dec46 (diff) | |
Merge branch 'master' onto working copy
Diffstat (limited to 'frontend/src/api')
| -rw-r--r-- | frontend/src/api/routes/token-signin.js | 6 | ||||
| -rw-r--r-- | frontend/src/api/socket.js | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/frontend/src/api/routes/token-signin.js b/frontend/src/api/routes/token-signin.js index 7cff093a..7553d043 100644 --- a/frontend/src/api/routes/token-signin.js +++ b/frontend/src/api/routes/token-signin.js @@ -1,7 +1,5 @@ export function performTokenSignIn(token) { - return new Promise(resolve => { - window['jQuery'].post('/tokensignin', { idtoken: token }, data => - resolve(data), - ) + return new Promise((resolve) => { + window['jQuery'].post('/tokensignin', { idtoken: token }, (data) => resolve(data)) }) } diff --git a/frontend/src/api/socket.js b/frontend/src/api/socket.js index 759c119e..96034021 100644 --- a/frontend/src/api/socket.js +++ b/frontend/src/api/socket.js @@ -6,9 +6,9 @@ let requestIdCounter = 0 const callbacks = {} export function setupSocketConnection(onConnect) { - const apiUrl = process.env.REACT_APP_API_URL || window.location.hostname + ':' + window.location.port; + const apiUrl = process.env.REACT_APP_API_URL || window.location.hostname + ':' + window.location.port - socket = io.connect(window.location.protocol + '//' + apiUrl); + socket = io.connect(window.location.protocol + '//' + apiUrl) socket.on('connect', onConnect) socket.on('response', onSocketResponse) } |
