summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSatsuki Yanagi <17376330+u1-liquid@users.noreply.github.com>2019-05-05 04:04:30 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-05-05 04:04:30 +0900
commit58a04ce1a54a56d12e1a1af7badf02fc924a9db6 (patch)
tree650e1232c72ab81648a20a2658e29849a7d722d8 /src
parent11.10.1 (diff)
downloadsharkey-58a04ce1a54a56d12e1a1af7badf02fc924a9db6.tar.gz
sharkey-58a04ce1a54a56d12e1a1af7badf02fc924a9db6.tar.bz2
sharkey-58a04ce1a54a56d12e1a1af7badf02fc924a9db6.zip
ログアウトの処理と外部サービス連携Viewがセッションクッキーを作らないように (#4856)
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/settings/integration.vue6
-rw-r--r--src/client/app/store.ts2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/client/app/common/views/components/settings/integration.vue b/src/client/app/common/views/components/settings/integration.vue
index b91880679f..8ac0c134c0 100644
--- a/src/client/app/common/views/components/settings/integration.vue
+++ b/src/client/app/common/views/components/settings/integration.vue
@@ -54,7 +54,11 @@ export default Vue.extend({
},
mounted() {
- document.cookie = `i=${this.$store.state.i.token}`;
+ if (!document.cookie.match(/i=(\w+)/)) {
+ document.cookie = `i=${this.$store.state.i.token}; path=/;` +
+ ` domain=${document.location.hostname}; max-age=31536000;` +
+ (document.location.protocol.startsWith('https') ? ' secure' : '');
+ }
this.$watch('$store.state.i', () => {
if (this.$store.state.i.twitter) {
if (this.twitterForm) this.twitterForm.close();
diff --git a/src/client/app/store.ts b/src/client/app/store.ts
index a6f2a0b00b..b137f79989 100644
--- a/src/client/app/store.ts
+++ b/src/client/app/store.ts
@@ -126,7 +126,7 @@ export default (os: MiOS) => new Vuex.Store({
logout(ctx) {
ctx.commit('updateI', null);
- document.cookie = 'i=;';
+ document.cookie = `i=; max-age=0; domain=${document.location.hostname}`;
localStorage.removeItem('i');
},