优化
This commit is contained in:
yaoyanwei
@@ -3,92 +3,167 @@ const jwt = require('jsonwebtoken');
|
||||
const crypto = require('crypto');
|
||||
const config = require('../config.js');
|
||||
const jwtSecret = config.jwt_secret;
|
||||
const Activity = require("../activity/activity.model");
|
||||
const UserModel = require('../users/users.model');
|
||||
const UserTool = require('../users/users.tool');
|
||||
|
||||
exports.Login = (req, res) => {
|
||||
try {
|
||||
|
||||
let refreshId = req.login.userId + jwtSecret;
|
||||
let refresh_id = req.login.userId + jwtSecret;
|
||||
let refresh_key = crypto.randomBytes(16).toString('base64');
|
||||
let refresh_hash = crypto.createHmac('sha512', refresh_key).update(refreshId).digest("base64");
|
||||
let refresh_hash = crypto.createHmac('sha512', refresh_key).update(refresh_id).digest("base64");
|
||||
req.login.refresh_key = refresh_key;
|
||||
|
||||
let access_token = jwt.sign(req.login, jwtSecret);
|
||||
|
||||
//Delete some keys for security, empty keys are never valid, also update login time
|
||||
var update = {refresh_key: refresh_key, proof_key: "", password_recovery_key: "", last_login_time: new Date(), last_online_time: new Date()};
|
||||
var update = { refresh_key: refresh_key, proof_key: "", password_recovery_key: "", last_login_time: new Date(), last_online_time: new Date() };
|
||||
UserModel.patch(req.login.userId, update);
|
||||
|
||||
var odata = {
|
||||
id: req.login.userId,
|
||||
username: req.login.username,
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_hash,
|
||||
permission_level: req.login.permission_level,
|
||||
validation_level: req.login.validation_level,
|
||||
var data = {
|
||||
id: req.login.userId,
|
||||
username: req.login.username,
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_hash,
|
||||
permission_level: req.login.permission_level,
|
||||
validation_level: req.login.validation_level,
|
||||
duration: config.jwt_expiration,
|
||||
server_time: new Date(),
|
||||
version: config.version
|
||||
}
|
||||
|
||||
return res.status(201).send(odata);
|
||||
|
||||
return res.status(201).send(data);
|
||||
} catch (err) {
|
||||
return res.status(500).send({error: err});
|
||||
return res.status(500).send({ error: err });
|
||||
}
|
||||
};
|
||||
|
||||
exports.KeepOnline = async(req, res, next) => {
|
||||
|
||||
var token = req.jwt;
|
||||
UserModel.patch(token.userId, {last_online_time: new Date()});
|
||||
|
||||
var data = {id: token.userId, username: token.username, login_time: new Date(token.iat * 1000), server_time: new Date() };
|
||||
exports.SteamLogin = async (req, res) => {
|
||||
try {
|
||||
if (!req.body.email || !req.body.username || !req.body.password) {
|
||||
return res.status(400).send({ error: 'Invalid parameters' });
|
||||
}
|
||||
var email = req.body.email;
|
||||
var username = req.body.username;
|
||||
var password = req.body.password;
|
||||
var user = await UserModel.getByUsername(username);
|
||||
|
||||
if (!user) {
|
||||
user = {};
|
||||
user.username = username;
|
||||
user.email = email;
|
||||
user.permission_level = 1;
|
||||
user.validation_level = 0;
|
||||
|
||||
user.coins = config.start_coins;
|
||||
user.elo = config.start_elo;
|
||||
user.xp = 0;
|
||||
|
||||
user.account_create_time = new Date();
|
||||
user.last_login_time = new Date();
|
||||
user.last_online_time = new Date();
|
||||
user.email_confirm_key = UserTool.generateID(20);
|
||||
|
||||
UserTool.setUserPassword(user, password);
|
||||
|
||||
//Create user
|
||||
var user_created = await UserModel.create(user);
|
||||
if (!user_created)
|
||||
return res.status(500).send({ error: "Unable to create user" });
|
||||
|
||||
//Send confirm email
|
||||
UserTool.sendEmailConfirmKey(user_created, user.email, user.email_confirm_key);
|
||||
|
||||
// Activity Log -------------
|
||||
var act = await Activity.LogActivity("register", user.username, { username: user.username, email: user.email });
|
||||
if (!act) return res.status(500).send({ error: "Failed to log activity!!" });
|
||||
}
|
||||
var login = {
|
||||
userId: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
permission_level: user.permission_level,
|
||||
validation_level: user.validation_level,
|
||||
provider: email ? 'email' : 'username',
|
||||
}
|
||||
let refresh_id = login.userId + jwtSecret;
|
||||
let refresh_key = crypto.randomBytes(16).toString('base64');
|
||||
let refresh_hash = crypto.createHmac('sha512', refresh_key).update(refresh_id).digest("base64");
|
||||
login.refresh_key = refresh_key;
|
||||
|
||||
let access_token = jwt.sign(login, jwtSecret);
|
||||
|
||||
//Delete some keys for security, empty keys are never valid, also update login time
|
||||
UserModel.patch(login.userId, { refresh_key: refresh_key, proof_key: "", password_recovery_key: "", last_login_time: new Date(), last_online_time: new Date() });
|
||||
|
||||
var data = {
|
||||
id: login.userId,
|
||||
username: login.username,
|
||||
access_token: access_token,
|
||||
refresh_token: refresh_hash,
|
||||
permission_level: login.permission_level,
|
||||
validation_level: login.validation_level,
|
||||
duration: config.jwt_expiration,
|
||||
server_time: new Date(),
|
||||
version: config.version
|
||||
}
|
||||
return res.status(201).send(data);
|
||||
} catch (err) {
|
||||
console.error(err);
|
||||
return res.status(500).send({ error: err });
|
||||
}
|
||||
};
|
||||
|
||||
exports.KeepOnline = async (req, res, next) => {
|
||||
|
||||
var token = req.jwt;
|
||||
UserModel.patch(token.userId, { last_online_time: new Date() });
|
||||
|
||||
var data = { id: token.userId, username: token.username, login_time: new Date(token.iat * 1000), server_time: new Date() };
|
||||
return res.status(200).send(data);
|
||||
};
|
||||
|
||||
exports.GetVersion = (req, res) =>{
|
||||
return res.status(200).send({version: config.version});
|
||||
exports.GetVersion = (req, res) => {
|
||||
return res.status(200).send({ version: config.version });
|
||||
};
|
||||
|
||||
// ----- verify user -----------
|
||||
|
||||
exports.ValidateToken = async(req, res, next) => {
|
||||
|
||||
exports.ValidateToken = async (req, res, next) => {
|
||||
|
||||
var token = req.jwt;
|
||||
var data = {id: token.userId, username: token.username, login_time: new Date(token.iat * 1000), server_time: new Date() };
|
||||
var data = { id: token.userId, username: token.username, login_time: new Date(token.iat * 1000), server_time: new Date() };
|
||||
return res.status(200).send(data);
|
||||
};
|
||||
|
||||
exports.CreateProof = async(req, res) =>
|
||||
{
|
||||
exports.CreateProof = async (req, res) => {
|
||||
var userId = req.jwt.userId;
|
||||
|
||||
var user = await UserModel.getById(userId);
|
||||
if(!user)
|
||||
return res.status(404).send({error: "User not found"});
|
||||
if (!user)
|
||||
return res.status(404).send({ error: "User not found" });
|
||||
|
||||
user.proof_key = crypto.randomBytes(20).toString('base64');
|
||||
await UserModel.save(user);
|
||||
|
||||
return res.status(200).send({proof: user.proof_key});
|
||||
return res.status(200).send({ proof: user.proof_key });
|
||||
}
|
||||
|
||||
exports.ValidateProof = async(req, res) =>
|
||||
{
|
||||
exports.ValidateProof = async (req, res) => {
|
||||
var username = req.params.username;
|
||||
var proof = req.params.proof;
|
||||
|
||||
if(!username || typeof username != "string" || !proof || typeof proof != "string")
|
||||
return res.status(400).send({error: "Invalid parameters"});
|
||||
if (!username || typeof username != "string" || !proof || typeof proof != "string")
|
||||
return res.status(400).send({ error: "Invalid parameters" });
|
||||
|
||||
var user = await UserModel.getByUsername(username);
|
||||
if(!user)
|
||||
return res.status(404).send({error: "User not found"});
|
||||
|
||||
if(!user.proof_key || user.proof_key != proof)
|
||||
return res.status(403).send({error: "Invalid Proof"});
|
||||
if (!user)
|
||||
return res.status(404).send({ error: "User not found" });
|
||||
|
||||
if (!user.proof_key || user.proof_key != proof)
|
||||
return res.status(403).send({ error: "Invalid Proof" });
|
||||
|
||||
return res.status(200).send();
|
||||
}
|
||||
Reference in New Issue
Block a user