From 419cb7fbadbc6695e3f7c73d55c456bb54d12278 Mon Sep 17 00:00:00 2001 From: Satsuki Yanagi <17376330+u1-liquid@users.noreply.github.com> Date: Thu, 2 May 2019 06:24:32 +0900 Subject: [PATCH] Remove unwanted ! character in user token regex (#4830) --- src/client/app/mios.ts | 2 +- src/server/api/service/discord.ts | 2 +- src/server/api/service/github.ts | 2 +- src/server/api/service/twitter.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts index b69c34052..191b72e5b 100644 --- a/src/client/app/mios.ts +++ b/src/client/app/mios.ts @@ -195,7 +195,7 @@ export default class MiOS extends EventEmitter { }); } else { // Get token from cookie or localStorage - const i = (document.cookie.match(/i=(!\w+)/) || [null, null])[1] || localStorage.getItem('i'); + const i = (document.cookie.match(/i=(\w+)/) || [null, null])[1] || localStorage.getItem('i'); fetchme(i, me => { if (me) { diff --git a/src/server/api/service/discord.ts b/src/server/api/service/discord.ts index 589579b8e..ac4d9a560 100644 --- a/src/server/api/service/discord.ts +++ b/src/server/api/service/discord.ts @@ -13,7 +13,7 @@ import { ILocalUser } from '../../../models/entities/user'; import { ensure } from '../../../prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { - return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1]; + return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; } function compareOrigin(ctx: Koa.BaseContext) { diff --git a/src/server/api/service/github.ts b/src/server/api/service/github.ts index 1b0ce6936..4f287406d 100644 --- a/src/server/api/service/github.ts +++ b/src/server/api/service/github.ts @@ -13,7 +13,7 @@ import { ILocalUser } from '../../../models/entities/user'; import { ensure } from '../../../prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { - return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1]; + return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; } function compareOrigin(ctx: Koa.BaseContext) { diff --git a/src/server/api/service/twitter.ts b/src/server/api/service/twitter.ts index 36299b1f2..3a5800f00 100644 --- a/src/server/api/service/twitter.ts +++ b/src/server/api/service/twitter.ts @@ -12,7 +12,7 @@ import { ILocalUser } from '../../../models/entities/user'; import { ensure } from '../../../prelude/ensure'; function getUserToken(ctx: Koa.BaseContext) { - return ((ctx.headers['cookie'] || '').match(/i=(!\w+)/) || [null, null])[1]; + return ((ctx.headers['cookie'] || '').match(/i=(\w+)/) || [null, null])[1]; } function compareOrigin(ctx: Koa.BaseContext) {