profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Fix bug?"

Browse source 
This reverts commit 2c9bacfcea.
This commit is contained in:
syuilo 2018-08-21 01:23:39 +09:00
parent 30444e5f1a
commit fd947407af
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/client/app/common/views/components/signin.vue
View file

@ -53,9 +53,8 @@ export default Vue.extend({
this.signing = true; this.signing = true;
(this as any).api('signin', { (this as any).api('signin', {
// password という名前(または username とのペア？)では何らかのフィルタリングがされるっぽい？ username: this.username,
x: this.username, password: this.password,
y: this.password,
token: this.user && this.user.twoFactorEnabled ? this.token : undefined token: this.user && this.user.twoFactorEnabled ? this.token : undefined
}).then(() => { }).then(() => {
location.reload(); location.reload();

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

@ -12,8 +12,8 @@ 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'] || body['x']; const username = body['username'];
const password = body['password'] || body['y']; const password = body['password'];
const token = body['token']; const token = body['token'];
if (typeof username != 'string') { if (typeof username != 'string') {