banana/definma-api
Archived
2
Fork 0
Code Releases Activity

sample number generation

Browse Source
This commit is contained in:
VLE2FE
2020-05-18 09:58:15 +02:00
parent ec03e0699c
commit fe6e82f00b
9 changed files with 121 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/helpers/authorize.ts
View File

@@ -9,7 +9,7 @@ import UserModel from '../models/user';
module.exports = async (req, res, next) => {
let givenMethod = ''; // authorization method given by client, basic taken preferred
let user = {name: '', level: '', id: ''}; // user object
let user = {name: '', level: '', id: '', location: ''}; // user object
// test authentications
const userBasic = await basic(req, next);
@@ -46,7 +46,8 @@ module.exports = async (req, res, next) => {
method: givenMethod,
username: user.name,
level: user.level,
id: user.id
id: user.id,
location: user.location
};
next();
@@ -63,7 +64,7 @@ function basic (req, next): any { // checks basic auth and returns changed user
bcrypt.compare(auth.pass, data[0].pass, (err, res) => { // check password
if (err) return next(err);
if (res === true) {
resolve({level: data[0].level, name: data[0].name, id: data[0]._id.toString()});
resolve({level: data[0].level, name: data[0].name, id: data[0]._id.toString(), location: data[0].location});
}
else {
resolve(null);
@@ -87,7 +88,7 @@ function key (req, next): any { // checks API key and returns changed user obje
UserModel.find({key: req.query.key}).lean().exec( (err, data: any) => { // find user
if (err) return next(err);
if (data.length === 1) { // one user found
resolve({level: data[0].level, name: data[0].name, id: data[0]._id.toString()});
resolve({level: data[0].level, name: data[0].name, id: data[0]._id.toString(), location: data[0].location});
}
else {
resolve(null);