diff --git a/.gitignore b/.gitignore index d30e961bd..70b6d482e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ client/coral-framework/graphql/introspection.json .idea/ *.swp *.DS_STORE +.prettierrc.json coverage/ test/e2e/reports/ @@ -52,3 +53,4 @@ plugins/* !plugins/talk-plugin-slack-notifications **/node_modules/* +yarn-error.log diff --git a/.nodemon.json b/.nodemon.json index 7f7fd3d59..36fed8700 100644 --- a/.nodemon.json +++ b/.nodemon.json @@ -1,5 +1,11 @@ { + "exec": "npm-run-all --parallel generate-introspection start:development", "verbose": true, "ignore": ["test/*", "client/*", "dist/*", "plugins/*/client"], - "ext": "js,json,graphql" + "ext": "js,json,graphql", + "watch": [ + ".", + "bin/cli", + "bin/cli-serve" + ] } diff --git a/.nsprc b/.nsprc index 071431eff..583560bdd 100644 --- a/.nsprc +++ b/.nsprc @@ -1,5 +1,6 @@ { "exceptions": [ - "https://nodesecurity.io/advisories/531" + "https://nodesecurity.io/advisories/531", + "https://nodesecurity.io/advisories/532" ] -} \ No newline at end of file +} diff --git a/app.js b/app.js index 2989ae00a..c0962d3aa 100644 --- a/app.js +++ b/app.js @@ -1,19 +1,38 @@ const express = require('express'); -const bodyParser = require('body-parser'); const morgan = require('morgan'); const path = require('path'); +const uuid = require('uuid'); const merge = require('lodash/merge'); const helmet = require('helmet'); +const plugins = require('./services/plugins'); const compression = require('compression'); -const cookieParser = require('cookie-parser'); const {HELMET_CONFIGURATION} = require('./config'); const {MOUNT_PATH} = require('./url'); -const {applyLocals} = require('./services/locals'); const routes = require('./routes'); const debug = require('debug')('talk:app'); +const {ENABLE_TRACING, APOLLO_ENGINE_KEY, PORT} = require('./config'); const app = express(); +// Request Identity Middleware +app.use((req, res, next) => { + req.id = uuid.v4(); + + next(); +}); + +//============================================================================== +// PLUGIN PRE APPLICATION MIDDLEWARE +//============================================================================== + +// Inject server route plugins. +plugins.get('server', 'app').forEach(({plugin, app: callback}) => { + debug(`added plugin '${plugin.name}'`); + + // Pass the app to the plugin to mount it's routes. + callback(app); +}); + //============================================================================== // APPLICATION WIDE MIDDLEWARE //============================================================================== @@ -23,6 +42,22 @@ if (process.env.NODE_ENV !== 'test') { app.use(morgan('dev')); } +if (ENABLE_TRACING && APOLLO_ENGINE_KEY) { + const {Engine} = require('apollo-engine'); + + const engine = new Engine({ + engineConfig: { + apiKey: APOLLO_ENGINE_KEY + }, + graphqlPort: PORT, + endpoint: `${MOUNT_PATH}api/v1/graph/ql`, + }); + + engine.start(); + + app.use(engine.expressMiddleware()); +} + // Trust the first proxy in front of us, this will enable us to trust the fact // that SSL was terminated correctly. app.set('trust proxy', 1); @@ -36,12 +71,6 @@ app.use(helmet(merge(HELMET_CONFIGURATION, { // Compress the responses if appropriate. app.use(compression()); -// Parse the cookies on the request. -app.use(cookieParser()); - -// Parse the body json if it's there. -app.use(bodyParser.json()); - //============================================================================== // VIEW CONFIGURATION //============================================================================== @@ -53,9 +82,6 @@ app.set('view engine', 'ejs'); // ROUTES //============================================================================== -// Add the locals to the app renderer. -applyLocals(app.locals); - debug(`mounting routes on the ${MOUNT_PATH} path`); // Actually apply the routes. diff --git a/bin/cli b/bin/cli index f618b24be..e01c9cd64 100755 --- a/bin/cli +++ b/bin/cli @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const {head, map} = require('lodash'); const Matcher = require('did-you-mean'); diff --git a/bin/cli-assets b/bin/cli-assets index 4805bead0..456f16877 100755 --- a/bin/cli-assets +++ b/bin/cli-assets @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const parseDuration = require('ms'); const Table = require('cli-table'); const AssetModel = require('../models/asset'); diff --git a/bin/cli-jobs b/bin/cli-jobs index c5aefc518..345b22b56 100755 --- a/bin/cli-jobs +++ b/bin/cli-jobs @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const scraper = require('../services/scraper'); const mailer = require('../services/mailer'); const util = require('./util'); @@ -12,7 +12,7 @@ const mongoose = require('../services/mongoose'); const kue = require('../services/kue'); util.onshutdown([ - () => mongoose.disconnect() + () => mongoose.disconnect(), ]); /** @@ -20,17 +20,17 @@ util.onshutdown([ */ function processJobs() { - // Start the scraper processor. - scraper.process(); - - // Start the mail processor. - mailer.process(); - // The scraper only needs to shutdown when the scraper has actually been // started. util.onshutdown([ () => kue.Task.shutdown() ]); + + // Start the scraper processor. + scraper.process(); + + // Start the mail processor. + mailer.process(); } /** @@ -48,22 +48,13 @@ function removeJob(job) { })); } -/** - * Removes the jobs passed in and returns a promise. - * @param {Array} jobs array of jobs - * @return {Promise} - */ -function removeJobs(jobs) { - return Promise.all(jobs.map(removeJob)); -} - /** * Get the top n jobs with a specific state. * @param {String} [state='complete'] state to list jobs by * @param {Number} limit limit of jobs to load * @return {Promise} */ -function rangeJobsByState(state = 'complete', limit) { +function rangeJobsByState(state, limit) { return new Promise((resolve, reject) => { kue.Job.rangeByState(state, 0, limit, 'asc', (err, jobs) => { if (err) { @@ -75,22 +66,52 @@ function rangeJobsByState(state = 'complete', limit) { }); } +async function getJobBatch(n, includeStuck) { + let jobs = []; + + jobs = await rangeJobsByState('complete', n); + + if (includeStuck) { + jobs = jobs.concat(await rangeJobsByState('failed', n)); + } + + return jobs; +} + /** * Cleans up the jobs that are in the queue. */ async function cleanupJobs(options) { + + // The scraper only needs to shutdown when the scraper has actually been + // started. + util.onshutdown([ + () => kue.Task.shutdown() + ]); + const n = 100; try { - const joblists = await Promise.all([ - rangeJobsByState('complete', n), - options.stuck ? rangeJobsByState('failed', n) : false - ]); - await joblists.filter((jobs) => jobs).map(removeJobs); + // Connect to redis by establishing a queue. + kue.Task.connect(); + + let jobCount = 0; + let jobs = await getJobBatch(n, options.stuck); + + while (jobs.length > 0) { + + // Remove all the jobs. + await Promise.all(jobs.map((job) => removeJob(job))); + + jobCount += jobs.length; + + // Get the next batch of jobs. + jobs = await getJobBatch(n, options.stuck); + } util.shutdown(); - console.log('Removed old jobs'); + console.log(`Removed ${jobCount} jobs`); } catch (err) { console.error(err); util.shutdown(1); diff --git a/bin/cli-migration b/bin/cli-migration index 036ac8b02..f730b8fbb 100755 --- a/bin/cli-migration +++ b/bin/cli-migration @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const util = require('./util'); const inquirer = require('inquirer'); const mongoose = require('../services/mongoose'); diff --git a/bin/cli-plugins b/bin/cli-plugins index b7e301fce..8217b023f 100755 --- a/bin/cli-plugins +++ b/bin/cli-plugins @@ -7,7 +7,7 @@ // Interface heavily inspired by the yarn package manager: // https://yarnpkg.com/ -const program = require('./commander'); +const program = require('commander'); const inquirer = require('inquirer'); // Make things colorful! diff --git a/bin/cli-serve b/bin/cli-serve index 4324cac92..cc00f84ed 100755 --- a/bin/cli-serve +++ b/bin/cli-serve @@ -1,6 +1,7 @@ #!/usr/bin/env node -const program = require('./commander'); +const program = require('commander'); +const util = require('./util'); const serve = require('../serve'); //============================================================================== @@ -13,5 +14,8 @@ program .parse(process.argv); // Start serving. -serve({jobs: program.jobs, websockets: program.websockets}); +serve({jobs: program.jobs, websockets: program.websockets}).catch((err) => { + console.error(err); + util.shutdown(1); +}); diff --git a/bin/cli-settings b/bin/cli-settings index f8768046c..481e5b2bf 100755 --- a/bin/cli-settings +++ b/bin/cli-settings @@ -1,6 +1,6 @@ #!/usr/bin/env node -const program = require('./commander'); +const program = require('commander'); const inquirer = require('inquirer'); const mongoose = require('../services/mongoose'); const SettingsService = require('../services/settings'); diff --git a/bin/cli-setup b/bin/cli-setup index c7a44c453..35521e05a 100755 --- a/bin/cli-setup +++ b/bin/cli-setup @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const inquirer = require('inquirer'); const mongoose = require('../services/mongoose'); const SettingModel = require('../models/setting'); diff --git a/bin/cli-token b/bin/cli-token index fa5d2e350..87d955df9 100755 --- a/bin/cli-token +++ b/bin/cli-token @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const mongoose = require('../services/mongoose'); const TokensService = require('../services/tokens'); const util = require('./util'); diff --git a/bin/cli-users b/bin/cli-users index 89f53a67d..c15572fe4 100755 --- a/bin/cli-users +++ b/bin/cli-users @@ -4,14 +4,17 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const inquirer = require('inquirer'); const UsersService = require('../services/users'); const UserModel = require('../models/user'); +const CommentModel = require('../models/comment'); +const ActionModel = require('../models/action'); const USER_ROLES = require('../models/enum/user_roles'); const mongoose = require('../services/mongoose'); const util = require('./util'); const Table = require('cli-table'); +const databaseVerifications = require('./verifications/database'); const validateRequired = (msg = 'Field is required', len = 1) => (input) => { if (input && input.length >= len) { @@ -34,11 +37,11 @@ function getUserCreateAnswers(options) { password: options.password, confirmPassword: options.password, username: options.name, - roles: [] + role: 'COMMENTER' }; if (options.role && USER_ROLES.indexOf(options.role) > -1) { - user.roles = [options.role]; + user.roles = options.role; } return Promise.resolve(user); @@ -87,9 +90,9 @@ function getUserCreateAnswers(options) { } }, { - name: 'roles', + name: 'role', message: 'User Role', - type: 'checkbox', + type: 'list', choices: USER_ROLES } ]); @@ -106,42 +109,55 @@ async function createUser(options) { } const user = await UsersService.createLocalUser(answers.email.trim(), answers.password.trim(), answers.username.trim()); - console.log(`Created user ${user.id}.`); - - if (answers.roles.length > 0) { - return Promise.all(answers.roles.map((role) => { - return UsersService - .addRoleToUser(user.id, role) - .then(() => { - console.log(`Added the role ${role} to User ${user.id}.`); - }); - })); - } + await UsersService.setRole(user.id, answers.role); + await UsersService.sendEmailConfirmation(user, answers.email.trim()); + console.log(`Created User ${user.id}.`); util.shutdown(); - } catch (err) { console.error(err); - util.shutdown(); + util.shutdown(1); } } /** * Deletes a user. */ -function deleteUser(userID) { - UserModel - .findOneAndRemove({ - id: userID - }) - .then(() => { - console.log('Deleted user'); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(); - }); +async function deleteUser(userID) { + + try { + + // Find the user we're removing. + const user = await UserModel.findOne({id: userID}); + if (!user) { + throw new Error(`user with id ${userID} not found`); + } + + // Remove all the user's actions. + await ActionModel + .where({user_id: user.id}) + .setOptions({multi: true}) + .remove(); + + // Remove all the user's comments. + await CommentModel + .where({author_id: user.id}) + .setOptions({multi: true}) + .remove(); + + // Update the counts that might have changed. + for (const verification of databaseVerifications) { + await verification({fix: true, limit: Infinity, batch: 1000}); + } + + // Remove the user. + await user.remove(); + + util.shutdown(); + } catch (err) { + console.error(err); + util.shutdown(1); + } } /** @@ -241,19 +257,19 @@ function listUsers() { }); users.forEach((user) => { - let state = user.disabled ? 'Disabled' : 'Enabled'; const profile = user.profiles.find(({provider}) => provider === 'local'); + let state; if (profile && profile.metadata && profile.metadata.confirmed_at) { - state += ', Verified'; + state = 'Verified'; } else { - state += ', Unverified'; + state = 'Unverified'; } table.push([ user.id, user.username, user.profiles.map((p) => p.provider).join(', '), - user.roles.join(', '), + user.role, user.status, state ]); @@ -291,117 +307,30 @@ function mergeUsers(dstUserID, srcUserID) { * @param {String} userUD id of the user to add the role to * @param {String} role the role to add */ -function addRole(userID, role) { +async function setRole(userID, role, options) { + try { + if (options.interactive || !role) { + const answers = await inquirer.prompt([ + { + name: 'role', + message: 'User Role', + type: 'list', + choices: USER_ROLES + } + ]); - if (USER_ROLES.indexOf(role) === -1) { - console.error(`Role '${role}' is not supported. Supported roles are ${USER_ROLES.join(', ')}.`); + role = answers.role; + } + + await UsersService.setRole(userID, role); + + console.log(`Set User ${userID} to the ${role} role.`); + util.shutdown(); + } catch (err) { + console.error(err); util.shutdown(1); - return; } - UsersService - .addRoleToUser(userID, role) - .then(() => { - console.log(`Added the ${role} role to User ${userID}.`); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(1); - }); -} - -/** - * Removes a role from a user - * @param {String} userUD id of the user to remove the role from - * @param {String} role the role to remove - */ -function removeRole(userID, role) { - - if (USER_ROLES.indexOf(role) === -1) { - console.error(`Role '${role}' is not supported. Supported roles are ${USER_ROLES.join(', ')}.`); - util.shutdown(1); - return; - } - - UsersService - .removeRoleFromUser(userID, role) - .then(() => { - console.log(`Removed the ${role} role from User ${userID}.`); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(1); - }); -} - -/** - * Ban a user - * @param {String} userID id of the user to ban - */ -function ban(userID) { - UsersService - .setStatus(userID, 'BANNED') - .then(() => { - console.log(`Banned the User ${userID}.`); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(1); - }); -} - -/** - * Unban a user - * @param {String} userUD id of the user to remove the role from - */ -function unban(userID) { - UsersService - .setStatus(userID, 'ACTIVE') - .then(() => { - console.log(`Unban the User ${userID}.`); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(1); - }); -} - -/** - * Disable a given user. - * @param {String} userID the ID of a user to disable - */ -function disableUser(userID) { - UsersService - .disableUser(userID) - .then(() => { - console.log(`User ${userID} was disabled.`); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(1); - }); -} - -/** - * Enabled a given user. - * @param {String} userID the ID of a user to enable - */ -function enableUser(userID) { - UsersService - .enableUser(userID) - .then(() => { - console.log(`User ${userID} was enabled.`); - util.shutdown(); - }) - .catch((err) => { - console.error(err); - util.shutdown(1); - }); } /** @@ -463,34 +392,10 @@ program .action(mergeUsers); program - .command('addrole ') - .description('adds a role to a given user') - .action(addRole); - -program - .command('removerole ') - .description('removes a role from a given user') - .action(removeRole); - -program - .command('ban ') - .description('ban a given user') - .action(ban); - -program - .command('uban ') - .description('unban a given user') - .action(unban); - -program - .command('disable ') - .description('disable a given user from logging in') - .action(disableUser); - -program - .command('enable ') - .description('enable a given user from logging in') - .action(enableUser); + .command('setrole [role]') + .option('-i, --interactive', 'Enable interactive mode') + .description('sets the role on a user') + .action(setRole); program .command('verify ') diff --git a/bin/cli-verify b/bin/cli-verify index 6e67e0016..9a4c30ab1 100755 --- a/bin/cli-verify +++ b/bin/cli-verify @@ -4,7 +4,7 @@ * Module dependencies. */ -const program = require('./commander'); +const program = require('commander'); const mongoose = require('../services/mongoose'); const util = require('./util'); const databaseVerifications = require('./verifications/database'); diff --git a/bin/commander.js b/bin/commander.js deleted file mode 100644 index 328a25b29..000000000 --- a/bin/commander.js +++ /dev/null @@ -1,51 +0,0 @@ -const pkg = require('../package.json'); -const dotenv = require('dotenv'); -const fs = require('fs'); -const program = require('commander'); - -//============================================================================== -// Setting up the program command line arguments. -//============================================================================== - -const parseArgs = require('minimist')(process.argv.slice(2), { - alias: { - 'c': 'config' - }, - string: [ - 'config', - 'pid' - ], - default: { - 'config': null, - 'pid': null - } -}); - -/** - * If the config flag is present, then we have to load the configuration from - * the file specified. We will then load those values into the environment. - */ -if (parseArgs.config) { - let envConfig = dotenv.parse(fs.readFileSync(parseArgs.config, {encoding: 'utf8'})); - - Object.keys(envConfig).forEach((k) => { - process.env[k] = envConfig[k]; - }); -} - -/** - * If the pid flag is present, then we have to create a pid file at the location - * specified. - */ -if (parseArgs.pid) { - const util = require('./util'); - - console.log('Wrote PID'); - - util.pid(parseArgs.pid); -} - -module.exports = program - .version(pkg.version) - .option('-c, --config [path]', 'Specify the configuration file to load') - .option('--pid [path]', 'Specify a path to output the current PID to'); diff --git a/bin/util.js b/bin/util.js index ab9035fe5..572d07a2e 100644 --- a/bin/util.js +++ b/bin/util.js @@ -1,5 +1,4 @@ const debug = require('debug')('talk:util'); -const fs = require('fs'); const util = module.exports = {}; @@ -49,43 +48,6 @@ util.onshutdown = (jobs) => { util.toshutdown = util.toshutdown.concat(jobs); }; -/** - * Register a PID file to be maintained for the lifespan of the process. - * @param {String} path path to the PID file to create - */ -util.pid = (path) => { - if (!/\//.test(path)) { - if (!/\.pid/.test(path)) { - path += '.pid'; - } - path = `/tmp/${path}`; - } - - const pid = `${process.pid.toString()}\n`; - - fs.writeFile(path, pid, (err) => { - if (err) { - console.error(`Can't write PID file: ${err}`); - throw err; - } - - // Add the cleanup for the fs onto the shutdown. - util.onshutdown([ - () => new Promise((resolve, reject) => { - - // Remove the pid file. - fs.unlink(path, (err) => { - if (err) { - return reject(err); - } - - return resolve(); - }); - }) - ]); - }); -}; - // Attach to the SIGTERM + SIGINT handles to ensure a clean shutdown in the // event that we have an external event. SIGUSR2 is called when the app is asked // to be 'killed', same procedure here. diff --git a/bin/verifications/database/action_counts.js b/bin/verifications/database/action_counts.js new file mode 100644 index 000000000..fff3a0569 --- /dev/null +++ b/bin/verifications/database/action_counts.js @@ -0,0 +1,185 @@ +const UserModel = require('../../../models/user'); +const CommentModel = require('../../../models/comment'); +const ActionsService = require('../../../services/actions'); +const {arrayJoinBy} = require('../../../graph/loaders/util'); +const sc = require('snake-case'); +const debug = require('debug')('talk:cli:verify'); + +const MODELS = [ + UserModel, + CommentModel, +]; + +async function processBatch(Model, documents) { + + // Get an array of all the document id's. + const documentIDs = documents.map(({id}) => id); + + // Store all the operations on this batch in this array that we'll return + // later. + const operations = []; + + // Get the action summaries for this batch. + const totalActionSummaries = await ActionsService + .getActionSummaries(documentIDs) + .then(arrayJoinBy(documentIDs, 'item_id')); + + // Iterate over the documents. + for (let i = 0; i < documents.length; i++) { + const document = documents[i]; + const actionSummaries = totalActionSummaries[i]; + + let ops = []; + + for (const actionSummary of actionSummaries) { + if (actionSummary.group_id === null) { + continue; + } + + // And we generate the group id. + const ACTION_TYPE = sc(actionSummary.action_type.toLowerCase()); + const GROUP_ID = sc(actionSummary.group_id.toLowerCase()); + + if (GROUP_ID.length <= 0) { + continue; + } + + // And we add a new batch operation if the action summary is associated + // with a group. + const ACTION_COUNT_FIELD = `${ACTION_TYPE}_${GROUP_ID}`; + + // Check that the action summaries match the cached counts. + if ( + !document.action_counts || + !(ACTION_COUNT_FIELD in document.action_counts) || + document.action_counts[ACTION_COUNT_FIELD] !== actionSummary.count + ) { + + // Batch updates for those changes. + ops.push({ + [`action_counts.${ACTION_COUNT_FIELD}`]: actionSummary.count, + }); + } + } + + // Group all the action summaries together from all the different group + // ids. + let groupedActionSummaries = actionSummaries.reduce((acc, actionSummary) => { + const ACTION_TYPE = sc(actionSummary.action_type.toLowerCase()); + + if (!(ACTION_TYPE in acc)) { + acc[ACTION_TYPE] = 0; + } + + acc[ACTION_TYPE] += actionSummary.count; + + return acc; + }, {}); + + for (const ACTION_COUNT_FIELD of Object.keys(groupedActionSummaries)) { + const count = groupedActionSummaries[ACTION_COUNT_FIELD]; + + // Check that the action summaries match the cached counts. + if ( + !document.action_counts || + !(ACTION_COUNT_FIELD in document.action_counts) || + document.action_counts[ACTION_COUNT_FIELD] !== count + ) { + + // Batch updates for those changes. + ops.push({ + [`action_counts.${ACTION_COUNT_FIELD}`]: count, + }); + } + } + + // If this comment has action summaries that should be updated, then + // perform an update! + if (ops.length > 0) { + operations.push({ + updateOne: { + filter: { + id: document.id + }, + update: { + $set: Object.assign({}, ...ops), + }, + }, + }); + } + } + + return operations; +} + +module.exports = async ({fix, batch}) => { + for (const Model of MODELS) { + const cursor = Model + .collection + .find({}) + .project({ + id: 1, + action_counts: 1 + }) + .sort({created_at: 1}); + + let operations = []; + let documents = []; + + // While there are documents to process. + while (await cursor.hasNext()) { + + // Load the document. + const document = await cursor.next(); + + // Push the document into the documents array. + documents.push(document); + + // Check to see if the length of the documents array requires us to + // process it. + if (documents.length > batch) { + + // Process this batch. + let batchOperations = await processBatch(Model, documents); + + // Push the batch operations into the model operations. + operations.push(...batchOperations); + + // Clear this batch contents. + documents = []; + } + } + + // Check to see if there are any documents left over. + if (documents.length > 0) { + + // Process this batch. + let batchOperations = await processBatch(Model, documents); + + // Push the batch operations into the model operations. + operations.push(...batchOperations); + } + + const OPERATIONS_LENGTH = operations.length; + + console.log(`action_counts.js: ${OPERATIONS_LENGTH} ${Model.collection.name} need their action counts fixed.`); + + // If fix was enabled, execute the batch writes. + if (OPERATIONS_LENGTH > 0) { + if (fix) { + debug(`action_counts.js: fixing ${OPERATIONS_LENGTH} ${Model.collection.name}...`); + + while (operations.length) { + let result = await Model.collection.bulkWrite(operations.splice(0, batch)); + + debug(`action_counts.js: fixed batch of ${result.modifiedCount} ${Model.collection.name}.`); + } + + console.log(`action_counts.js: applied all ${OPERATIONS_LENGTH} fixes to ${Model.collection.name}.`); + } else { + console.warn('Skipping fixing, --fix was not enabled, pass --fix to fix these errors'); + } + } + } +}; + diff --git a/bin/verifications/database/comments.js b/bin/verifications/database/comment_replies.js similarity index 61% rename from bin/verifications/database/comments.js rename to bin/verifications/database/comment_replies.js index 231badabb..03a3a4ac6 100644 --- a/bin/verifications/database/comments.js +++ b/bin/verifications/database/comment_replies.js @@ -1,7 +1,5 @@ const CommentModel = require('../../../models/comment'); -const ActionsService = require('../../../services/actions'); -const {arrayJoinBy, singleJoinBy} = require('../../../graph/loaders/util'); -const sc = require('snake-case'); +const {singleJoinBy} = require('../../../graph/loaders/util'); const debug = require('debug')('talk:cli:verify'); const getBatch = async (limit, offset) => CommentModel @@ -55,15 +53,9 @@ module.exports = async ({fix, limit, batch}) => { .then(singleJoinBy(commentIDs, '_id')) .then((results) => results.map((result) => result ? result.count : 0)); - // Get their action summaries. - let allActionSummaries = await ActionsService - .getActionSummaries(commentIDs) - .then(arrayJoinBy(commentIDs, 'item_id')); - // Loop over the comments, with their action summaries. for (let i = 0; i < comments.length; i++) { let comment = comments[i]; - let actionSummaries = allActionSummaries[i]; let replyCount = allReplyCounts[i]; // And check to see if the action summaries we just computed match what is @@ -77,61 +69,6 @@ module.exports = async ({fix, limit, batch}) => { }); } - // First we process all the group id's. - for (let actionSummary of actionSummaries) { - if (actionSummary.group_id === null) { - continue; - } - - // And we generate the group id. - const ACTION_TYPE = sc(actionSummary.action_type.toLowerCase()); - const GROUP_ID = sc(actionSummary.group_id.toLowerCase()); - - if (GROUP_ID.length <= 0) { - continue; - } - - // And we add a new batch operation if the action summary is associated - // with a group. - const ACTION_COUNT_FIELD = `${ACTION_TYPE}_${GROUP_ID}`; - - // Check that the action summaries match the cached counts. - if (!comment.action_counts || !(ACTION_COUNT_FIELD in comment.action_counts) || comment.action_counts[ACTION_COUNT_FIELD] !== actionSummary.count) { - - // Batch updates for those changes. - commentOperations.push({ - [`action_counts.${ACTION_COUNT_FIELD}`]: actionSummary.count, - }); - } - } - - // Group all the action summaries together from all the different group - // ids. - let groupedActionSummaries = actionSummaries.reduce((acc, actionSummary) => { - const ACTION_TYPE = sc(actionSummary.action_type.toLowerCase()); - - if (!(ACTION_TYPE in acc)) { - acc[ACTION_TYPE] = 0; - } - - acc[ACTION_TYPE] += actionSummary.count; - - return acc; - }, {}); - - for (const ACTION_COUNT_FIELD of Object.keys(groupedActionSummaries)) { - const count = groupedActionSummaries[ACTION_COUNT_FIELD]; - - // Check that the action summaries match the cached counts. - if (!comment.action_counts || !(ACTION_COUNT_FIELD in comment.action_counts) || comment.action_counts[ACTION_COUNT_FIELD] !== count) { - - // Batch updates for those changes. - commentOperations.push({ - [`action_counts.${ACTION_COUNT_FIELD}`]: count, - }); - } - } - // If this comment has action summaries that should be updated, then // perform an update! if (commentOperations.length > 0) { diff --git a/bin/verifications/database/index.js b/bin/verifications/database/index.js index 3dafeb3bf..2a599cfac 100644 --- a/bin/verifications/database/index.js +++ b/bin/verifications/database/index.js @@ -6,7 +6,8 @@ // // async ({fix = false, batch = 1000}) => {} // -// where their options are derrived. +// where their options are derived. module.exports = [ - require('./comments'), + require('./comment_replies'), + require('./action_counts'), ]; diff --git a/circle.yml b/circle.yml index 9f35736c6..ebb746669 100644 --- a/circle.yml +++ b/circle.yml @@ -7,6 +7,8 @@ machine: environment: PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" NODE_ENV: "test" + MOCHA_FILE: "${CIRCLE_TEST_REPORTS}/junit/test-results.xml" + MOCHA_REPORTER: "mocha-junit-reporter" pre: # TODO: use the following to add in support for MongoDB 3.4. # # Upgrade the database version to 3.4. @@ -47,10 +49,11 @@ database: test: override: # Run the tests using the junit reporter. - - MOCHA_FILE=$CIRCLE_TEST_REPORTS/junit/test-results.xml MOCHA_REPORTER=mocha-junit-reporter yarn test + - yarn test + # Run the end to end tests + - yarn e2e:ci # Check dependancies using nsp. - nsp check - - yarn e2e-ci deployment: release: diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js index d8e1b5377..362143d38 100644 --- a/client/coral-admin/src/AppRouter.js +++ b/client/coral-admin/src/AppRouter.js @@ -3,7 +3,6 @@ import PropTypes from 'prop-types'; import {Router, Route, IndexRedirect, IndexRoute} from 'react-router'; import Configure from 'routes/Configure'; -import Dashboard from 'routes/Dashboard'; import Install from 'routes/Install'; import Stories from 'routes/Stories'; import Community from 'routes/Community/containers/Community'; @@ -18,7 +17,6 @@ const routes = ( - {/* Community Routes */} diff --git a/client/coral-admin/src/actions/banUserDialog.js b/client/coral-admin/src/actions/banUserDialog.js index 8b068051c..8134318cb 100644 --- a/client/coral-admin/src/actions/banUserDialog.js +++ b/client/coral-admin/src/actions/banUserDialog.js @@ -4,4 +4,3 @@ export const showBanUserDialog = ({userId, username, commentId, commentStatus}) ({type: SHOW_BAN_USER_DIALOG, userId, username, commentId, commentStatus}); export const hideBanUserDialog = () => ({type: HIDE_BAN_USER_DIALOG}); - diff --git a/client/coral-admin/src/actions/community.js b/client/coral-admin/src/actions/community.js index 6a091d214..669ff2f95 100644 --- a/client/coral-admin/src/actions/community.js +++ b/client/coral-admin/src/actions/community.js @@ -7,8 +7,6 @@ import { SORT_UPDATE, SET_PAGE, SET_SEARCH_VALUE, - SET_ROLE, - SET_COMMENTER_STATUS, SHOW_BANUSER_DIALOG, HIDE_BANUSER_DIALOG, SHOW_REJECT_USERNAME_DIALOG, @@ -56,20 +54,6 @@ export const setSearchValue = (value) => ({ value, }); -export const setRole = (id, role) => (dispatch, _, {rest}) => { - return rest(`/users/${id}/role`, {method: 'POST', body: {role}}) - .then(() => { - return dispatch({type: SET_ROLE, id, role}); - }); -}; - -export const setCommenterStatus = (id, status) => (dispatch, _, {rest}) => { - return rest(`/users/${id}/status`, {method: 'POST', body: {status}}) - .then(() => { - return dispatch({type: SET_COMMENTER_STATUS, id, status}); - }); -}; - // Ban User Dialog export const showBanUserDialog = (user) => ({type: SHOW_BANUSER_DIALOG, user}); export const hideBanUserDialog = () => ({type: HIDE_BANUSER_DIALOG}); diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js index a3ff2ca3e..18e31091f 100644 --- a/client/coral-admin/src/actions/moderation.js +++ b/client/coral-admin/src/actions/moderation.js @@ -34,3 +34,8 @@ export const storySearchChange = (value) => ({ export const clearState = () => ({ type: actions.MODERATION_CLEAR_STATE }); + +export const selectCommentId = (id) => ({ + type: actions.MODERATION_SELECT_COMMENT, + id, +}); diff --git a/client/coral-admin/src/components/AccountHistory.css b/client/coral-admin/src/components/AccountHistory.css new file mode 100644 index 000000000..09b324f08 --- /dev/null +++ b/client/coral-admin/src/components/AccountHistory.css @@ -0,0 +1,30 @@ +.table { + flex-direction: column; +} + +.table, .headerRow, .row { + display: flex; +} + +.headerRowItem, .item { + flex: 1; + padding: 20px; + + &:nth-child(2) { + flex: 2; + } +} + +.headerRowItem { + color: #595959; + font-weight: bold; +} + +.headerRow, .row { + border-bottom: 1px solid #e0e0e0; +} + +.action { + color: black; + font-weight: bold; +} diff --git a/client/coral-admin/src/components/AccountHistory.js b/client/coral-admin/src/components/AccountHistory.js new file mode 100644 index 000000000..1c5c2f974 --- /dev/null +++ b/client/coral-admin/src/components/AccountHistory.js @@ -0,0 +1,63 @@ +import React from 'react'; +import PropTypes from 'prop-types'; +import styles from './AccountHistory.css'; +import cn from 'classnames'; +import flatten from 'lodash/flatten'; +import orderBy from 'lodash/orderBy'; +import moment from 'moment'; + +const buildUserHistory = (userState = {}) => { + return orderBy(flatten(Object.keys(userState.status) + .filter((k) => k !== '__typename') + .map((k) => userState.status[k].history)), 'created_at', 'desc'); +}; + +const buildActionResponse = (typename, status) => { + const actionResponses = { + 'UsernameStatusHistory' : `Username Status: ${status}`, + 'BannedStatusHistory': status ? 'User banned' : 'Ban removed', + 'SuspensionStatusHistory': status ? 'Account Suspended' : 'Suspension removed' + }; + + return actionResponses[typename]; +}; + +class AccountHistory extends React.Component { + render() { + const {userState} = this.props; + const userHistory = buildUserHistory(userState); + return ( +
+
+
+
Date
+
Action
+
Moderation
+
+ { + userHistory.map((h, i) => ( +
+
+ {moment(new Date(h.created_at)).format('MMM DD, YYYY')} +
+
+ {buildActionResponse(h.__typename, h.status)} +
+
+ {h.assigned_by ? h.assigned_by.username : 'SYSTEM'} +
+
+ )) + } +
+
+ ); + } +} + +AccountHistory.propTypes = { + history: PropTypes.array, + userState: PropTypes.object, +}; + +export default AccountHistory; diff --git a/client/coral-admin/src/components/ActionsMenu.css b/client/coral-admin/src/components/ActionsMenu.css index 1d2f91f74..c8638423f 100644 --- a/client/coral-admin/src/components/ActionsMenu.css +++ b/client/coral-admin/src/components/ActionsMenu.css @@ -8,9 +8,6 @@ color: black; > :global(.mdl-menu__container) { margin-left: 10px; - > :global(.mdl-menu__outline) { - box-shadow: none; - } } } @@ -18,12 +15,13 @@ box-shadow: none; color: white; background-color: #616161; + border-color: #616161; } .arrowIcon { margin-left: 6px; margin-right: 0; - vertical-align: middle; + vertical-align: middle; margin-right: 0; font-size: 14px; } @@ -33,8 +31,10 @@ } .menuItem { - background-color: #2a2a2a; - color: white; + color: #2a2a2a; + background-color: white; + font-size: 0.95em; + &:first-child { margin-bottom: 1px; border-radius: 2px 2px 0px 0px; @@ -43,7 +43,8 @@ border-radius: 0px 0px 2px 2px; } &:hover, &:active, &:focus { - background-color: #767676; + background-color: #e2e2e2; + border-color: #616161; } &[disabled], &[disabled]:hover, &[disabled]:focus, &[disabled]:active { background-color: #262626; diff --git a/client/coral-admin/src/components/ActionsMenu.js b/client/coral-admin/src/components/ActionsMenu.js index 25aee1fbc..ef4e46573 100644 --- a/client/coral-admin/src/components/ActionsMenu.js +++ b/client/coral-admin/src/components/ActionsMenu.js @@ -32,17 +32,18 @@ class ActionsMenu extends React.Component { }; render() { + const {className = '', buttonClassNames = '', label = ''} = this.props; return ( -
+
- -
-
- -); +const initialState = {step: 0, message: ''}; + +class BanUserDialog extends React.Component { + + state = initialState; + + componentWillReceiveProps(next) { + if (this.props.open && !next.open) { + this.setState(initialState); + } + } + + handleMessageChange = (e) => { + const {value: message} = e; + this.setState({message}); + } + + goToStep1 = () => { + this.setState({ + step: 1, + message: t( + 'bandialog.email_message_ban', + this.props.username, + ), + }); + } + + renderStep0() { + const { + onCancel, + username, + info, + } = this.props; + + return ( +
+

+ {t('bandialog.ban_user')} +

+

+ {t('bandialog.are_you_sure', username)} +

+

+ {info} +

+
+ + +
+
+ ); + } + + renderStep1() { + const { + onCancel, + onPerform, + } = this.props; + const {message} = this.state; + + return ( +
+

+ {t('bandialog.notify_ban_headline')} +

+

+ {t('bandialog.notify_ban_description')} +

+
+ {t('bandialog.write_a_message')} +