sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor: Rename userkey --> access-token

Browse Source
This commit is contained in:
syuilo
2017-01-06 12:09:57 +09:00
parent 9458245382
commit fef3d3f300
7 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/api/endpoints/auth/accept.js
View File

@ -7,7 +7,7 @@ import rndstr from 'rndstr';
const crypto = require('crypto');
import App from '../../models/app';
import AuthSess from '../../models/auth-session';
import Userkey from '../../models/userkey';
import AccessToken from '../../models/access-token';
/**
* Accept
@ -20,24 +20,24 @@ module.exports = (params, user) =>
new Promise(async (res, rej) =>
{
// Get 'token' parameter
const token = params.token;
if (token == null) {
const sesstoken = params.token;
if (sesstoken == null) {
return rej('token is required');
}
// Fetch token
const session = await AuthSess
.findOne({ token: token });
.findOne({ token: sesstoken });
if (session === null) {
return rej('session not found');
}
// Generate userkey
const key = rndstr('a-zA-Z0-9', 32);
// Generate access token
const token = rndstr('a-zA-Z0-9', 32);
// Fetch exist userkey
const exist = await Userkey.findOne({
// Fetch exist access token
const exist = await AccessToken.findOne({
app_id: session.app_id,
user_id: user._id,
});
@ -50,15 +50,15 @@ module.exports = (params, user) =>
// Generate Hash
const sha512 = crypto.createHash('sha512');
sha512.update(key + app.secret);
sha512.update(token + app.secret);
const hash = sha512.digest('hex');
// Insert userkey doc
await Userkey.insert({
// Insert access token doc
await AccessToken.insert({
created_at: new Date(),
app_id: session.app_id,
user_id: user._id,
key: key,
token: token,
hash: hash
});
}

8
src/api/endpoints/auth/session/userkey.js
View File

@ -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';
/**
@ -53,8 +53,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
});
@ -66,7 +66,7 @@ module.exports = (params) =>
// Response
res({
userkey: userkey.key,
access_token: accessToken.token,
user: await serialize(session.user_id, null, {
detail: true
})