summaryrefslogtreecommitdiff
path: root/src/server/api/authenticate.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-16 01:24:00 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-16 01:24:00 +0900
commitc6cef0162ddb5013a7753deb93e358f825b2b349 (patch)
tree52edff22e989b64a4973f9786ddd901108442b74 /src/server/api/authenticate.ts
parentMerge branch 'develop' (diff)
parent11.1.3 (diff)
downloadmisskey-c6cef0162ddb5013a7753deb93e358f825b2b349.tar.gz
misskey-c6cef0162ddb5013a7753deb93e358f825b2b349.tar.bz2
misskey-c6cef0162ddb5013a7753deb93e358f825b2b349.zip
Merge branch 'develop'
Diffstat (limited to 'src/server/api/authenticate.ts')
-rw-r--r--src/server/api/authenticate.ts4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/api/authenticate.ts b/src/server/api/authenticate.ts
index ecf4a82c45..519ed77388 100644
--- a/src/server/api/authenticate.ts
+++ b/src/server/api/authenticate.ts
@@ -31,7 +31,9 @@ export default async (token: string): Promise<[User | null | undefined, App | nu
.findOne(accessToken.appId);
const user = await Users
- .findOne(accessToken.userId);
+ .findOne({
+ id: accessToken.userId // findOne(accessToken.userId) のように書かないのは後方互換性のため
+ });
return [user, app];
}