moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://numinibsd/git/base/enigma-bbs

This commit is contained in:
Bryan Ashby 2017-02-18 19:02:31 -07:00
parent 08faf5ab1a 6717cd5179
commit b427e79876
24 changed files with 797 additions and 539 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/bbs.js
View File

@ -196,19 +196,18 @@ function initialize(cb) {
// * We do this every time as the op is free to change this information just
// like any other user
//
const user = require('./user.js');
const User = require('./user.js');
async.waterfall(
[
function getOpUserName(next) {
return user.getUserName(1, next);
return User.getUserName(1, next);
},
function getOpProps(opUserName, next) {
const propLoadOpts = {
userId : 1,
names : [ 'real_name', 'sex', 'email_address', 'location', 'affiliation' ],
};
user.loadProperties(propLoadOpts, (err, opProps) => {
User.loadProperties(User.RootUserID, propLoadOpts, (err, opProps) => {
return next(err, opUserName, opProps);
});
}

8
core/client.js
View File

@ -34,7 +34,7 @@
// ENiGMA½
const term = require('./client_term.js');
const ansi = require('./ansi_term.js');
const user = require('./user.js');
const User = require('./user.js');
const Config = require('./config.js').config;
const MenuStack = require('./menu_stack.js');
const ACS = require('./acs.js');
@ -77,7 +77,7 @@ function Client(input, output) {
const self = this;
this.user = new user.User();
this.user = new User();
this.currentTheme = { info : { name : 'N/A', description : 'None' } };
this.lastKeyPressMs = Date.now();
this.menuStack = new MenuStack(this);
@ -457,10 +457,6 @@ Client.prototype.waitForKeyPress = function(cb) {
});
};
Client.prototype.address = function() {
return this.input.address();
};
Client.prototype.isLocal = function() {
// :TODO: return rather client is a local connection or not
return false;

9
core/client_connections.js
View File

@ -56,16 +56,17 @@ function getActiveNodeList(authUsersOnly) {
}
function addNewClient(client, clientSock) {
const id = client.session.id = clientConnections.push(client) - 1;
const id = client.session.id = clientConnections.push(client) - 1;
const remoteAddress = client.remoteAddress = clientSock.remoteAddress;
// Create a client specific logger
// Note that this will be updated @ login with additional information
client.log = logger.log.child( { clientId : id } );
const connInfo = {
ip : clientSock.remoteAddress,
serverName : client.session.serverName,
isSecure : client.session.isSecure,
remoteAddress : remoteAddress,
serverName : client.session.serverName,
isSecure : client.session.isSecure,
};
if(client.log.debug()) {

1
core/enig_error.js
View File

@ -37,4 +37,5 @@ exports.ErrorReasons = {
InvalidNextMenu : 'BADNEXT',
NoPreviousMenu : 'NOPREV',
NoConditionMatch : 'NOCONDMATCH',
NotEnabled : 'NOTENABLED',
};

71
core/file_area_web.js
View File

@ -8,6 +8,11 @@ const getISOTimestampString = require('./database.js').getISOTimestampString;
const FileEntry = require('./file_entry.js');
const getServer = require('./listening_server.js').getServer;
const Errors = require('./enig_error.js').Errors;
const ErrNotEnabled = require('./enig_error.js').ErrorReasons.NotEnabled;
const StatLog = require('./stat_log.js');
const User = require('./user.js');
const Log = require('./logger.js').log;
const getConnectionByUserId = require('./client_connections.js').getConnectionByUserId;
// deps
const hashids = require('hashids');
@ -27,6 +32,10 @@ const WEB_SERVER_PACKAGE_NAME = 'codes.l33t.enigma.web.server';
*
*/
function notEnabledError() {
return Errors.General('Web server is not enabled', ErrNotEnabled);
}
class FileAreaWebAccess {
constructor() {
this.hashids = new hashids(Config.general.boardName);
@ -46,14 +55,17 @@ class FileAreaWebAccess {
if(!self.webServer) {
return callback(Errors.DoesNotExist(`Server with package name "${WEB_SERVER_PACKAGE_NAME}" does not exist`));
}
const routeAdded = self.webServer.instance.addRoute({
method : 'GET',
path : Config.fileBase.web.routePath,
handler : self.routeWebRequestForFile.bind(self),
});
return callback(routeAdded ? null : Errors.General('Failed adding route'));
if(self.isEnabled()) {
const routeAdded = self.webServer.instance.addRoute({
method : 'GET',
path : Config.fileBase.web.routePath,
handler : self.routeWebRequestForFile.bind(self),
});
return callback(routeAdded ? null : Errors.General('Failed adding route'));
} else {
return callback(null); // not enabled, but no error
}
}
],
err => {
@ -66,6 +78,10 @@ class FileAreaWebAccess {
return cb(null);
}
isEnabled() {
return this.webServer.instance.isEnabled();
}
load(cb) {
//
// Load entries, register expiration timers
@ -187,6 +203,10 @@ class FileAreaWebAccess {
}
getExistingTempDownloadServeItem(client, fileEntry, cb) {
if(!this.isEnabled()) {
return cb(notEnabledError());
}
const hashId = this.getHashId(client, fileEntry);
this.loadServedHashId(hashId, (err, servedItem) => {
if(err) {
@ -200,6 +220,10 @@ class FileAreaWebAccess {
}
createAndServeTempDownload(client, fileEntry, options, cb) {
if(!this.isEnabled()) {
return cb(notEnabledError());
}
const hashId = this.getHashId(client, fileEntry);
const url = this.buildTempDownloadLink(client, fileEntry, hashId);
options.expireTime = options.expireTime || moment().add(2, 'days');
@ -257,7 +281,7 @@ class FileAreaWebAccess {
resp.on('finish', () => {
// transfer completed fully
// :TODO: we need to update the users stats - bytes xferred, credit stuff, etc.
this.updateDownloadStatsForUserId(servedItem.userId, stats.size);
});
const headers = {
@ -273,6 +297,37 @@ class FileAreaWebAccess {
});
});
}
updateDownloadStatsForUserId(userId, dlBytes, cb) {
async.waterfall(
[
function fetchActiveUser(callback) {
const clientForUserId = getConnectionByUserId(userId);
if(clientForUserId) {
return callback(null, clientForUserId.user);
}
// not online now - look 'em up
User.getUser(userId, (err, assocUser) => {
return callback(err, assocUser);
});
},
function updateStats(user, callback) {
StatLog.incrementUserStat(user, 'dl_total_count', 1);
StatLog.incrementUserStat(user, 'dl_total_bytes', dlBytes);
StatLog.incrementSystemStat('dl_total_count', 1);
StatLog.incrementSystemStat('dl_total_bytes', dlBytes);
return callback(null);
}
],
err => {
if(cb) {
return cb(err);
}
}
);
}
}
module.exports = new FileAreaWebAccess();

1
core/file_base_area.js
View File

@ -23,6 +23,7 @@ const iconv = require('iconv-lite');
exports.isInternalArea = isInternalArea;
exports.getAvailableFileAreas = getAvailableFileAreas;
exports.getSortedAvailableFileAreas = getSortedAvailableFileAreas;
exports.getAreaStorageDirectoryByTag = getAreaStorageDirectoryByTag;
exports.getAreaDefaultStorageDirectory = getAreaDefaultStorageDirectory;
exports.getAreaStorageLocations = getAreaStorageLocations;
exports.getDefaultFileAreaTag = getDefaultFileAreaTag;

29
core/file_entry.js
View File

@ -289,8 +289,37 @@ module.exports = class FileEntry {
}
}
// :TODO: Use static get accessor:
static getWellKnownMetaValues() { return Object.keys(FILE_WELL_KNOWN_META); }
static findFileBySha(sha, cb) {
// full or partial SHA-256
fileDb.all(
`SELECT file_id
FROM file
WHERE file_sha256 LIKE "${sha}%"
LIMIT 2;`, // limit 2 such that we can find if there are dupes
(err, fileIdRows) => {
if(err) {
return cb(err);
}
if(!fileIdRows || 0 === fileIdRows.length) {
return cb(Errors.DoesNotExist('No matches'));
}
if(fileIdRows.length > 1) {
return cb(Errors.Invalid('SHA is ambiguous'));
}
const fileEntry = new FileEntry();
return fileEntry.load(fileIdRows[0].file_id, err => {
return cb(err, fileEntry);
});
}
);
}
static findFiles(filter, cb) {
filter = filter || {};

4
core/fse.js
View File

@ -9,7 +9,7 @@ const theme = require('./theme.js');
const Message = require('./message.js');
const updateMessageAreaLastReadId = require('./message_area.js').updateMessageAreaLastReadId;
const getMessageAreaByTag = require('./message_area.js').getMessageAreaByTag;
const getUserIdAndName = require('./user.js').getUserIdAndName;
const User = require('./user.js');
const cleanControlCodes = require('./string_util.js').cleanControlCodes;
const StatLog = require('./stat_log.js');
const stringFormat = require('./string_format.js');
@ -373,7 +373,7 @@ exports.FullScreenEditorModule = exports.getModule = class FullScreenEditorModul
callback(null);
} else {
// we need to look it up
getUserIdAndName(self.message.toUserName, function userInfo(err, toUserId) {
User.getUserIdAndName(self.message.toUserName, function userInfo(err, toUserId) {
if(err) {
callback(err);
} else {

2
core/oputil/oputil_common.js
View File

@ -64,7 +64,7 @@ function initConfigAndDatabases(cb) {
function getAreaAndStorage(tags) {
return tags.map(tag => {
const parts = tag.split('@');
const parts = tag.toString().split('@');
const entry = {
areaTag : parts[0],
};

139
core/oputil/oputil_file_base.js
View File

@ -8,11 +8,13 @@ const argv = require('./oputil_common.js').argv;
const initConfigAndDatabases = require('./oputil_common.js').initConfigAndDatabases;
const getHelpFor = require('./oputil_help.js').getHelpFor;
const getAreaAndStorage = require('./oputil_common.js').getAreaAndStorage;
const Errors = require('../../core/enig_error.js').Errors;
const async = require('async');
const fs = require('fs');
const paths = require('path');
const _ = require('lodash');
const moment = require('moment');
exports.handleFileBaseCommand = handleFileBaseCommand;
@ -119,6 +121,140 @@ function scanFileAreaForChanges(areaInfo, options, cb) {
});
}
function dumpAreaInfo(areaInfo, areaAndStorageInfo, cb) {
console.info(`areaTag: ${areaInfo.areaTag}`);
console.info(`name: ${areaInfo.name}`);
console.info(`desc: ${areaInfo.desc}`);
areaInfo.storage.forEach(si => {
console.info(`storageTag: ${si.storageTag} => ${si.dir}`);
});
console.info('');
return cb(null);
}
function dumpFileInfo(shaOrFileId, cb) {
const FileEntry = require('../../core/file_entry.js');
async.waterfall(
[
function getBySha(callback) {
FileEntry.findFileBySha(shaOrFileId, (err, fileEntry) => {
return callback(null, fileEntry);
});
},
function getByFileId(fileEntry, callback) {
if(fileEntry) {
return callback(null, fileEntry); // already got it by sha
}
const fileId = parseInt(shaOrFileId);
if(isNaN(fileId)) {
return callback(Errors.DoesNotExist('Not found'));
}
fileEntry = new FileEntry();
fileEntry.load(shaOrFileId, err => {
return callback(err, fileEntry);
});
},
function dumpInfo(fileEntry, callback) {
const fullPath = paths.join(fileArea.getAreaStorageDirectoryByTag(fileEntry.storageTag), fileEntry.fileName);
console.info(`file_id: ${fileEntry.fileId}`);
console.info(`sha_256: ${fileEntry.fileSha256}`);
console.info(`area_tag: ${fileEntry.areaTag}`);
console.info(`path: ${fullPath}`);
console.info(`hashTags: ${Array.from(fileEntry.hashTags).join(', ')}`);
console.info(`uploaded: ${moment(fileEntry.uploadTimestamp).format()}`);
_.each(fileEntry.meta, (metaValue, metaName) => {
console.info(`${metaName}: ${metaValue}`);
});
if(argv['show-desc']) {
console.info(`${fileEntry.desc}`);
}
console.info('');
return callback(null);
}
],
err => {
return cb(err);
}
);
/*
FileEntry.findFileBySha(sha, (err, fileEntry) => {
if(err) {
return cb(err);
}
const fullPath = paths.join(fileArea.getAreaStorageDirectoryByTag(fileEntry.storageTag), fileEntry.fileName);
console.info(`file_id: ${fileEntry.fileId}`);
console.info(`sha_256: ${fileEntry.fileSha256}`);
console.info(`area_tag: ${fileEntry.areaTag}`);
console.info(`path: ${fullPath}`);
console.info(`hashTags: ${Array.from(fileEntry.hashTags).join(', ')}`);
console.info(`uploaded: ${moment(fileEntry.uploadTimestamp).format()}`);
_.each(fileEntry.meta, (metaValue, metaName) => {
console.info(`${metaName}: ${metaValue}`);
});
if(argv['show-desc']) {
console.info(`${fileEntry.desc}`);
}
});
*/
}
function displayFileAreaInfo() {
// AREA_TAG[@STORAGE_TAG]
// SHA256|PARTIAL
// if sha: dump file info
// if area/stoarge dump area(s) +
async.series(
[
function init(callback) {
return initConfigAndDatabases(callback);
},
function dumpInfo(callback) {
const Config = require('../../core/config.js').config;
let suppliedAreas = argv._.slice(2);
if(!suppliedAreas || 0 === suppliedAreas.length) {
suppliedAreas = _.map(Config.fileBase.areas, (areaInfo, areaTag) => areaTag);
}
const areaAndStorageInfo = getAreaAndStorage(suppliedAreas);
fileArea = require('../../core/file_base_area.js');
async.eachSeries(areaAndStorageInfo, (areaAndStorage, nextArea) => {
const areaInfo = fileArea.getFileAreaByTag(areaAndStorage.areaTag);
if(areaInfo) {
return dumpAreaInfo(areaInfo, areaAndStorageInfo, nextArea);
} else {
return dumpFileInfo(areaAndStorage.areaTag, nextArea);
}
},
err => {
return callback(err);
});
}
],
err => {
if(err) {
process.exitCode = ExitCodes.ERROR;
console.error(err.message);
}
}
);
}
function scanFileAreas() {
const options = {};
@ -170,6 +306,7 @@ function handleFileBaseCommand() {
const action = argv._[1];
switch(action) {
case 'info' : return displayFileAreaInfo();
case 'scan' : return scanFileAreas();
}
}

17
core/oputil/oputil_help.js
View File

@ -17,7 +17,6 @@ global args:
where <command> is one of:
user : user utilities
config : config file management
file-base
fb : file base management
`,
@ -39,14 +38,22 @@ valid args:
--new : generate a new/initial configuration
`,
FileBase :
`usage: oputil.js file-base <action> [<args>] [<action_specific>]
`usage: oputil.js fb <action> [<args>] <AREA_TAG|SHA|FILE_ID[@STORAGE_TAG] ...> [<args>]
where <action> is one of:
scan <args> AREA_TAG : (re)scan area specified by AREA_TAG for new files
multiple area tags can be specified in form of AREA_TAG1 AREA_TAG2 ...
scan AREA_TAG|SHA|FILE_ID : scan specified areas
AREA_TAG may be suffixed with @STORAGE_TAG; for example: retro@bbs
info AREA_TAG|FILE_ID|SHA : display information about areas and/or files
SHA may be a full or partial SHA-256
valid scan <args>:
--tags TAG1,TAG2,... : specify tag(s) to assign to discovered entries
--tags TAG1,TAG2,... : specify tag(s) to assign to discovered entries
valid info <args>:
--show-desc : display short description, if any
`
};

1
core/oputil/oputil_main.js
View File

@ -34,7 +34,6 @@ module.exports = function() {
handleConfigCommand();
break;
case 'file-base' :
case 'fb' :
handleFileBaseCommand();
break;

10
core/oputil/oputil_user.js
View File

@ -7,8 +7,8 @@ const ExitCodes = require('./oputil_common.js').ExitCodes;
const argv = require('./oputil_common.js').argv;
const initConfigAndDatabases = require('./oputil_common.js').initConfigAndDatabases;
const async = require('async');
const _ = require('lodash');
exports.handleUserCommand = handleUserCommand;
@ -55,13 +55,13 @@ function handleUserCommand() {
}
function getUser(userName, cb) {
const user = require('./core/user.js');
user.getUserIdAndName(argv.user, function userNameAndId(err, userId) {
const User = require('../../core/user.js');
User.getUserIdAndName(argv.user, function userNameAndId(err, userId) {
if(err) {
process.exitCode = ExitCodes.BAD_ARGS;
return cb(new Error('Failed to retrieve user'));
} else {
let u = new user.User();
let u = new User();
u.userId = userId;
return cb(null, u);
}
@ -97,7 +97,7 @@ function setAccountStatus(userName, active) {
initAndGetUser(argv.user, callback);
},
function activateUser(user, callback) {
const AccountStatus = require('./core/user.js').User.AccountStatus;
const AccountStatus = require('../../core/user.js').AccountStatus;
user.persistProperty('account_status', active ? AccountStatus.active : AccountStatus.inactive, callback);
}
],

2
core/predefined_mci.js
View File

@ -91,7 +91,7 @@ function getPredefinedMCIValue(client, code) {
UT : function themeId() { return userStatAsString(client, 'theme_id', ''); },
UC : function loginCount() { return userStatAsString(client, 'login_count', 0); },
ND : function connectedNode() { return client.node.toString(); },
IP : function clientIpAddress() { return client.address().address; },
IP : function clientIpAddress() { return client.remoteAddress; },
ST : function serverName() { return client.session.serverName; },
FN : function activeFileBaseFilterName() {
const activeFilter = FileBaseFilters.getActiveFilter(client);

8
core/servers/content/web.js
View File

@ -53,12 +53,12 @@ exports.getModule = class WebServerModule extends ServerModule {
constructor() {
super();
this.enableHttp = Config.contentServers.web.http.enabled || true;
this.enableHttp = Config.contentServers.web.http.enabled || false;
this.enableHttps = Config.contentServers.web.https.enabled || false;
this.routes = {};
if(Config.contentServers.web.staticRoot) {
if(this.isEnabled() && Config.contentServers.web.staticRoot) {
this.addRoute({
method : 'GET',
path : '/static/.*$',
@ -67,6 +67,10 @@ exports.getModule = class WebServerModule extends ServerModule {
}
}
isEnabled() {
return this.enableHttp || this.enableHttps;
}
createServer() {
if(this.enableHttp) {
this.httpServer = http.createServer( (req, resp) => this.routeRequest(req, resp) );

8
core/system_view_validate.js
View File

@ -2,7 +2,7 @@
'use strict';
// ENiGMA½
const user = require('./user.js');
const User = require('./user.js');
const Config = require('./config.js').config;
exports.validateNonEmpty = validateNonEmpty;
@ -38,7 +38,7 @@ function validateUserNameAvail(data, cb) {
} else if(/^[0-9]+$/.test(data)) {
return cb(new Error('Username cannot be a number'));
} else {
user.getUserIdAndName(data, function userIdAndName(err) {
User.getUserIdAndName(data, function userIdAndName(err) {
if(!err) { // err is null if we succeeded -- meaning this user exists already
return cb(new Error('Username unavailable'));
}
@ -56,7 +56,7 @@ function validateUserNameExists(data, cb) {
return cb(invalidUserNameError);
}
user.getUserIdAndName(data, (err) => {
User.getUserIdAndName(data, (err) => {
return cb(err ? invalidUserNameError : null);
});
}
@ -80,7 +80,7 @@ function validateEmailAvail(data, cb) {
return cb(new Error('Invalid email address'));
}
user.getUserIdsWithProperty('email_address', data, function userIdsWithEmail(err, uids) {
User.getUserIdsWithProperty('email_address', data, function userIdsWithEmail(err, uids) {
if(err) {
return cb(new Error('Internal system error'));
} else if(uids.length > 0) {

971
core/user.js
View File

File diff suppressed because it is too large Load Diff

5
docs/archive.md
View File

@ -22,6 +22,11 @@ The following archivers are pre-configured in ENiGMA½ as of this writing. Remem
* Key: `Arj`
* Homepage/package: `arj` on most *nix environments.
#### Rar
* Formats: .Rar
* Key: `Rar`
* Homepage/package: `unrar` on most *nix environments. See also https://blog.hostonnet.com/unrar
### Archiver Configuration
Archiver entries in `config.hjson` are mostly self explanatory with the exception of `list` commands that require some additional information. The `args` member for an entry is an array of arguments to pass to `cmd`. Some variables are available to `args` that will be expanded by the system:

4
mods/bbs_list.js
View File

@ -7,7 +7,7 @@ const getModDatabasePath = require('../core/database.js').getModDatabasePath;
const ViewController = require('../core/view_controller.js').ViewController;
const ansi = require('../core/ansi_term.js');
const theme = require('../core/theme.js');
const getUserName = require('../core/user.js').getUserName;
const User = require('../core/user.js');
const stringFormat = require('../core/string_format.js');
// deps
@ -284,7 +284,7 @@ exports.getModule = class BBSListModule extends MenuModule {
},
function getUserNames(entriesView, callback) {
async.each(self.entries, (entry, next) => {
getUserName(entry.submitterUserId, (err, username) => {
User.getUserName(entry.submitterUserId, (err, username) => {
if(username) {
entry.submitter = username;
} else {

7
mods/file_area_list.js
View File

@ -11,6 +11,7 @@ const stringFormat = require('../core/string_format.js');
const createCleanAnsi = require('../core/string_util.js').createCleanAnsi;
const FileArea = require('../core/file_base_area.js');
const Errors = require('../core/enig_error.js').Errors;
const ErrNotEnabled = require('../core/enig_error.js').ErrorReasons.NotEnabled;
const ArchiveUtil = require('../core/archive_util.js');
const Config = require('../core/config.js').config;
const DownloadQueue = require('../core/download_queue.js');
@ -256,8 +257,12 @@ exports.getModule = class FileAreaList extends MenuModule {
FileAreaWeb.getExistingTempDownloadServeItem(this.client, this.currentFileEntry, (err, serveItem) => {
if(err) {
entryInfo.webDlLink = config.webDlLinkNeedsGenerated || 'Not yet generated';
entryInfo.webDlExpire = '';
if(ErrNotEnabled === err.reasonCode) {
entryInfo.webDlExpire = config.webDlLinkNoWebserver || 'Web server is not enabled';
} else {
entryInfo.webDlLink = config.webDlLinkNeedsGenerated || 'Not yet generated';
}
} else {
const webDlExpireTimeFormat = config.webDlExpireTimeFormat || 'YYYY-MMM-DD @ h:mm';

13
mods/last_callers.js
View File

@ -5,9 +5,7 @@
const MenuModule = require('../core/menu_module.js').MenuModule;
const ViewController = require('../core/view_controller.js').ViewController;
const StatLog = require('../core/stat_log.js');
const getUserName = require('../core/user.js').getUserName;
const loadProperties = require('../core/user.js').loadProperties;
const isRootUserId = require('../core/user.js').isRootUserId;
const User = require('../core/user.js');
const stringFormat = require('../core/string_format.js');
// deps
@ -73,7 +71,7 @@ exports.getModule = class LastCallersModule extends MenuModule {
if(self.menuConfig.config.hideSysOpLogin) {
const noOpLoginHistory = loginHistory.filter(lh => {
return false === isRootUserId(parseInt(lh.log_value)); // log_value=userId
return false === User.isRootUserId(parseInt(lh.log_value)); // log_value=userId
});
//
@ -106,11 +104,10 @@ exports.getModule = class LastCallersModule extends MenuModule {
item.userId = parseInt(item.log_value);
item.ts = moment(item.timestamp).format(dateTimeFormat);
getUserName(item.userId, (err, userName) => {
item.userName = userName;
getPropOpts.userId = item.userId;
User.getUserName(item.userId, (err, userName) => {
item.userName = userName;
loadProperties(getPropOpts, (err, props) => {
User.loadProperties(item.userId, getPropOpts, (err, props) => {
if(!err) {
item.location = props.location;
item.affiliation = item.affils = props.affiliation;

7
mods/msg_area_reply_fse.js
View File

@ -2,13 +2,6 @@
'use strict';
var FullScreenEditorModule = require('../core/fse.js').FullScreenEditorModule;
var Message = require('../core/message.js');
var messageArea = require('../core/message_area.js');
var user = require('../core/user.js');
var _ = require('lodash');
var async = require('async');
var assert = require('assert');
exports.getModule = AreaReplyFSEModule;

8
mods/nua.js
View File

@ -3,7 +3,7 @@
// ENiGMA½
const MenuModule = require('../core/menu_module.js').MenuModule;
const user = require('../core/user.js');
const User = require('../core/user.js');
const theme = require('../core/theme.js');
const login = require('../core/system_menu_method.js').login;
const Config = require('../core/config.js').config;
@ -61,7 +61,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
// Submit handlers
//
submitApplication : function(formData, extraArgs, cb) {
const newUser = new user.User();
const newUser = new User();
newUser.username = formData.value.username;
@ -102,7 +102,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
}
// :TODO: User.create() should validate email uniqueness!
newUser.create( { password : formData.value.password }, err => {
newUser.create(formData.value.password, err => {
if(err) {
self.client.log.info( { error : err, username : formData.value.username }, 'New user creation failed');
@ -124,7 +124,7 @@ exports.getModule = class NewUserAppModule extends MenuModule {
};
}
if(user.User.AccountStatus.inactive === self.client.user.properties.account_status) {
if(User.AccountStatus.inactive === self.client.user.properties.account_status) {
return self.gotoMenu(extraArgs.inactive, cb);
} else {
//

4
mods/user_list.js
View File

@ -2,7 +2,7 @@
'use strict';
const MenuModule = require('../core/menu_module.js').MenuModule;
const getUserList = require('../core/user.js').getUserList;
const User = require('../core/user.js');
const ViewController = require('../core/view_controller.js').ViewController;
const stringFormat = require('../core/string_format.js');
@ -64,7 +64,7 @@ exports.getModule = class UserListModule extends MenuModule {
},
function fetchUserList(callback) {
// :TODO: Currently fetching all users - probably always OK, but this could be paged
getUserList(USER_LIST_OPTS, function got(err, ul) {
User.getUserList(USER_LIST_OPTS, function got(err, ul) {
userList = ul;
callback(err);
});