jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add fallbackEmail to user data model

Browse Source
This commit is contained in:
Johannes Zellner
2018-01-21 14:25:39 +01:00
parent 00c1c42b58
commit 1e8aa209b1
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/userdb.js
View File

@@ -25,7 +25,7 @@ var assert = require('assert'),
DatabaseError = require('./databaseerror'),
mailboxdb = require('./mailboxdb.js');
var USERS_FIELDS = [ 'id', 'username', 'email', 'password', 'salt', 'createdAt', 'modifiedAt', 'resetToken', 'displayName' ].join(',');
var USERS_FIELDS = [ 'id', 'username', 'email', 'fallbackEmail', 'password', 'salt', 'createdAt', 'modifiedAt', 'resetToken', 'displayName' ].join(',');
function postProcess(result) {
assert.strictEqual(typeof result, 'object');
@@ -132,6 +132,7 @@ function add(userId, user, callback) {
assert(user.username === null || typeof user.username === 'string');
assert.strictEqual(typeof user.password, 'string');
assert.strictEqual(typeof user.email, 'string');
assert.strictEqual(typeof user.fallbackEmail, 'string');
assert.strictEqual(typeof user.salt, 'string');
assert.strictEqual(typeof user.createdAt, 'string');
assert.strictEqual(typeof user.modifiedAt, 'string');
@@ -141,8 +142,8 @@ function add(userId, user, callback) {
var queries = [];
queries.push({
query: 'INSERT INTO users (id, username, password, email, salt, createdAt, modifiedAt, resetToken, displayName) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)',
args: [ userId, user.username, user.password, user.email, user.salt, user.createdAt, user.modifiedAt, user.resetToken, user.displayName ]
query: 'INSERT INTO users (id, username, password, email, fallbackEmail, salt, createdAt, modifiedAt, resetToken, displayName) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
args: [ userId, user.username, user.password, user.email, user.fallbackEmail, user.salt, user.createdAt, user.modifiedAt, user.resetToken, user.displayName ]
});
if (user.username) {
queries.push({
@@ -227,6 +228,9 @@ function update(userId, user, callback) {
} else if (k === 'email') {
assert.strictEqual(typeof user.email, 'string');
args.push(user.email);
} else if (k === 'fallbackEmail') {
assert.strictEqual(typeof user.fallbackEmail, 'string');
args.push(user.fallbackEmail);
} else {
args.push(user[k]);
}