diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-08-21 01:23:39 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-08-21 01:23:39 +0900 |
| commit | fd947407afb7a541a5cf21f5299fafb7e3afc44f (patch) | |
| tree | 4290b7740aeaac5fd38a03d3832c4f2b69ed2567 | |
| parent | #2359 など (diff) | |
| download | misskey-fd947407afb7a541a5cf21f5299fafb7e3afc44f.tar.gz misskey-fd947407afb7a541a5cf21f5299fafb7e3afc44f.tar.bz2 misskey-fd947407afb7a541a5cf21f5299fafb7e3afc44f.zip | |
Revert "Fix bug?"
This reverts commit 2c9bacfceade688865ad1e8533ca494dd34d0ee5.
| -rw-r--r-- | src/client/app/common/views/components/signin.vue | 5 | ||||
| -rw-r--r-- | src/server/api/private/signin.ts | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/client/app/common/views/components/signin.vue b/src/client/app/common/views/components/signin.vue index aad9a1b7cf..5230ac371a 100644 --- a/src/client/app/common/views/components/signin.vue +++ b/src/client/app/common/views/components/signin.vue @@ -53,9 +53,8 @@ export default Vue.extend({ this.signing = true; (this as any).api('signin', { - // password という名前(または username とのペア？)では何らかのフィルタリングがされるっぽい？ - x: this.username, - y: this.password, + username: this.username, + password: this.password, token: this.user && this.user.twoFactorEnabled ? this.token : undefined }).then(() => { location.reload(); diff --git a/src/server/api/private/signin.ts b/src/server/api/private/signin.ts index 32d3eecaed..65413208dd 100644 --- a/src/server/api/private/signin.ts +++ b/src/server/api/private/signin.ts @@ -12,8 +12,8 @@ export default async (ctx: Koa.Context) => { ctx.set('Access-Control-Allow-Credentials', 'true'); const body = ctx.request.body as any; - const username = body['username'] || body['x']; - const password = body['password'] || body['y']; + const username = body['username']; + const password = body['password']; const token = body['token']; if (typeof username != 'string') { |