no message
This commit is contained in:
@@ -1,86 +1,88 @@
|
||||
const mongoose = require('mongoose');
|
||||
const mongoose = require('mongoose');
|
||||
const GoogleMaps = require('@google/maps').createClient({
|
||||
key: 'AIzaSyCvpBGztvxtRUNigOW9f0GXVRWlukJZsps'
|
||||
key: 'AIzaSyCvpBGztvxtRUNigOW9f0GXVRWlukJZsps'
|
||||
});
|
||||
|
||||
const Schema = mongoose.Schema;
|
||||
var logger = require('../modules/logger');
|
||||
|
||||
const Schema = mongoose.Schema;
|
||||
|
||||
const GeocacheSchema = new Schema({
|
||||
key: {
|
||||
type: String,
|
||||
required: true,
|
||||
unique: true
|
||||
type: String,
|
||||
required: true,
|
||||
unique: true
|
||||
},
|
||||
formatted: {
|
||||
type: String,
|
||||
required: true
|
||||
type: String,
|
||||
required: true
|
||||
},
|
||||
loc: {
|
||||
type: {
|
||||
type: String,
|
||||
default: 'Point'
|
||||
},
|
||||
coordinates: [{
|
||||
type: Number,
|
||||
default: [0, 0]
|
||||
}]
|
||||
type: {
|
||||
type: String,
|
||||
default: 'Point'
|
||||
},
|
||||
coordinates: [{
|
||||
type: Number,
|
||||
default: [0, 0]
|
||||
}]
|
||||
},
|
||||
georesult: {
|
||||
type: Schema.Types.Mixed
|
||||
type: Schema.Types.Mixed
|
||||
}
|
||||
});
|
||||
|
||||
const Conversion = {
|
||||
kilometersToMeters: (distance) => {
|
||||
return parseFloat(distance * 1000);
|
||||
},
|
||||
kilometersToMeters: (distance) => {
|
||||
return parseFloat(distance * 1000);
|
||||
},
|
||||
|
||||
kilometersToMiles: (distance) => {
|
||||
return parseFloat(distance / 1.60934);
|
||||
},
|
||||
kilometersToMiles: (distance) => {
|
||||
return parseFloat(distance / 1.60934);
|
||||
},
|
||||
|
||||
kilometersToNauticalMiles: (distance) => {
|
||||
return parseFloat(distance * 0.539957);
|
||||
},
|
||||
kilometersToNauticalMiles: (distance) => {
|
||||
return parseFloat(distance * 0.539957);
|
||||
},
|
||||
|
||||
metersToKilometers: (distance) => {
|
||||
return parseFloat(distance / 1000);
|
||||
},
|
||||
|
||||
metersToMiles: (distance) => {
|
||||
return parseFloat(distance / 1609.34);
|
||||
},
|
||||
|
||||
milesToKilometers: (distance) => {
|
||||
return parseFloat(distance * 1.60934);
|
||||
},
|
||||
|
||||
milesToMeters: (distance) => {
|
||||
return parseFloat(distance * 1609.34);
|
||||
},
|
||||
metersToKilometers: (distance) => {
|
||||
return parseFloat(distance / 1000);
|
||||
},
|
||||
|
||||
metersToMiles: (distance) => {
|
||||
return parseFloat(distance / 1609.34);
|
||||
},
|
||||
|
||||
milesToKilometers: (distance) => {
|
||||
return parseFloat(distance * 1.60934);
|
||||
},
|
||||
|
||||
milesToMeters: (distance) => {
|
||||
return parseFloat(distance * 1609.34);
|
||||
},
|
||||
|
||||
milesToNauticalMiles: (distance) => {
|
||||
return parseFloat(distance * 0.868976);
|
||||
},
|
||||
|
||||
nauticalMilesToMeters: (distance) => {
|
||||
return parseFloat(distance / 0.868976);
|
||||
},
|
||||
|
||||
nauticalMilesToMiles: (distance) => {
|
||||
return parseFloat(distance / 0.868976);
|
||||
},
|
||||
|
||||
nauticalMilesToKilometers: (distance) => {
|
||||
return parseFloat(distance * 1.852000674128);
|
||||
}
|
||||
milesToNauticalMiles: (distance) => {
|
||||
return parseFloat(distance * 0.868976);
|
||||
},
|
||||
|
||||
nauticalMilesToMeters: (distance) => {
|
||||
return parseFloat(distance / 0.868976);
|
||||
},
|
||||
|
||||
nauticalMilesToMiles: (distance) => {
|
||||
return parseFloat(distance / 0.868976);
|
||||
},
|
||||
|
||||
nauticalMilesToKilometers: (distance) => {
|
||||
return parseFloat(distance * 1.852000674128);
|
||||
}
|
||||
};
|
||||
|
||||
GeocacheSchema.index({ name: 1, loc: '2dsphere' });
|
||||
|
||||
const GeocacheModel = mongoose.model('geocache', GeocacheSchema);
|
||||
|
||||
function distanceBetween (geoJSON1, geoJSON2, unit = 'mi') {
|
||||
/*function distanceBetween (geoJSON1, geoJSON2, unit = 'mi') {
|
||||
var radlat1 = Math.PI * geoJSON1.coordinates[1]/180;
|
||||
var radlat2 = Math.PI * geoJSON2.coordinates[1]/180;
|
||||
var theta = geoJSON1.coordinates[0] - geoJSON2.coordinates[0];
|
||||
@@ -88,53 +90,53 @@ function distanceBetween (geoJSON1, geoJSON2, unit = 'mi') {
|
||||
var dist = Math.sin(radlat1) * Math.sin(radlat2) + Math.cos(radlat1) * Math.cos(radlat2) * Math.cos(radtheta);
|
||||
dist = Math.acos(dist);
|
||||
dist = dist * 180/Math.PI;
|
||||
dist = dist * 60 * 1.1515; /* miles between */
|
||||
dist = dist * 60 * 1.1515; // miles between
|
||||
if (unit == "km") { dist = Conversion.metersToKilometers(Conversion.milesToMeters(dist)); }
|
||||
if (unit == "m") { dist = dist * 1.609344; }
|
||||
if (unit == "n") { dist = dist * 0.8684; }
|
||||
return dist;
|
||||
}
|
||||
}*/
|
||||
|
||||
function queryGeodataApi (query, callback) {
|
||||
GoogleMaps.geocode({
|
||||
address: query
|
||||
}, function(err, response) {
|
||||
if (err) {
|
||||
console.error('[GeocacheModel<<getGeoData>>] Address Geocoding Error', { address: query, response: response });
|
||||
callback(null, err, null);
|
||||
}
|
||||
|
||||
if (response.json && Array.isArray(response.json.results)) {
|
||||
var data = {
|
||||
key: sanitizeNameForKey(query),
|
||||
formatted: response.json.results[0].formatted_address,
|
||||
georesult: response.json.results[0],
|
||||
loc: {
|
||||
type: 'Point',
|
||||
coordinates: [
|
||||
response.json.results[0].geometry.location.lng,
|
||||
response.json.results[0].geometry.location.lat
|
||||
]
|
||||
}
|
||||
};
|
||||
callback(null, null, data);
|
||||
}
|
||||
});
|
||||
GoogleMaps.geocode({
|
||||
address: query
|
||||
}, function(err, response) {
|
||||
if (err) {
|
||||
console.error('[GeocacheModel<<getGeoData>>] Address Geocoding Error', { address: query, response: response });
|
||||
callback(null, err, null);
|
||||
}
|
||||
|
||||
if (response.json && Array.isArray(response.json.results)) {
|
||||
var data = {
|
||||
key: sanitizeNameForKey(query),
|
||||
formatted: response.json.results[0].formatted_address,
|
||||
georesult: response.json.results[0],
|
||||
loc: {
|
||||
type: 'Point',
|
||||
coordinates: [
|
||||
response.json.results[0].geometry.location.lng,
|
||||
response.json.results[0].geometry.location.lat
|
||||
]
|
||||
}
|
||||
};
|
||||
callback(null, null, data);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function sanitizeNameForKey (name) {
|
||||
var key = name.replace(/[.,\/#!$%\^&\*;:{}=\-_`~()]/g,'');
|
||||
key = key.replace(/\s{2,}/g,' ');
|
||||
key = key.trim();
|
||||
key = key.toLowerCase();
|
||||
return key;
|
||||
var key = name.replace(/[.,/#!$%^&*;:{}=\-_`~()]/g,'');
|
||||
key = key.replace(/\s{2,}/g,' ');
|
||||
key = key.trim();
|
||||
key = key.toLowerCase();
|
||||
return key;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
module.exports = {
|
||||
|
||||
create: (e, geodata) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
var geocacheInstance = new GeocacheModel(geodata);
|
||||
geocacheInstance.save((err, result) => {
|
||||
if (err) {
|
||||
@@ -148,18 +150,18 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('create', null, result);
|
||||
cb('create', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('create', err, null);
|
||||
cb('create', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
conversion: Conversion,
|
||||
|
||||
find: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
find: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.findOne({ key: sanitizeNameForKey(searchText) }, (err, result) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
@@ -172,16 +174,16 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('find', null, result);
|
||||
cb('find', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('find', err, null);
|
||||
cb('find', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
findLike: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
},
|
||||
|
||||
findLike: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.find({ key: new RegExp('.*' + sanitizeNameForKey(searchText) + '.*', "i") }, (err, result) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
@@ -194,26 +196,26 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('findLike', null, result);
|
||||
cb('findLike', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('findLike', err, null);
|
||||
cb('findLike', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
findNear: (e, lng, lat, distance) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
var point = {
|
||||
type: 'Point',
|
||||
coordinates: [ lng, lat ]
|
||||
};
|
||||
|
||||
var opts = {
|
||||
spherical: true,
|
||||
maxDistance: Conversion.milesToMeters(distance)
|
||||
};
|
||||
},
|
||||
|
||||
findNear: (e, lng, lat, distance) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
var point = {
|
||||
type: 'Point',
|
||||
coordinates: [ lng, lat ]
|
||||
};
|
||||
|
||||
var opts = {
|
||||
spherical: true,
|
||||
maxDistance: Conversion.milesToMeters(distance)
|
||||
};
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.geoNear(point, opts, (err, results) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
@@ -226,135 +228,137 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('findNear', null, result);
|
||||
cb('findNear', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('findNear', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeo: (e, id) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.findById(id, (err, result) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (result) {
|
||||
resolve(result);
|
||||
}
|
||||
});
|
||||
cb('findNear', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeo: (e, id) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.findById(id, (err, result) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (result) {
|
||||
resolve(result);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('getGeos', null, result);
|
||||
cb('getGeos', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('getGeos', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeos: (e) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.find({}, (err, results) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (results) {
|
||||
resolve(results);
|
||||
}
|
||||
});
|
||||
cb('getGeos', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeos: (e) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.find({}, (err, results) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (results) {
|
||||
resolve(results);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('getGeos', null, result);
|
||||
cb('getGeos', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('getGeos', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeoJSON: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
queryGeodataApi(searchText, (f, err, geodata) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (geodata) {
|
||||
resolve(geodata.loc);
|
||||
}
|
||||
});
|
||||
cb('getGeos', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeoJSON: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
queryGeodataApi(searchText, (f, err, geodata) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (geodata) {
|
||||
resolve(geodata.loc);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('getGeoJSON', null, result);
|
||||
cb('getGeoJSON', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('getGeoJSON', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeoJSONFromCache: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
cb('getGeoJSON', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
getGeoJSONFromCache: (e, searchText) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.findOne({ key: sanitizeNameForKey(searchText) }, (err, result) => {
|
||||
if (err || !result) {
|
||||
queryGeodataApi(searchText, (f, err, geodata) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (geodata) {
|
||||
let geocacheInstance = new GeocacheModel(geodata);
|
||||
geocacheInstance.save((err, result) => {
|
||||
if (err) {
|
||||
console.error('[Geocache::getGeoJSON] There was an error creating the GeoJSON entry.', { err: err });
|
||||
}
|
||||
});
|
||||
resolve(geodata.loc);
|
||||
}
|
||||
});
|
||||
} else if (result) {
|
||||
resolve(result.loc);
|
||||
}
|
||||
});
|
||||
});
|
||||
queryGeodataApi(searchText, (f, err, geodata) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (geodata) {
|
||||
let geocacheInstance = new GeocacheModel(geodata);
|
||||
geocacheInstance.save((err, result) => {
|
||||
if (err) {
|
||||
logger.error('[Geocache::getGeoJSON] There was an error creating the GeoJSON entry.', { err: err });
|
||||
}
|
||||
|
||||
logger.debug()
|
||||
});
|
||||
resolve(geodata.loc);
|
||||
}
|
||||
});
|
||||
} else if (result) {
|
||||
resolve(result.loc);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('getGeoJSONFromCache', null, result);
|
||||
cb('getGeoJSONFromCache', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('getGeoJSONFromCache', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
populateFormatted: (e) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
cb('getGeoJSONFromCache', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
populateFormatted: (e) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.find({}, (err, results) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (results) {
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
if (!results[i].formatted) {
|
||||
results[i].formatted = results[i].georesult.formatted_address;
|
||||
GeocacheModel.findByIdAndUpdate(results[i]._id, { $set: results[i] }, (err, result) => {
|
||||
if (err) console.error('There was an error populating the geocache formatted address.');
|
||||
if (result) console.log('The geocache entry was updated');
|
||||
});
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
if (!results[i].formatted) {
|
||||
results[i].formatted = results[i].georesult.formatted_address;
|
||||
GeocacheModel.findByIdAndUpdate(results[i]._id, { $set: results[i] }, (err, result) => {
|
||||
if (err) logger.error('There was an error populating the geocache formatted address.');
|
||||
if (result) logger.log('The geocache entry was updated');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
resolve({ status: 'OK', message: 'The geocache entries have been updated.'});
|
||||
}
|
||||
@@ -362,31 +366,31 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('populateFormattedAddresses', null, result);
|
||||
cb('populateFormattedAddresses', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('populateFormattedAddresses', err, null);
|
||||
cb('populateFormattedAddresses', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
populateKeys: (e) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
},
|
||||
|
||||
populateKeys: (e) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.find({}, (err, results) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
}
|
||||
|
||||
if (results) {
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
if (!results[i].key) {
|
||||
results[i].key = sanitizeNameForKey(results[i].name);
|
||||
GeocacheModel.findByIdAndUpdate(results[i]._id, { $set: results[i] }, (err, result) => {
|
||||
if (err) console.error('There was an error populating the geocache entry key.');
|
||||
if (result) console.log('The geocache entry was updated');
|
||||
});
|
||||
}
|
||||
}
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
if (!results[i].key) {
|
||||
results[i].key = sanitizeNameForKey(results[i].name);
|
||||
GeocacheModel.findByIdAndUpdate(results[i]._id, { $set: results[i] }, (err, result) => {
|
||||
if (err) logger.error('There was an error populating the geocache entry key.');
|
||||
if (result) logger.log('The geocache entry was updated');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
resolve({ status: 'OK', message: 'The geocache entries have been updated.'});
|
||||
}
|
||||
@@ -394,16 +398,16 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('populateKeys', null, result);
|
||||
cb('populateKeys', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('populateKeys', err, null);
|
||||
cb('populateKeys', err, null);
|
||||
});
|
||||
},
|
||||
|
||||
update: (e, id, geodata) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
},
|
||||
|
||||
update: (e, id, geodata) => {
|
||||
var cb = typeof e === 'object' && e.emit ? e.emit.bind(e) : e;
|
||||
const promise = new Promise((resolve, reject) => {
|
||||
GeocacheModel.findByIdAndUpdate(id, { $set: geodata }, (err, result) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
@@ -416,10 +420,10 @@ module.exports = {
|
||||
});
|
||||
|
||||
promise.then((result) => {
|
||||
cb('update', null, result);
|
||||
cb('update', null, result);
|
||||
})
|
||||
.catch((err) => {
|
||||
cb('update', err, null);
|
||||
cb('update', err, null);
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -6,6 +6,8 @@ const Token = require('../modules/token');
|
||||
|
||||
const secret = 'Creepily hooking the gays up since 2008!';
|
||||
|
||||
var logger = require('../modules/logger');
|
||||
|
||||
function generateHmac (userId, expires) {
|
||||
var string = String(userId) + '|' + String(expires);
|
||||
return Crypto.createHmac('sha1', secret).update(string).digest('hex');
|
||||
@@ -25,10 +27,10 @@ function sendMail (options, callback) {
|
||||
|
||||
callback = typeof callback === 'function' ? callback : (error, info) => {
|
||||
if (error) {
|
||||
return console.log(error);
|
||||
return logger.error(error);
|
||||
}
|
||||
|
||||
console.log('Message %s sent: %s', info.messageId, info.response);
|
||||
logger.debug('Message %s sent: %s', info.messageId, info.response);
|
||||
};
|
||||
|
||||
// send mail with defined transport object
|
||||
@@ -110,18 +112,18 @@ module.exports = {
|
||||
|
||||
sendMail(mail, (error, info) => {
|
||||
if (error) {
|
||||
console.log('[reset::forceReset] Message Send Error', { error: error });
|
||||
logger.debug('[reset::forceReset] Message Send Error', { error: error });
|
||||
forceResetMailResolve({ success: false, message: 'There was an error sending the message', error: error });
|
||||
}
|
||||
|
||||
if (info) {
|
||||
console.log('[reset::forceReset] Message sent', { messageId: info.messageId, response: info.response, resetLink: resetLink });
|
||||
logger.debug('[reset::forceReset] Message sent', { messageId: info.messageId, response: info.response, resetLink: resetLink });
|
||||
forceResetMailResolve({ success: true, message: 'Message ' + info.messageId + ' sent: ' + info.response + '.' });
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log('[reset::forceReset] There was an error creating the reset token.', { err: err });
|
||||
logger.debug('[reset::forceReset] There was an error creating the reset token.', { err: err });
|
||||
forceResetMailReject(err);
|
||||
});
|
||||
});
|
||||
@@ -184,14 +186,14 @@ module.exports = {
|
||||
if (e) {
|
||||
e.emit('markUsed', null, result);
|
||||
} else {
|
||||
console.log('[ResetModel::markUsed] Password reset token used', { token: result });
|
||||
logger.debug('[ResetModel::markUsed] Password reset token used', { token: result });
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
if (e) {
|
||||
e.emit('markUsed', err, null);
|
||||
} else {
|
||||
console.error('[ResetModel::markUsed] Error marking password reset token used', { token: err });
|
||||
logger.error('[ResetModel::markUsed] Error marking password reset token used', { token: err });
|
||||
}
|
||||
});
|
||||
},
|
||||
@@ -226,18 +228,18 @@ module.exports = {
|
||||
|
||||
sendMail(mail, (error, info) => {
|
||||
if (error) {
|
||||
console.log('[reset::sendNewUser] Message Send Error', { error: error });
|
||||
logger.error('[reset::sendNewUser] Message Send Error', { error: error });
|
||||
newUserMailResolve({ success: false, message: 'There was an error sending the message', error: error });
|
||||
}
|
||||
|
||||
if (info) {
|
||||
console.log('[reset::sendNewUser] Message %s sent: %s', info.messageId, info.response);
|
||||
logger.debug('[reset::sendNewUser] Message %s sent: %s', info.messageId, info.response);
|
||||
newUserMailResolve({ success: true, message: 'Message ' + info.messageId + ' sent: ' + info.response + '.' });
|
||||
}
|
||||
});
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log('[reset::sendNewUser] There was an error creating the reset token.', { err: err });
|
||||
logger.error('[reset::sendNewUser] There was an error creating the reset token.', { err: err });
|
||||
newUserMailReject(err);
|
||||
});
|
||||
});
|
||||
@@ -295,13 +297,13 @@ module.exports = {
|
||||
sendMail(mail, (err, info) => {
|
||||
if (err) {
|
||||
var error = { msg: '[reset::sendReset] There was an error sending the reset email.', err: err };
|
||||
console.log('[reset::sendReset] Message Send Error', { err: err });
|
||||
logger.error('[reset::sendReset] Message Send Error', { err: err });
|
||||
sendMailResolve({ success: false, message: 'There was an error requesting the password reset.', error: error });
|
||||
}
|
||||
|
||||
if (info) {
|
||||
var message = 'Message ' + info.messageId + ' sent: ' + info.response + '.';
|
||||
console.log('[reset::sendReset] ' + message);
|
||||
logger.debug('[reset::sendReset] ' + message);
|
||||
sendMailResolve({ success: true, message: 'The password reset request was successfully completed.', response: message });
|
||||
}
|
||||
});
|
||||
@@ -316,7 +318,7 @@ module.exports = {
|
||||
})
|
||||
.catch((err) => {
|
||||
var error = { msg: '[reset::sendReset] There was an error creating the reset token.', err: err };
|
||||
console.log(error.msg, { err: err });
|
||||
logger.debug(error.msg, { err: err });
|
||||
e.emit('sendReset', null, { success: false, message: 'There was an error requesting the password reset.', error: error });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -68,13 +68,15 @@ UserSchema.post('save', function (err, res, next) {
|
||||
|
||||
const UserModel = Mongoose.model('users', UserSchema);
|
||||
|
||||
var logger = require('../modules/logger');
|
||||
|
||||
function hashPassword (password, callback) {
|
||||
callback = callback || false;
|
||||
|
||||
Authentication.hashPassword(password, (err, password) => {
|
||||
if (err !== null) {
|
||||
err = new Error({ success: false, message: 'There was an error hashing the updated password.', err: err });
|
||||
console.error('[updateUser:hashPassword] ', err);
|
||||
logger.error('[updateUser:hashPassword] ', err);
|
||||
|
||||
if (callback) {
|
||||
callback(err, null);
|
||||
@@ -101,7 +103,7 @@ function confirmPassword (username, passwordToValidate, callback) {
|
||||
UserModel.findById({ userName: username }, (err, user) => {
|
||||
if (err !== null) {
|
||||
err = new Error({ success: false, message: 'There was an error locating the user.', err: (err || null) });
|
||||
console.error('[updateUser:confirmPassword] ', err);
|
||||
logger.error('[updateUser:confirmPassword] ', err);
|
||||
|
||||
if (callback) {
|
||||
callback(err, null);
|
||||
@@ -114,7 +116,7 @@ function confirmPassword (username, passwordToValidate, callback) {
|
||||
Authentication.verifyPassword(passwordToValidate, Buffer.from(storedUser.password, 'hex'), (err, valid) => {
|
||||
if (err !== null || !valid) {
|
||||
err = new Error({ success: false, message: (!err && !valid ? 'The current password was incorrect.' : 'There was an error attempting to validate the password.'), err: (err || null) });
|
||||
console.error('[updateUser:confirmPassword] ', { err: err, valid: valid });
|
||||
logger.error('[updateUser:confirmPassword] ', { err: err, valid: valid });
|
||||
|
||||
if (callback) {
|
||||
callback(err, null);
|
||||
@@ -183,7 +185,7 @@ module.exports = {
|
||||
string: 'There was an error authenticating the user.'
|
||||
}
|
||||
}
|
||||
console.log('[UserModel::authenticateUser] Error finding user', { err: err, username: login.userName });
|
||||
logger.debug('[UserModel::authenticateUser] Error finding user', { err: err, username: login.userName });
|
||||
resolve(loginObject);
|
||||
}
|
||||
|
||||
@@ -207,7 +209,7 @@ module.exports = {
|
||||
try {
|
||||
Authentication.verifyPassword(login.password, Buffer.from(user.password, 'hex'), (err, valid) => {
|
||||
if (err) {
|
||||
console.log('[UserModel::authenticateUser] Error validating password', { err: err, user: user });
|
||||
logger.debug('[UserModel::authenticateUser] Error validating password', { err: err, user: user });
|
||||
reject(err);
|
||||
}
|
||||
|
||||
@@ -231,7 +233,7 @@ module.exports = {
|
||||
|
||||
loginObject.timestamp = Date.now();
|
||||
|
||||
console.log('[UserModel::authenticateUser] User Validated', { user: user, loginObject: loginObject });
|
||||
logger.debug('[UserModel::authenticateUser] User Validated', { user: user, loginObject: loginObject });
|
||||
resolve(loginObject);
|
||||
} else {
|
||||
loginObject.err = {
|
||||
@@ -240,7 +242,7 @@ module.exports = {
|
||||
string: 'The user id or password you entered was invalid.'
|
||||
};
|
||||
|
||||
console.log('[UserModel::authenticateUser] Invalid Password', { user: user, loginObject: loginObject });
|
||||
logger.debug('[UserModel::authenticateUser] Invalid Password', { user: user, loginObject: loginObject });
|
||||
resolve(loginObject);
|
||||
}
|
||||
});
|
||||
@@ -256,7 +258,7 @@ module.exports = {
|
||||
}
|
||||
};
|
||||
|
||||
console.log('[UserModel::authenticateUser] Error verifying password', { err: err, user: user });
|
||||
logger.error('[UserModel::authenticateUser] Error verifying password', { err: err, user: user });
|
||||
resolve(loginObject);
|
||||
}
|
||||
}
|
||||
@@ -271,7 +273,7 @@ module.exports = {
|
||||
string: 'The user is not authorized, please contact an administrator.'
|
||||
}
|
||||
};
|
||||
console.log('[UserModel::authenticateUser] The user is disabled', { err: err, user: user });
|
||||
logger.debug('[UserModel::authenticateUser] The user is disabled', { err: err, user: user });
|
||||
resolve(loginObject);
|
||||
}
|
||||
else {
|
||||
@@ -284,7 +286,7 @@ module.exports = {
|
||||
string: 'The user id or password you entered was invalid.'
|
||||
}
|
||||
};
|
||||
console.log('[UserModel::authenticateUser] The user does not exist', { err: err, user: user });
|
||||
logger.debug('[UserModel::authenticateUser] The user does not exist', { err: err, user: user });
|
||||
resolve(loginObject);
|
||||
}
|
||||
}
|
||||
@@ -304,7 +306,7 @@ module.exports = {
|
||||
var userInstance = new UserModel(user);
|
||||
|
||||
userInstance.save((err, result) => {
|
||||
console.log('createUser', { err: err, result: result, user: userInstance });
|
||||
logger.debug('createUser', { err: err, result: result, user: userInstance });
|
||||
|
||||
if (err) {
|
||||
reject(err);
|
||||
|
||||
Reference in New Issue
Block a user