Cookieを使わないように

This commit is contained in:
syuilo 2018-11-28 16:19:02 +09:00
parent f257853906
commit 4bbb7eded3
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
5 changed files with 7 additions and 12 deletions

View file

@ -67,7 +67,8 @@ export default Vue.extend({
username: this.username,
password: this.password,
token: this.user && this.user.twoFactorEnabled ? this.token : undefined
}, true).then(() => {
}, true).then(res => {
localStorage.setItem('i', res.i);
location.reload();
}).catch(() => {
alert(this.$t('login-failed'));

View file

@ -190,8 +190,8 @@ export default class MiOS extends EventEmitter {
this.store.dispatch('mergeMe', freshData);
});
} else {
// Get token from cookie
const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1];
// Get token from cookie or localStorage
const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1] || localStorage.getItem('i');
fetchme(i, me => {
if (me) {

View file

@ -11,11 +11,3 @@ if (!('fetch' in window)) {
'Your browser (or your OS) seems outdated. ' +
'To run Misskey, please update your browser to latest version or try other browsers.');
}
// Check whether cookie enabled
if (!navigator.cookieEnabled) {
alert(
'Misskeyを利用するにはCookieを有効にしてください。' +
'\n\n' +
'To use Misskey, please enable Cookie.');
}

View file

@ -129,6 +129,7 @@ export default (os: MiOS) => new Vuex.Store({
logout(ctx) {
ctx.commit('updateI', null);
document.cookie = `i=; domain=${hostname}; expires=Thu, 01 Jan 1970 00:00:01 GMT;`;
localStorage.removeItem('i');
},
mergeMe(ctx, me) {

View file

@ -21,6 +21,7 @@ export default function(ctx: Koa.Context, user: ILocalUser, redirect = false) {
ctx.redirect(config.url);
} else {
ctx.status = 204;
ctx.body = { i: user.token };
ctx.status = 200;
}
}