update response get profile
This commit is contained in:
+2
-1
@@ -6,7 +6,8 @@
|
|||||||
"scripts": {
|
"scripts": {
|
||||||
"start:dev": "./node_modules/.bin/nodemon ./src/bin/www -w app.js -w src/server",
|
"start:dev": "./node_modules/.bin/nodemon ./src/bin/www -w app.js -w src/server",
|
||||||
"dev-test": "nodemon -x 'npm test'",
|
"dev-test": "nodemon -x 'npm test'",
|
||||||
"test": "mocha --timeout 1500"
|
"test": "mocha --timeout 1500",
|
||||||
|
"start": "./node_modules/.bin/nodemon ./src/bin/www -w app.js -w src/server"
|
||||||
},
|
},
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ const verifyToken = (req, res, next) => {
|
|||||||
const token = bearToken.split(' ');
|
const token = bearToken.split(' ');
|
||||||
const decoded = jwt.verify(token[1], process.env.TOKEN_SECRET);
|
const decoded = jwt.verify(token[1], process.env.TOKEN_SECRET);
|
||||||
req.user = decoded;
|
req.user = decoded;
|
||||||
|
req.user.accessToken = token[1];
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
return res.status(401).send("Invalid Token");
|
return res.status(401).send("Invalid Token");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
const jwt = require('jsonwebtoken');
|
const jwt = require('jsonwebtoken');
|
||||||
const { omit } = require('lodash');
|
const { pick } = require('lodash');
|
||||||
const bcrypt = require('bcrypt');
|
const bcrypt = require('bcrypt');
|
||||||
const crypto = require('crypto');
|
const crypto = require('crypto');
|
||||||
const { Sequelize, QueryTypes } = require('sequelize');
|
const { Sequelize, QueryTypes } = require('sequelize');
|
||||||
@@ -213,9 +213,10 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
|
|
||||||
async getProfile(req) {
|
async getProfile(req) {
|
||||||
|
console.log(req.user)
|
||||||
const member_id = req.user.id;
|
const member_id = req.user.id;
|
||||||
var result = {};
|
var result = {};
|
||||||
let sql = `SELECT dg.personality AS personality_name,m.id AS member_id,m.*,p.*
|
let sql = `SELECT dg.personality AS personality_name,m.id AS member_id,m.*,m.id as id
|
||||||
FROM members m LEFT JOIN members_profile p ON p.member_id=m.id LEFT JOIN decision_group dg ON dg.dkey = m.decision_group
|
FROM members m LEFT JOIN members_profile p ON p.member_id=m.id LEFT JOIN decision_group dg ON dg.dkey = m.decision_group
|
||||||
WHERE m.id=:member_id LIMIT 1`;
|
WHERE m.id=:member_id LIMIT 1`;
|
||||||
const results = await sequelize.query(sql,
|
const results = await sequelize.query(sql,
|
||||||
@@ -224,7 +225,45 @@ module.exports = {
|
|||||||
});
|
});
|
||||||
if (results[0][0]) {
|
if (results[0][0]) {
|
||||||
result = results[0][0];
|
result = results[0][0];
|
||||||
return omit(result, ['password', 'password2'])
|
|
||||||
|
result['internal_return'] = 100;
|
||||||
|
result['session'] = req.user.accessToken;
|
||||||
|
result['session_contructed'] = req.user.accessToken;
|
||||||
|
rs = [
|
||||||
|
'internal_return',
|
||||||
|
'firstname',
|
||||||
|
'lastname',
|
||||||
|
'session',
|
||||||
|
'session_contructed',
|
||||||
|
'username',
|
||||||
|
'last_login',
|
||||||
|
'member_id',
|
||||||
|
'balance',
|
||||||
|
'added',
|
||||||
|
'account_added',
|
||||||
|
'city',
|
||||||
|
'country',
|
||||||
|
'account_added',
|
||||||
|
'email',
|
||||||
|
'fb_id',
|
||||||
|
'id',
|
||||||
|
'loc',
|
||||||
|
'news',
|
||||||
|
'phone',
|
||||||
|
'post_jobs',
|
||||||
|
'profile_pic',
|
||||||
|
'refer',
|
||||||
|
'state',
|
||||||
|
'status',
|
||||||
|
'street1',
|
||||||
|
'zipcode',
|
||||||
|
'test',
|
||||||
|
'points',
|
||||||
|
'min_budget',
|
||||||
|
'max_budget',
|
||||||
|
'prompt_background_gps',
|
||||||
|
];
|
||||||
|
return pick(result, rs)
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user