wmantly/vpn-p2p
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed issue when renaming host

Browse Source
This commit is contained in:
William Mantly
2019-12-22 18:53:00 -05:00
parent fb71dc1dea
commit eb41fce6df
2 changed files with 53 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
nodejs/models/hosts.js
View File

@ -2,7 +2,7 @@
const {promisify} = require('util');
const client = require('../utils/redis');
const {processKeys, ObjectValidateError} = require('../utils/object_validate');
const objValidate = require('../utils/object_validate');
const hostKeysMap = {
'host': {isRequired: true, type: 'string', min: 3, max: 500},
@ -21,7 +21,7 @@ async function getInfo(data){
if(info){
info['host'] = data.host;
return info
return objValidate.parseFromString(hostKeysMap, info);
}
}catch(error){
@ -63,9 +63,11 @@ async function listAllDetail(){
return out
}
async function add(data, edit){
async function add(data){
try{
data = processKeys(hostKeysMap, data, edit);
console.log('host', data)
data = objValidate.processKeys(hostKeysMap, data);
if(data.host && await exists(data.host)){
let error = new Error('HostNameUsed');
@ -96,18 +98,23 @@ async function edit(data, host){
// Check to see if host name changed
if(data.host && data.host !== host){
console.log('pre assign', hostData, data)
// Merge the current data into with the updated data
data = Object.assign({}, hostData, data);
let newData = Object.assign({}, hostData, data);
// Remove the updated failed so it doesnt keep it
delete newData.updated;
// Create a new record for the updated host. If that succeeds,
// delete the old recored
if(await add(hostData)) await remove({host});
if(await add(newData)) await remove({host});
}else{
// Update what ever fields that where passed.
// Validate the passed data, ignoring required fields.
data = processKeys(hostKeysMap, data, true);
data = objValidate.processKeys(hostKeysMap, data, true);
// Loop over the data fields and apply them to redis
for(let key of Object.keys(data)){