scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

client: Some minor fixups to base URL feature

Browse Source 
* Cleanup cookie storage path
* Cleanup Data URL
This commit is contained in:
Shyam Sunder
2018-08-17 23:09:13 -04:00
committed by Marcin Kurczewski
parent 565027269c
commit cbf67587e2
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/js/api.js
View File

@ -9,6 +9,18 @@ const uri = require('./util/uri.js');
let fileTokens = {};
let remoteConfig = null;
function getCookieName() {
const bases = document.getElementsByTagName('base');
if (bases.length) {
let baseHref = bases[0].href;
baseHref = baseHref.replace('/', '');
return 'szuru-' + baseHref;
} else {
return 'szuru';
}
}
const cookieName = getCookieName();
class Api extends events.EventTarget {
constructor() {
super();
@ -126,7 +138,7 @@ class Api extends events.EventTarget {
}
loginFromCookies() {
const auth = cookies.getJSON('auth');
const auth = cookies.getJSON(cookieName);
return auth && auth.user && auth.token ?
this.loginWithToken(auth.user, auth.token, true) :
Promise.resolve();
@ -169,7 +181,7 @@ class Api extends events.EventTarget {
this.post('/user-token/' + userName, userTokenRequest)
.then(response => {
cookies.set(
'auth',
cookieName,
{'user': userName, 'token': response.token},
options);
this.userName = userName;