summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-03-26 13:22:38 +0900
committerGitHub <noreply@github.com>2018-03-26 13:22:38 +0900
commit13e80bb53b0d502724a56a751b7c99ffa1eedf9f (patch)
tree0047b2a1cf267de83d4caad5dfde9b31327f6f7e /src/web
parentMerge pull request #1286 from akihikodaki/master (diff)
parentSpecify Cookie domain with hostname (diff)
downloadsharkey-13e80bb53b0d502724a56a751b7c99ffa1eedf9f.tar.gz
sharkey-13e80bb53b0d502724a56a751b7c99ffa1eedf9f.tar.bz2
sharkey-13e80bb53b0d502724a56a751b7c99ffa1eedf9f.zip
Merge pull request #1290 from akihikodaki/cookie
Specify Cookie domain with hostname
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/common/mios.ts4
-rw-r--r--src/web/app/config.ts2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/web/app/common/mios.ts b/src/web/app/common/mios.ts
index 986630da20..582a46c4cd 100644
--- a/src/web/app/common/mios.ts
+++ b/src/web/app/common/mios.ts
@@ -3,7 +3,7 @@ import { EventEmitter } from 'eventemitter3';
import * as merge from 'object-assign-deep';
import * as uuid from 'uuid';
-import { host, apiUrl, swPublickey, version, lang, googleMapsApiKey } from '../config';
+import { hostname, apiUrl, swPublickey, version, lang, googleMapsApiKey } from '../config';
import Progress from './scripts/loading';
import Connection from './scripts/streaming/stream';
import { HomeStreamManager } from './scripts/streaming/home';
@@ -220,7 +220,7 @@ export default class MiOS extends EventEmitter {
public signout() {
localStorage.removeItem('me');
- document.cookie = `i=; domain=.${host}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
+ document.cookie = `i=; domain=.${hostname}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
location.href = '/';
}
diff --git a/src/web/app/config.ts b/src/web/app/config.ts
index 24158c3aed..32710dd9c4 100644
--- a/src/web/app/config.ts
+++ b/src/web/app/config.ts
@@ -1,4 +1,5 @@
declare const _HOST_: string;
+declare const _HOSTNAME_: string;
declare const _URL_: string;
declare const _API_URL_: string;
declare const _DOCS_URL_: string;
@@ -16,6 +17,7 @@ declare const _LICENSE_: string;
declare const _GOOGLE_MAPS_API_KEY_: string;
export const host = _HOST_;
+export const hostname = _HOSTNAME_;
export const url = _URL_;
export const apiUrl = _API_URL_;
export const docsUrl = _DOCS_URL_;