diff options
| author | Tosuke <tasukeprg@gmail.com> | 2017-01-06 14:39:24 +0900 |
|---|---|---|
| committer | Tosuke <tasukeprg@gmail.com> | 2017-01-06 14:39:24 +0900 |
| commit | 0420fee5d2c6a944a7b2cf13307dfadce9796b59 (patch) | |
| tree | d8c361b2c340c03927a5a417e5a91b3ab58db34b /src/api/endpoints/auth/session | |
| parent | [Swagger]Add /auth/accept (diff) | |
| parent | Update changelog (diff) | |
| download | sharkey-0420fee5d2c6a944a7b2cf13307dfadce9796b59.tar.gz sharkey-0420fee5d2c6a944a7b2cf13307dfadce9796b59.tar.bz2 sharkey-0420fee5d2c6a944a7b2cf13307dfadce9796b59.zip | |
Merge branch 'master' of github.com:syuilo/misskey into swagger
Diffstat (limited to 'src/api/endpoints/auth/session')
| -rw-r--r-- | src/api/endpoints/auth/session/userkey.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/api/endpoints/auth/session/userkey.js b/src/api/endpoints/auth/session/userkey.js index 73fa643c9c..9252046e57 100644 --- a/src/api/endpoints/auth/session/userkey.js +++ b/src/api/endpoints/auth/session/userkey.js @@ -5,7 +5,7 @@ */ import App from '../../../models/app'; import AuthSess from '../../../models/auth-session'; -import Userkey from '../../../models/userkey'; +import AccessToken from '../../../models/access-token'; import serialize from '../../../serializers/user'; /** @@ -89,8 +89,8 @@ module.exports = (params) => return rej('this session is not allowed yet'); } - // Lookup userkey - const userkey = await Userkey.findOne({ + // Lookup access token + const accessToken = await AccessToken.findOne({ app_id: app._id, user_id: session.user_id }); @@ -102,7 +102,7 @@ module.exports = (params) => // Response res({ - userkey: userkey.key, + access_token: accessToken.token, user: await serialize(session.user_id, null, { detail: true }) |