projects
/
vchess.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Attempt to clarify installation instructions a little
[vchess.git]
/
server
/
models
/
User.js
diff --git
a/server/models/User.js
b/server/models/User.js
index
c193d6d
..
cc104ab
100644
(file)
--- a/
server/models/User.js
+++ b/
server/models/User.js
@@
-2,10
+2,11
@@
const db = require("../utils/database");
const genToken = require("../utils/tokenGenerator");
const params = require("../config/parameters");
const sendEmail = require('../utils/mailer');
const genToken = require("../utils/tokenGenerator");
const params = require("../config/parameters");
const sendEmail = require('../utils/mailer');
+const { exec } = require("child_process");
/*
* Structure:
/*
* Structure:
- *
_
id: integer
+ * id: integer
* name: varchar
* email: varchar
* loginToken: token on server only
* name: varchar
* email: varchar
* loginToken: token on server only
@@
-17,6
+18,7
@@
const sendEmail = require('../utils/mailer');
*/
const UserModel = {
*/
const UserModel = {
+
checkNameEmail: function(o) {
return (
(!o.name || !!(o.name.match(/^[\w-]+$/))) &&
checkNameEmail: function(o) {
return (
(!o.name || !!(o.name.match(/^[\w-]+$/))) &&
@@
-139,7
+141,7
@@
const UserModel = {
},
tryNotify: function(id, message) {
},
tryNotify: function(id, message) {
- UserModel.getOne("id", id, "name, email", (err, user) => {
+ UserModel.getOne("id", id, "name, email
, notify
", (err, user) => {
if (!err && user.notify) UserModel.notify(user, message);
});
},
if (!err && user.notify) UserModel.notify(user, message);
});
},
@@
-170,14
+172,16
@@
const UserModel = {
}
});
if (toRemove.length > 0) {
}
});
if (toRemove.length > 0) {
+ const remArg = toRemove.join(",");
db.run(
"DELETE FROM Users " +
db.run(
"DELETE FROM Users " +
- "WHERE id IN (" +
toRemove.join(",")
+ ")"
+ "WHERE id IN (" +
remArg
+ ")"
);
}
});
});
);
}
});
});
- },
-}
+ }
+
+};
module.exports = UserModel;
module.exports = UserModel;