graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 13:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2389 from Tosuke/fix-2384

Browse source 
Fix login bug(#2384)
This commit is contained in:
syuilo 2018-08-22 09:27:09 +09:00 committed by GitHub
commit 933e25804c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/server/api/private/signin.ts
View file

@ -12,8 +12,9 @@ export default async (ctx: Koa.Context) => {
ctx.set('Access-Control-Allow-Credentials', 'true'); ctx.set('Access-Control-Allow-Credentials', 'true');
const body = ctx.request.body as any; const body = ctx.request.body as any;
const username = body['username']; // See: https://github.com/syuilo/misskey/issues/2384
const password = body['password']; const username = body['username'] || body['x'];
const password = body['password'] || body['y'];
const token = body['token']; const token = body['token'];
if (typeof username != 'string') { if (typeof username != 'string') {