From ee5316e6efcb99ba8c001845879d826e30524866 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 27 Mar 2018 18:28:14 -0600
Subject: [PATCH 01/44] initial download support

---
 graph/resolvers/comment.js |   7 +++
 graph/typeDefs.graphql     |   3 +
 package.json               |   2 +
 routes/api/v1/account.js   | 113 +++++++++++++++++++++++++++++++++++++
 yarn.lock                  |  84 +++++++++++++++++++++++++--
 5 files changed, 204 insertions(+), 5 deletions(-)

diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 7005701ec..2e4d9a08d 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -1,3 +1,4 @@
+const { URL } = require('url');
 const { property } = require('lodash');
 const { SEARCH_ACTIONS } = require('../../perms/constants');
 const { decorateWithTags, decorateWithPermissionCheck } = require('./util');
@@ -55,6 +56,12 @@ const Comment = {
       editableUntil: editableUntil,
     };
   },
+  async url(comment, args, { loaders: { Assets } }) {
+    const asset = await Assets.getByID.load(comment.asset_id);
+    const assetURL = new URL(asset.url);
+    assetURL.searchParams.set('commentId', comment.id);
+    return assetURL.href;
+  },
 };
 
 // Decorate the Comment type resolver with a tags field.
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 2414faf1f..588ad08dc 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -547,6 +547,9 @@ type Comment {
 
   # Indicates if it has a parent
   hasParent: Boolean
+
+  # url is the permalink to this particular Comment on the Asset.
+  url: String
 }
 
 # CommentConnection represents a paginable subset of a comment list.
diff --git a/package.json b/package.json
index 0253c7b0b..4436ec921 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "apollo-server-express": "^1.2.0",
     "apollo-utilities": "^1.0.3",
     "app-module-path": "^2.2.0",
+    "archiver": "^2.1.1",
     "autoprefixer": "^6.5.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.0",
@@ -92,6 +93,7 @@
     "copy-webpack-plugin": "^4.0.0",
     "cross-spawn": "^5.1.0",
     "css-loader": "^0.28.5",
+    "csv-stringify": "^2.0.4",
     "dataloader": "^1.3.0",
     "debug": "3.1.0",
     "dialog-polyfill": "^0.4.9",
diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index 561134885..84b5e4d0a 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -127,4 +127,117 @@ router.put(
   }
 );
 
+const archiver = require('archiver');
+const stringify = require('csv-stringify');
+const moment = require('moment');
+const { pick, get, kebabCase } = require('lodash');
+
+// loadCommentsBatch will load a batch of the comments and write them to the
+// stream.
+async function loadCommentsBatch(ctx, csv, variables = {}) {
+  let result = await ctx.graphql(
+    `
+    query GetMyComments($cursor: Cursor) {
+      me {
+        comments(query: {
+          limit: 100,
+          cursor: $cursor
+        }) {
+          hasNextPage
+          endCursor
+          nodes {
+            id
+            created_at
+            asset {
+              url
+            }
+            body
+            url
+          }
+        }
+      }
+    }
+  `,
+    variables
+  );
+  if (result.errors) {
+    throw result.errors;
+  }
+
+  for (const comment of get(result, 'data.me.comments.nodes', [])) {
+    csv.write([
+      comment.id,
+      moment(comment.created_at).format('YYYY-MM-DD HH:mm:ss'),
+      comment.asset.url,
+      comment.url,
+      comment.body,
+    ]);
+  }
+
+  return pick(result.data.me.comments, ['hasNextPage', 'endCursor']);
+}
+
+// loadComments will load batches of the comments and write them to the csv
+// stream. Once the comments have finished writing, it will close the stream.
+async function loadComments(ctx, csv) {
+  csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
+
+  // Load the first batch's comments.
+  let connection = await loadCommentsBatch(ctx, csv);
+
+  // As long as there's more comments, keep paginating.
+  while (connection.hasNextPage) {
+    connection = await loadCommentsBatch(ctx, csv, {
+      cursor: connection.endCursor,
+    });
+  }
+
+  csv.end();
+}
+
+// /download will send back a zipped archive of the users account.
+router.get('/download', authorization.needed(), async (req, res, next) => {
+  try {
+    const result = await req.context.graphql('{ me { username } }');
+    if (result.errors) {
+      throw result.errors;
+    }
+    const username = get(result, 'data.me.username');
+
+    // Generate the filename of the file that the user will download.
+    const filename = `talk-${kebabCase(username)}-${kebabCase(
+      moment().format('YYYY-MM-DD HH:mm:ss')
+    )}.zip`;
+
+    res.writeHead(200, {
+      'Content-Type': 'application/octet-stream',
+      'Content-Disposition': `attachment; filename=${filename}`,
+    });
+
+    // Create the zip archive we'll use to write all the exported files to.
+    const archive = archiver('zip', {
+      zlib: { level: 9 },
+    });
+
+    // Pipe this to the response writer directly.
+    archive.pipe(res);
+
+    // Create all the csv writers that'll write the data to the archive.
+    const myCommentsCSV = stringify();
+
+    // Add all the streams as files to the archive.
+    archive.append(myCommentsCSV, { name: 'my_comments.csv' });
+
+    // Mark the end of adding files, no more files can be added after this. Once
+    // all the stream readers have finished writing, and have closed, the
+    // archiver will close which will finish the HTTP request.
+    archive.finalize();
+
+    // Load the comments csv up with the user's comments.
+    await loadComments(req.context, myCommentsCSV);
+  } catch (err) {
+    return next(err);
+  }
+});
+
 module.exports = router;
diff --git a/yarn.lock b/yarn.lock
index fd501351e..199e329f8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -445,6 +445,30 @@ aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
 
+archiver-utils@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-1.3.0.tgz#e50b4c09c70bf3d680e32ff1b7994e9f9d895174"
+  dependencies:
+    glob "^7.0.0"
+    graceful-fs "^4.1.0"
+    lazystream "^1.0.0"
+    lodash "^4.8.0"
+    normalize-path "^2.0.0"
+    readable-stream "^2.0.0"
+
+archiver@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/archiver/-/archiver-2.1.1.tgz#ff662b4a78201494a3ee544d3a33fe7496509ebc"
+  dependencies:
+    archiver-utils "^1.3.0"
+    async "^2.0.0"
+    buffer-crc32 "^0.2.1"
+    glob "^7.0.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"
+    tar-stream "^1.5.0"
+    zip-stream "^1.2.0"
+
 archy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/archy/-/archy-1.0.0.tgz#f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40"
@@ -611,7 +635,7 @@ async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
 
-async@^2.1.2, async@^2.1.4, async@^2.4.1, async@~2.6.0:
+async@^2.0.0, async@^2.1.2, async@^2.1.4, async@^2.4.1, async@~2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
   dependencies:
@@ -1583,7 +1607,7 @@ bson@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.4.tgz#93c10d39eaa5b58415cbc4052f3e53e562b0b72c"
 
-buffer-crc32@~0.2.3:
+buffer-crc32@^0.2.1, buffer-crc32@~0.2.3:
   version "0.2.13"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
@@ -2181,6 +2205,15 @@ component-emitter@^1.2.0, component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
+compress-commons@^1.2.0:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-1.2.2.tgz#524a9f10903f3a813389b0225d27c48bb751890f"
+  dependencies:
+    buffer-crc32 "^0.2.1"
+    crc32-stream "^2.0.0"
+    normalize-path "^2.0.0"
+    readable-stream "^2.0.0"
+
 compressible@~2.0.11:
   version "2.0.11"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.11.tgz#16718a75de283ed8e604041625a2064586797d8a"
@@ -2411,6 +2444,17 @@ cosmiconfig@^4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
+crc32-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-2.0.0.tgz#e3cdd3b4df3168dd74e3de3fbbcb7b297fe908f4"
+  dependencies:
+    crc "^3.4.4"
+    readable-stream "^2.0.0"
+
+crc@^3.4.4:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
+
 create-ecdh@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
@@ -2641,6 +2685,12 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
+csv-stringify@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-2.0.4.tgz#9ace220df98ffa7ca91314ac77ff8cba0a08c863"
+  dependencies:
+    lodash.get "~4.4.2"
+
 cuid@~1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/cuid/-/cuid-1.3.8.tgz#4b875e0969bad764f7ec0706cf44f5fb0831f6b7"
@@ -4297,7 +4347,7 @@ got@^6.7.1:
     unzip-response "^2.0.1"
     url-parse-lax "^1.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
+graceful-fs@^4.1.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   version "4.1.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
 
@@ -6289,6 +6339,12 @@ lazy-cache@^2.0.2:
   dependencies:
     set-getter "^0.1.0"
 
+lazystream@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
+  dependencies:
+    readable-stream "^2.0.5"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -6613,7 +6669,7 @@ lodash.foreach@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
 
-lodash.get@4.4.2, lodash.get@^4.4.2:
+lodash.get@4.4.2, lodash.get@^4.4.2, lodash.get@~4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
 
@@ -6753,7 +6809,7 @@ lodash.values@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.values/-/lodash.values-4.3.0.tgz#a3a6c2b0ebecc5c2cba1c17e6e620fe81b53d347"
 
-"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.5, lodash@^4.3.0, lodash@~4.17.4:
+"lodash@>=3.5 <5", lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.8.0, lodash@~4.17.4:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
 
@@ -10792,6 +10848,15 @@ tar-stream@1.5.2, tar-stream@^1.1.2:
     readable-stream "^2.0.0"
     xtend "^4.0.0"
 
+tar-stream@^1.5.0:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.5.5.tgz#5cad84779f45c83b1f2508d96b09d88c7218af55"
+  dependencies:
+    bl "^1.0.0"
+    end-of-stream "^1.0.0"
+    readable-stream "^2.0.0"
+    xtend "^4.0.0"
+
 tar@^2.0.0, tar@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1"
@@ -11859,3 +11924,12 @@ yauzl@^2.5.0:
 zen-observable-ts@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.4.4.tgz#c244c71eaebef79a985ccf9895bc90307a6e9712"
+
+zip-stream@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-1.2.0.tgz#a8bc45f4c1b49699c6b90198baacaacdbcd4ba04"
+  dependencies:
+    archiver-utils "^1.3.0"
+    compress-commons "^1.2.0"
+    lodash "^4.8.0"
+    readable-stream "^2.0.0"

From a808cdc1958d5f709325f19f0c9e7f6ae1b9e43e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 27 Mar 2018 18:47:34 -0600
Subject: [PATCH 02/44] refactored some request logic

---
 routes/api/v1/account.js | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index 84b5e4d0a..23ef46a63 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -4,6 +4,10 @@ const UsersService = require('../../../services/users');
 const mailer = require('../../../services/mailer');
 const authorization = require('../../../middleware/authorization');
 const errors = require('../../../errors');
+const archiver = require('archiver');
+const stringify = require('csv-stringify');
+const moment = require('moment');
+const { pick, get, kebabCase } = require('lodash');
 
 // Return the current logged in user.
 router.get('/', authorization.needed(), (req, res, next) => {
@@ -127,11 +131,6 @@ router.put(
   }
 );
 
-const archiver = require('archiver');
-const stringify = require('csv-stringify');
-const moment = require('moment');
-const { pick, get, kebabCase } = require('lodash');
-
 // loadCommentsBatch will load a batch of the comments and write them to the
 // stream.
 async function loadCommentsBatch(ctx, csv, variables = {}) {
@@ -179,7 +178,13 @@ async function loadCommentsBatch(ctx, csv, variables = {}) {
 
 // loadComments will load batches of the comments and write them to the csv
 // stream. Once the comments have finished writing, it will close the stream.
-async function loadComments(ctx, csv) {
+async function loadComments(ctx, archive) {
+  // Create all the csv writers that'll write the data to the archive.
+  const csv = stringify();
+
+  // Add all the streams as files to the archive.
+  archive.append(csv, { name: 'my_comments.csv' });
+
   csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
 
   // Load the first batch's comments.
@@ -222,19 +227,13 @@ router.get('/download', authorization.needed(), async (req, res, next) => {
     // Pipe this to the response writer directly.
     archive.pipe(res);
 
-    // Create all the csv writers that'll write the data to the archive.
-    const myCommentsCSV = stringify();
-
-    // Add all the streams as files to the archive.
-    archive.append(myCommentsCSV, { name: 'my_comments.csv' });
+    // Load the comments csv up with the user's comments.
+    await loadComments(req.context, archive);
 
     // Mark the end of adding files, no more files can be added after this. Once
     // all the stream readers have finished writing, and have closed, the
     // archiver will close which will finish the HTTP request.
     archive.finalize();
-
-    // Load the comments csv up with the user's comments.
-    await loadComments(req.context, myCommentsCSV);
   } catch (err) {
     return next(err);
   }

From 5650b7cf3af0a3fbb8d6d59a013fc375c0f35112 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 09:34:06 -0300
Subject: [PATCH 03/44] Adding proptypes

---
 .../src/routes/Install/components/Install.js  | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Install/components/Install.js b/client/coral-admin/src/routes/Install/components/Install.js
index 14afc12f5..823b32968 100644
--- a/client/coral-admin/src/routes/Install/components/Install.js
+++ b/client/coral-admin/src/routes/Install/components/Install.js
@@ -1,7 +1,8 @@
-import React, { Component } from 'react';
+import React from 'react';
 import styles from './Install.css';
 import { Wizard, WizardNav } from 'coral-ui';
 import Layout from 'coral-admin/src/components/Layout';
+import PropTypes from 'prop-types';
 
 import InitialStep from './Steps/InitialStep';
 import AddOrganizationName from './Steps/AddOrganizationName';
@@ -9,7 +10,7 @@ import CreateYourAccount from './Steps/CreateYourAccount';
 import PermittedDomainsStep from './Steps/PermittedDomainsStep';
 import FinalStep from './Steps/FinalStep';
 
-export default class Install extends Component {
+class Install extends React.Component {
   handleDomainsChange = value => {
     this.props.updatePermittedDomains(value);
   };
@@ -81,3 +82,18 @@ export default class Install extends Component {
     );
   }
 }
+
+Install.propTypes = {
+  updatePermittedDomains: PropTypes.func.isRequired,
+  updateSettingsFormData: PropTypes.func.isRequired,
+  updateUserFormData: PropTypes.func.isRequired,
+  submitSettings: PropTypes.func.isRequired,
+  submitUser: PropTypes.func.isRequired,
+  install: PropTypes.object.isRequired,
+  nextStep: PropTypes.func.isRequired,
+  previousStep: PropTypes.func.isRequired,
+  goToStep: PropTypes.func.isRequired,
+  finishInstall: PropTypes.func.isRequired,
+};
+
+export default Install;

From 480428b4a2fe1e19dd61bccf745827f79f4c54e9 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 09:44:02 -0300
Subject: [PATCH 04/44] PropTypes and adding field

---
 .../components/Steps/CreateYourAccount.js     | 10 +++++
 .../src/routes/Install/containers/Install.js  | 37 +++++++++++++++----
 locales/ar.yml                                |  1 +
 locales/da.yml                                |  1 +
 locales/de.yml                                |  1 +
 locales/en.yml                                |  1 +
 locales/es.yml                                |  1 +
 locales/fr.yml                                |  1 +
 locales/pt_BR.yml                             |  1 +
 9 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
index 37387c446..723c4fb78 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
@@ -52,6 +52,16 @@ const InitialStep = props => {
             errorMsg={install.errors.confirmPassword}
           />
 
+          <TextField
+            className={styles.textField}
+            id="organizationContactEmail"
+            type="email"
+            label={t('install.create.organization_contact_email')}
+            onChange={handleUserChange}
+            showErrors={install.showErrors}
+            errorMsg={install.errors.organizationEmailContact}
+          />
+
           {!props.install.isLoading ? (
             <Button
               className="talk-install-step-3-save-button"
diff --git a/client/coral-admin/src/routes/Install/containers/Install.js b/client/coral-admin/src/routes/Install/containers/Install.js
index 54c02e3c0..597b5718d 100644
--- a/client/coral-admin/src/routes/Install/containers/Install.js
+++ b/client/coral-admin/src/routes/Install/containers/Install.js
@@ -1,8 +1,7 @@
-import React, { Component } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { compose } from 'react-apollo';
 import Install from '../components/Install';
 
 import {
@@ -18,7 +17,7 @@ import {
   updatePermittedDomains,
 } from '../../../actions/install';
 
-class InstallContainer extends Component {
+class InstallContainer extends React.Component {
   componentDidMount() {
     const { checkInstall } = this.props;
     checkInstall(() => {
@@ -27,7 +26,20 @@ class InstallContainer extends Component {
   }
 
   render() {
-    return <Install {...this.props} />;
+    return (
+      <Install
+        goToStep={this.props.goToStep}
+        nextStep={this.props.nextStep}
+        submitUser={this.props.submitUser}
+        checkInstall={this.props.checkInstall}
+        previousStep={this.props.previousStep}
+        finishInstall={this.props.finishInstall}
+        submitSettings={this.props.submitSettings}
+        updateUserFormData={this.props.updateUserFormData}
+        updateSettingsFormData={this.props.updateSettingsFormData}
+        updatePermittedDomains={this.props.updatePermittedDomains}
+      />
+    );
   }
 }
 
@@ -35,6 +47,19 @@ InstallContainer.contextTypes = {
   router: PropTypes.object,
 };
 
+InstallContainer.propTypes = {
+  goToStep: PropTypes.func.isRequired,
+  nextStep: PropTypes.func.isRequired,
+  submitUser: PropTypes.func.isRequired,
+  checkInstall: PropTypes.func.isRequired,
+  previousStep: PropTypes.func.isRequired,
+  finishInstall: PropTypes.func.isRequired,
+  submitSettings: PropTypes.func.isRequired,
+  updateUserFormData: PropTypes.func.isRequired,
+  updateSettingsFormData: PropTypes.func.isRequired,
+  updatePermittedDomains: PropTypes.func.isRequired,
+};
+
 const mapStateToProps = state => ({
   install: state.install,
 });
@@ -56,6 +81,4 @@ const mapDispatchToProps = dispatch =>
     dispatch
   );
 
-export default compose(connect(mapStateToProps, mapDispatchToProps))(
-  InstallContainer
-);
+export default connect(mapStateToProps, mapDispatchToProps)(InstallContainer);
diff --git a/locales/ar.yml b/locales/ar.yml
index 3c94c06f0..f435db811 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -466,6 +466,7 @@ ar:
       username: "Username"
       password: "Password"
       confirm_password: "Confirm Password"
+      organization_contact_email: "Organization Contact Email"
       save: "Save"
     permitted_domains:
       title: "Permitted domains"
diff --git a/locales/da.yml b/locales/da.yml
index 9618b2f58..fe5b0e917 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -459,6 +459,7 @@ da:
       username: "Brugernavn"
       password: "Kodeord"
       confirm_password: "Bekræft kodeord"
+      organization_contact_email: "Organization Contact Email"
       save: "Gem"
     permitted_domains:
       title: "Tilladte domæner"
diff --git a/locales/de.yml b/locales/de.yml
index 972c2735b..21ab5727d 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -458,6 +458,7 @@ de:
       username: "Nutzername"
       password: "Passwort"
       confirm_password: "Passwort bestätigen"
+      organization_contact_email: "Organization Contact Email"
       save: "Speichern"
     permitted_domains:
       title: "Zugelassene Domains"
diff --git a/locales/en.yml b/locales/en.yml
index 08d64ddc8..91085d0db 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -467,6 +467,7 @@ en:
       username: "Username"
       password: "Password"
       confirm_password: "Confirm Password"
+      organization_contact_email: "Organization Contact Email"
       save: "Save"
     permitted_domains:
       title: "Permitted domains"
diff --git a/locales/es.yml b/locales/es.yml
index ba6cb8ad3..7b2f17c5c 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -460,6 +460,7 @@ es:
       username: "Nombre de Usuario"
       password: "Contraseña"
       confirm_password: "Confirmar Contraseña"
+      organization_contact_email: "Organización: Email de contacto"
       save: "Guardar"
     permitted_domains:
       title: "Dominios permitidos"
diff --git a/locales/fr.yml b/locales/fr.yml
index dd14bea81..896e77d68 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -460,6 +460,7 @@ fr:
       username: "Nom d'utilisateur"
       password: "Mot de passe"
       confirm_password: "Confirmez Le mot de passe"
+      organization_contact_email: "Organization Contact Email"
       save: "Sauvegarder"
     permitted_domains:
       title: "Domaines autorisés"
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 86267d51d..4f6db11b1 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -458,6 +458,7 @@ pt_BR:
       username: "Nome de usuário"
       password: "Senha"
       confirm_password: "Confirme a senha"
+      organization_contact_email: "Organization Contact Email"
       save: "Salvar"
     permitted_domains:
       title: "Domínios permitidos"

From 6a22cd54ec0cf08525a39a745ad1e1cbd5dac3c2 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 10:04:14 -0300
Subject: [PATCH 05/44] Adding OrganizationDetails

---
 .../src/routes/Install/components/Install.js          |  4 ++--
 .../Install/components/Steps/CreateYourAccount.js     | 10 ----------
 ...{AddOrganizationName.js => OrganizationDetails.js} | 11 +++++++++++
 .../src/routes/Install/containers/Install.js          |  2 ++
 client/coral-framework/helpers/error.js               |  1 +
 client/coral-framework/helpers/validate.js            |  1 +
 locales/en.yml                                        |  1 +
 locales/es.yml                                        |  1 +
 8 files changed, 19 insertions(+), 12 deletions(-)
 rename client/coral-admin/src/routes/Install/components/Steps/{AddOrganizationName.js => OrganizationDetails.js} (78%)

diff --git a/client/coral-admin/src/routes/Install/components/Install.js b/client/coral-admin/src/routes/Install/components/Install.js
index 823b32968..4e0024102 100644
--- a/client/coral-admin/src/routes/Install/components/Install.js
+++ b/client/coral-admin/src/routes/Install/components/Install.js
@@ -5,7 +5,7 @@ import Layout from 'coral-admin/src/components/Layout';
 import PropTypes from 'prop-types';
 
 import InitialStep from './Steps/InitialStep';
-import AddOrganizationName from './Steps/AddOrganizationName';
+import OrganizationDetails from './Steps/OrganizationDetails';
 import CreateYourAccount from './Steps/CreateYourAccount';
 import PermittedDomainsStep from './Steps/PermittedDomainsStep';
 import FinalStep from './Steps/FinalStep';
@@ -56,7 +56,7 @@ class Install extends React.Component {
                 goToStep={this.props.goToStep}
               >
                 <InitialStep />
-                <AddOrganizationName
+                <OrganizationDetails
                   install={install}
                   handleSettingsChange={this.handleSettingsChange}
                   handleSettingsSubmit={this.handleSettingsSubmit}
diff --git a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
index 723c4fb78..37387c446 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/CreateYourAccount.js
@@ -52,16 +52,6 @@ const InitialStep = props => {
             errorMsg={install.errors.confirmPassword}
           />
 
-          <TextField
-            className={styles.textField}
-            id="organizationContactEmail"
-            type="email"
-            label={t('install.create.organization_contact_email')}
-            onChange={handleUserChange}
-            showErrors={install.showErrors}
-            errorMsg={install.errors.organizationEmailContact}
-          />
-
           {!props.install.isLoading ? (
             <Button
               className="talk-install-step-3-save-button"
diff --git a/client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js b/client/coral-admin/src/routes/Install/components/Steps/OrganizationDetails.js
similarity index 78%
rename from client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
rename to client/coral-admin/src/routes/Install/components/Steps/OrganizationDetails.js
index aa3cfd534..5cb608d88 100644
--- a/client/coral-admin/src/routes/Install/components/Steps/AddOrganizationName.js
+++ b/client/coral-admin/src/routes/Install/components/Steps/OrganizationDetails.js
@@ -21,6 +21,17 @@ const AddOrganizationName = props => {
             showErrors={install.showErrors}
             errorMsg={install.errors.organizationName}
           />
+
+          <TextField
+            className={styles.TextField}
+            id="organizationContactEmail"
+            type="email"
+            label={t('install.create.organization_contact_email')}
+            onChange={handleSettingsChange}
+            showErrors={install.showErrors}
+            errorMsg={install.errors.organizationContactEmail}
+          />
+
           <Button
             className="talk-install-step-2-save-button"
             type="submit"
diff --git a/client/coral-admin/src/routes/Install/containers/Install.js b/client/coral-admin/src/routes/Install/containers/Install.js
index 597b5718d..d18f914d7 100644
--- a/client/coral-admin/src/routes/Install/containers/Install.js
+++ b/client/coral-admin/src/routes/Install/containers/Install.js
@@ -28,6 +28,7 @@ class InstallContainer extends React.Component {
   render() {
     return (
       <Install
+        install={this.props.install}
         goToStep={this.props.goToStep}
         nextStep={this.props.nextStep}
         submitUser={this.props.submitUser}
@@ -48,6 +49,7 @@ InstallContainer.contextTypes = {
 };
 
 InstallContainer.propTypes = {
+  install: PropTypes.object.isRequired,
   goToStep: PropTypes.func.isRequired,
   nextStep: PropTypes.func.isRequired,
   submitUser: PropTypes.func.isRequired,
diff --git a/client/coral-framework/helpers/error.js b/client/coral-framework/helpers/error.js
index 18c365de1..a041bde4e 100644
--- a/client/coral-framework/helpers/error.js
+++ b/client/coral-framework/helpers/error.js
@@ -6,4 +6,5 @@ export default {
   username: t('error.username'),
   confirmPassword: t('error.confirm_password'),
   organizationName: t('error.organization_name'),
+  organizationContactEmail: t('error.organization_contact_email'),
 };
diff --git a/client/coral-framework/helpers/validate.js b/client/coral-framework/helpers/validate.js
index 849e00e7a..26c1d8a99 100644
--- a/client/coral-framework/helpers/validate.js
+++ b/client/coral-framework/helpers/validate.js
@@ -4,4 +4,5 @@ export default {
   confirmPassword: () => true,
   username: username => /^[a-zA-Z0-9_]+$/.test(username),
   organizationName: org => /^[a-zA-Z0-9_ ]+$/.test(org),
+  organizationContactEmail: email => /^.+@.+\..+$/.test(email),
 };
diff --git a/locales/en.yml b/locales/en.yml
index 91085d0db..4acbfb2db 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -235,6 +235,7 @@ en:
     email_not_verified: "E-mail address {0} not verified."
     email_password: "E-mail and/or password combination incorrect."
     organization_name: "Organization name must only contain letters or numbers."
+    organization_contact_email: "Organization email is not valid."
     password: "Password must be at least 8 characters"
     username: "Usernames can contain letters numbers and _ only"
     unexpected: "Unexpected error occurred. Sorry!"
diff --git a/locales/es.yml b/locales/es.yml
index 7b2f17c5c..ffbcec9ce 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -233,6 +233,7 @@ es:
     email_not_verified: "Correo {0} no confirmado."
     email_password: "Correo y/o contraseña incorrecta."
     organization_name: "El nombre de la organización debe contener letras y/o números."
+    organization_contact_email: "El email de la organización no es válido."
     password: "La contraseña debe tener por lo menos 8 caracteres"
     username: "Los nombres pueden contener letras números y _"
     required_field: "Este campo es requerido"

From 94d12dfbd48be605587fed3d950028b1b805dabf Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 10:12:58 -0300
Subject: [PATCH 06/44] Adding organizationContactEmail

---
 client/coral-admin/src/reducers/install.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/coral-admin/src/reducers/install.js b/client/coral-admin/src/reducers/install.js
index c0a694977..8d96b9b93 100644
--- a/client/coral-admin/src/reducers/install.js
+++ b/client/coral-admin/src/reducers/install.js
@@ -5,6 +5,7 @@ const initialState = {
   isLoading: false,
   data: {
     settings: {
+      organizationContactEmail: '',
       organizationName: '',
       domains: {
         whitelist: [],
@@ -19,6 +20,7 @@ const initialState = {
   },
   errors: {
     organizationName: '',
+    organizationContactEmail: '',
     username: '',
     email: '',
     password: '',

From b32d1ef71754907b6384b3f08e92afe1173f72ba Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 10:16:57 -0300
Subject: [PATCH 07/44] Adding the email to the schema

---
 graph/typeDefs.graphql | 6 ++++++
 models/setting.js      | 3 +++
 test/e2e/globals.js    | 1 +
 3 files changed, 10 insertions(+)

diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 2414faf1f..b6b1f14e1 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -834,6 +834,9 @@ type Settings {
   # organizationName is the name of the organization.
   organizationName: String
 
+  # organizationContactEmail is the email of the organization.
+  organizationContactEmail: String
+
   # wordlist will return a given list of words.
   wordlist: Wordlist
 
@@ -1290,6 +1293,9 @@ input UpdateSettingsInput {
   # organizationName is the name of the organization.
   organizationName: String
 
+  # organizationContactEmail is the email of the organization.
+  organizationContactEmail: String
+
   # editCommentWindowLength is the length of time (in milliseconds) after a
   # comment is posted that it can still be edited by the author.
   editCommentWindowLength: Int
diff --git a/models/setting.js b/models/setting.js
index 1cca9c989..786020328 100644
--- a/models/setting.js
+++ b/models/setting.js
@@ -49,6 +49,9 @@ const SettingSchema = new Schema(
     organizationName: {
       type: String,
     },
+    organizationContactEmail: {
+      type: String,
+    },
     autoCloseStream: {
       type: Boolean,
       default: false,
diff --git a/test/e2e/globals.js b/test/e2e/globals.js
index 56bcd3868..371fe64c5 100644
--- a/test/e2e/globals.js
+++ b/test/e2e/globals.js
@@ -27,5 +27,6 @@ module.exports = {
       body: 'This is a test comment',
     },
     organizationName: 'Coral',
+    organizationContactEmail: 'coral@coraltest.coral',
   },
 };

From 6c815c113244ebe40fd8af8420c9734cdb076fa7 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 10:39:50 -0300
Subject: [PATCH 08/44] Working on the admin side

---
 .../routes/Configure/components/Configure.js  | 26 +++++----
 .../components/OrganizationSettings.js        | 39 ++++++++++++++
 .../routes/Configure/containers/Configure.js  |  5 ++
 .../containers/OrganizationSettings.js        | 53 +++++++++++++++++++
 docs/source/api/slots.md                      |  1 +
 locales/en.yml                                |  4 ++
 locales/es.yml                                |  4 ++
 7 files changed, 123 insertions(+), 9 deletions(-)
 create mode 100644 client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
 create mode 100644 client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js

diff --git a/client/coral-admin/src/routes/Configure/components/Configure.js b/client/coral-admin/src/routes/Configure/components/Configure.js
index efd428378..50c081cac 100644
--- a/client/coral-admin/src/routes/Configure/components/Configure.js
+++ b/client/coral-admin/src/routes/Configure/components/Configure.js
@@ -1,15 +1,15 @@
-import React, { Component } from 'react';
-
-import { Button, List, Item } from 'coral-ui';
-import styles from './Configure.css';
-import StreamSettings from '../containers/StreamSettings';
-import ModerationSettings from '../containers/ModerationSettings';
-import TechSettings from '../containers/TechSettings';
+import React from 'react';
 import t from 'coral-framework/services/i18n';
 import { can } from 'coral-framework/services/perms';
 import PropTypes from 'prop-types';
+import { Button, List, Item } from 'coral-ui';
+import StreamSettings from '../containers/StreamSettings';
+import ModerationSettings from '../containers/ModerationSettings';
+import TechSettings from '../containers/TechSettings';
+import OrganizationSettings from '../containers/OrganizationSettings';
+import styles from './Configure.css';
 
-export default class Configure extends Component {
+class Configure extends React.Component {
   getSectionComponent(section) {
     switch (section) {
       case 'stream':
@@ -18,8 +18,11 @@ export default class Configure extends Component {
         return ModerationSettings;
       case 'tech':
         return TechSettings;
+      case 'organization':
+        return OrganizationSettings;
+      default:
+        return StreamSettings;
     }
-    throw new Error(`Unknown section ${section}`);
   }
 
   render() {
@@ -54,6 +57,9 @@ export default class Configure extends Component {
             <Item itemId="tech" icon="code">
               {t('configure.tech_settings')}
             </Item>
+            <Item itemId="organization" icon="people">
+              {t('configure.organization_settings')}
+            </Item>
           </List>
           <div className={styles.saveBox}>
             {canSave ? (
@@ -93,3 +99,5 @@ Configure.propTypes = {
   setActiveSection: PropTypes.func.isRequired,
   activeSection: PropTypes.string.isRequired,
 };
+
+export default Configure;
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
new file mode 100644
index 000000000..9920375c4
--- /dev/null
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import Slot from 'coral-framework/components/Slot';
+import t from 'coral-framework/services/i18n';
+import ConfigurePage from './ConfigurePage';
+import ConfigureCard from 'coral-framework/components/ConfigureCard';
+
+class OrganizationSettings extends React.Component {
+  render() {
+    const { settings, slotPassthrough } = this.props;
+    console.log(this.props);
+    return (
+      <ConfigurePage title={t('configure.organization_settings')}>
+        <ConfigureCard title={t('configure.organization_details')}>
+          <ul>
+            <li>
+              {t('configure.organization_name')}: {settings.organizationName}
+            </li>
+            <li>
+              {t('configure.organization_contact_email')}:{' '}
+              {settings.organizationContactEmail}
+            </li>
+          </ul>
+        </ConfigureCard>
+        <Slot fill="adminOrganizationSettings" passthrough={slotPassthrough} />
+      </ConfigurePage>
+    );
+  }
+}
+
+OrganizationSettings.propTypes = {
+  updatePending: PropTypes.func.isRequired,
+  errors: PropTypes.object.isRequired,
+  settings: PropTypes.object.isRequired,
+  slotPassthrough: PropTypes.object.isRequired,
+};
+
+export default OrganizationSettings;
diff --git a/client/coral-admin/src/routes/Configure/containers/Configure.js b/client/coral-admin/src/routes/Configure/containers/Configure.js
index ce6ea0627..89fe62fcb 100644
--- a/client/coral-admin/src/routes/Configure/containers/Configure.js
+++ b/client/coral-admin/src/routes/Configure/containers/Configure.js
@@ -12,6 +12,7 @@ import TechSettings from './TechSettings';
 import ModerationSettings from './ModerationSettings';
 import { clearPending, setActiveSection } from '../../../actions/configure';
 import Configure from '../components/Configure';
+import OrganizationSettings from './OrganizationSettings';
 
 class ConfigureContainer extends Component {
   savePending = async () => {
@@ -49,10 +50,12 @@ const withConfigureQuery = withQuery(
       ...${getDefinitionName(StreamSettings.fragments.settings)}
       ...${getDefinitionName(TechSettings.fragments.settings)}
       ...${getDefinitionName(ModerationSettings.fragments.settings)}
+      ...${getDefinitionName(OrganizationSettings.fragments.settings)}
     }
     ...${getDefinitionName(StreamSettings.fragments.root)}
     ...${getDefinitionName(TechSettings.fragments.root)}
     ...${getDefinitionName(ModerationSettings.fragments.root)}
+    ...${getDefinitionName(OrganizationSettings.fragments.root)}
   }
   ${StreamSettings.fragments.root}
   ${StreamSettings.fragments.settings}
@@ -60,6 +63,8 @@ const withConfigureQuery = withQuery(
   ${TechSettings.fragments.settings}
   ${ModerationSettings.fragments.root}
   ${ModerationSettings.fragments.settings}
+  ${OrganizationSettings.fragments.root}
+  ${OrganizationSettings.fragments.settings}
   `,
   {
     options: () => ({
diff --git a/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js
new file mode 100644
index 000000000..79ab70f69
--- /dev/null
+++ b/client/coral-admin/src/routes/Configure/containers/OrganizationSettings.js
@@ -0,0 +1,53 @@
+import { connect } from 'react-redux';
+import { bindActionCreators } from 'redux';
+import { compose, gql } from 'react-apollo';
+import OrganizationSettings from '../components/OrganizationSettings';
+import withFragments from 'coral-framework/hocs/withFragments';
+import { getSlotFragmentSpreads } from 'coral-framework/utils';
+import { updatePending } from '../../../actions/configure';
+import { mapProps } from 'recompose';
+
+const slots = ['adminOrganizationSettings'];
+
+const mapStateToProps = state => ({
+  errors: state.configure.errors,
+});
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(
+    {
+      updatePending,
+    },
+    dispatch
+  );
+
+export default compose(
+  withFragments({
+    root: gql`
+      fragment TalkAdmin_OrganizationSettings_root on RootQuery {
+        __typename
+        ${getSlotFragmentSpreads(slots, 'root')}
+      }
+    `,
+    settings: gql`
+      fragment TalkAdmin_OrganizationSettings_settings on Settings {
+        organizationName
+        organizationContactEmail
+        ${getSlotFragmentSpreads(slots, 'settings')}
+      }
+    `,
+  }),
+  connect(mapStateToProps, mapDispatchToProps),
+  mapProps(({ root, settings, updatePending, errors, ...rest }) => ({
+    slotPassthrough: {
+      root,
+      settings,
+      updatePending,
+      errors,
+    },
+    updatePending,
+    settings,
+    errors,
+    ...rest,
+  }))
+)(OrganizationSettings);
diff --git a/docs/source/api/slots.md b/docs/source/api/slots.md
index 4ac47a516..da57c0ad6 100644
--- a/docs/source/api/slots.md
+++ b/docs/source/api/slots.md
@@ -81,6 +81,7 @@ You won't have to use this to build plugins, but it's helpful to find where to e
 * `adminCommentMoreDetails`
 * `adminCommentLabels`
 * `adminModerationSettings`
+* `adminOrganizationSettings`
 * `adminStreamSettings`
 * `adminTechSettings`
 * `adminCommentInfoBar`
diff --git a/locales/en.yml b/locales/en.yml
index 4acbfb2db..0710fb206 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -157,6 +157,10 @@ en:
     suspect_word_title: "Suspect words list"
     suspect_word_text: "Comments which contain these words or phrases (not case-sensitive) will be highlighted in the comment stream. Type a word and press Enter or Tab to add. Optionally paste a comma-separated list."
     tech_settings: "Tech Settings"
+    organization_settings: "Organization Settings"
+    organization_details: "Organization Details"
+    organization_name: "Organization Name"
+    organization_contact_email: "Organization Contact Email"
     title: "Configure Comment Stream"
     weeks: Weeks
     wordlist: "Banned Words"
diff --git a/locales/es.yml b/locales/es.yml
index ffbcec9ce..4dbaf5469 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -156,6 +156,10 @@ es:
     suspect_word_title: "Lista de palabras sospechosas"
     suspect_word_text: "Comentarios que contengan estas palabras o frases, considerando mayusculas y minúsculas, serán automáticamente  destacadas en los comentarios publicados. Escribir una palabra y apretar Enter o Tabulador para agregarla. O pegar una lista de palabras separadas por coma."
     tech_settings: "Configuración Técnica"
+    organization_settings: "Configuración de la Organización"
+    organization_details: "Detalles de la Organización"
+    organization_name: "Nombre de la Organización"
+    organization_contact_email: "Email de la Organización"
     title: "Configurar los comentarios"
     weeks: Semanas
     wordlist: "Palabras Suspendidas"

From 133984ab368972f1e0f62f71233b7a1655b225db Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 28 Mar 2018 13:13:29 -0300
Subject: [PATCH 09/44] wip

---
 .../components/OrganizationSettings.css       |  3 ++
 .../components/OrganizationSettings.js        | 31 +++++++++++++++++--
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 client/coral-admin/src/routes/Configure/components/OrganizationSettings.css

diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
new file mode 100644
index 000000000..4902e37a3
--- /dev/null
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -0,0 +1,3 @@
+.label {
+  display: block;
+}
\ No newline at end of file
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
index 9920375c4..41957152c 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
@@ -1,15 +1,21 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-
+import { Textfield } from 'react-mdl';
+import styles from './OrganizationSettings.css';
 import Slot from 'coral-framework/components/Slot';
 import t from 'coral-framework/services/i18n';
 import ConfigurePage from './ConfigurePage';
 import ConfigureCard from 'coral-framework/components/ConfigureCard';
 
 class OrganizationSettings extends React.Component {
+  updateEmail = event => {
+    const updater = { organizationContactEmail: { $set: event.target.value } };
+    this.props.updatePending({ updater });
+  };
+
   render() {
     const { settings, slotPassthrough } = this.props;
-    console.log(this.props);
+
     return (
       <ConfigurePage title={t('configure.organization_settings')}>
         <ConfigureCard title={t('configure.organization_details')}>
@@ -19,7 +25,26 @@ class OrganizationSettings extends React.Component {
             </li>
             <li>
               {t('configure.organization_contact_email')}:{' '}
-              {settings.organizationContactEmail}
+              <input
+                defaultValue={settings.organizationContactEmail}
+                readOnly
+              />
+            </li>
+          </ul>
+        </ConfigureCard>
+        <ConfigureCard title={'Edit Organization Settings'}>
+          <ul>
+            <li>
+              <label className={styles.label}>
+                {t('configure.organization_contact_email')}
+              </label>
+
+              <Textfield
+                type="text"
+                onChange={this.updateEmail}
+                value={settings.organizationContactEmail}
+                label={t('configure.organizationContactEmail')}
+              />
             </li>
           </ul>
         </ConfigureCard>

From c904d0f0c04a14fad975e1b873df534158f0f87d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 29 Mar 2018 14:59:24 -0600
Subject: [PATCH 10/44] improved routing, cleaned mail

---
 graph/context.js                              |   7 +
 graph/mutators/user.js                        |  38 ++--
 graph/resolvers/root_mutation.js              |   3 +
 graph/typeDefs.graphql                        |  10 +
 locales/en.yml                                |   8 +
 perms/constants/mutation.js                   |   1 +
 perms/reducers/mutation.js                    |   1 +
 routes/account/index.js                       |  16 ++
 routes/admin/index.js                         |   8 -
 routes/api/v1/account.js                      | 106 +++++++----
 routes/api/v1/graph.js                        |   2 +-
 routes/{assets/index.js => dev/assets.js}     |   6 +-
 routes/dev/index.js                           |  25 +++
 routes/index.js                               |  21 +--
 services/mailer/templates/download.html.ejs   |   1 +
 services/mailer/templates/download.txt.ejs    |   3 +
 .../mailer/templates/email-confirm.html.ejs   |   2 +-
 .../mailer/templates/email-confirm.txt.ejs    |   2 +-
 .../mailer/templates/password-reset.html.ejs  |   2 +-
 .../mailer/templates/password-reset.txt.ejs   |   2 +-
 services/users.js                             | 173 ++++++++++--------
 views/account/download.ejs                    |  47 +++++
 .../email/confirm.ejs}                        |   2 +-
 .../password/reset.ejs}                       |   2 +-
 views/{ => api}/graphiql.ejs                  |   0
 views/{ => dev}/article.ejs                   |   2 +-
 views/{ => dev}/articles.ejs                  |   2 +-
 27 files changed, 323 insertions(+), 169 deletions(-)
 create mode 100644 routes/account/index.js
 rename routes/{assets/index.js => dev/assets.js} (93%)
 create mode 100644 routes/dev/index.js
 create mode 100644 services/mailer/templates/download.html.ejs
 create mode 100644 services/mailer/templates/download.txt.ejs
 create mode 100644 views/account/download.ejs
 rename views/{admin/confirm-email.ejs => account/email/confirm.ejs} (98%)
 rename views/{admin/password-reset.ejs => account/password/reset.ejs} (98%)
 rename views/{ => api}/graphiql.ejs (100%)
 rename views/{ => dev}/article.ejs (98%)
 rename views/{ => dev}/articles.ejs (66%)

diff --git a/graph/context.js b/graph/context.js
index e9ac7ea61..9c356f0e7 100644
--- a/graph/context.js
+++ b/graph/context.js
@@ -137,6 +137,13 @@ class Context {
     );
   }
 
+  /**
+   * masqueradeAs will allow a given context to be copied to a new user.
+   */
+  masqueradeAs(user) {
+    return new Context(merge({}, this, { user }));
+  }
+
   /**
    * forSystem returns a system context object that can be used for internal
    * operations.
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index 9d31e6dbd..d9e3374a5 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -1,5 +1,5 @@
 const errors = require('../../errors');
-const UsersService = require('../../services/users');
+const Users = require('../../services/users');
 const migrationHelpers = require('../../services/migration/helpers');
 const {
   CHANGE_USERNAME,
@@ -9,10 +9,11 @@ const {
   SET_USER_SUSPENSION_STATUS,
   UPDATE_USER_ROLES,
   DELETE_USER,
+  REQUEST_DOWNLOAD_LINK,
 } = require('../../perms/constants');
 
 const setUserUsernameStatus = async (ctx, id, status) => {
-  const user = await UsersService.setUsernameStatus(id, status, ctx.user.id);
+  const user = await Users.setUsernameStatus(id, status, ctx.user.id);
   if (status === 'REJECTED') {
     ctx.pubsub.publish('usernameRejected', user);
   } else if (status === 'APPROVED') {
@@ -21,12 +22,7 @@ const setUserUsernameStatus = async (ctx, id, status) => {
 };
 
 const setUserBanStatus = async (ctx, id, status = false, message = null) => {
-  const user = await UsersService.setBanStatus(
-    id,
-    status,
-    ctx.user.id,
-    message
-  );
+  const user = await Users.setBanStatus(id, status, ctx.user.id, message);
   if (user.banned) {
     ctx.pubsub.publish('userBanned', user);
   }
@@ -38,38 +34,33 @@ const setUserSuspensionStatus = async (
   until = null,
   message = null
 ) => {
-  const user = await UsersService.setSuspensionStatus(
-    id,
-    until,
-    ctx.user.id,
-    message
-  );
+  const user = await Users.setSuspensionStatus(id, until, ctx.user.id, message);
   if (user.suspended) {
     ctx.pubsub.publish('userSuspended', user);
   }
 };
 
 const ignoreUser = ({ user }, userToIgnore) => {
-  return UsersService.ignoreUsers(user.id, [userToIgnore.id]);
+  return Users.ignoreUsers(user.id, [userToIgnore.id]);
 };
 
 const stopIgnoringUser = ({ user }, userToStopIgnoring) => {
-  return UsersService.stopIgnoringUsers(user.id, [userToStopIgnoring.id]);
+  return Users.stopIgnoringUsers(user.id, [userToStopIgnoring.id]);
 };
 
 const changeUsername = async (ctx, id, username) => {
-  const user = await UsersService.changeUsername(id, username, ctx.user.id);
+  const user = await Users.changeUsername(id, username, ctx.user.id);
   const previousUsername = ctx.user.username;
   ctx.pubsub.publish('usernameChanged', { previousUsername, user });
   return user;
 };
 
 const setUsername = async (ctx, id, username) => {
-  return UsersService.setUsername(id, username, ctx.user.id);
+  return Users.setUsername(id, username, ctx.user.id);
 };
 
 const setRole = (ctx, id, role) => {
-  return UsersService.setRole(id, role);
+  return Users.setRole(id, role);
 };
 
 /**
@@ -153,6 +144,10 @@ const delUser = async (ctx, id) => {
   await user.remove();
 };
 
+// requestDownloadLink will request the current user's account be available via
+// a download link sent to their email address.
+const requestDownloadLink = async ({ user }) => Users.sendDownloadLink(user);
+
 module.exports = ctx => {
   let mutators = {
     User: {
@@ -165,6 +160,7 @@ module.exports = ctx => {
       setUsername: () => Promise.reject(errors.ErrNotAuthorized),
       stopIgnoringUser: () => Promise.reject(errors.ErrNotAuthorized),
       del: () => Promise.reject(errors.ErrNotAuthorized),
+      requestDownloadLink: () => Promise.reject(errors.ErrNotAuthorized),
     },
   };
 
@@ -204,6 +200,10 @@ module.exports = ctx => {
     if (ctx.user.can(DELETE_USER)) {
       mutators.User.del = id => delUser(ctx, id);
     }
+
+    if (ctx.user.can(REQUEST_DOWNLOAD_LINK)) {
+      mutators.User.requestDownloadLink = () => requestDownloadLink(ctx);
+    }
   }
 
   return mutators;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index 2838f0f99..eea296196 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -139,6 +139,9 @@ const RootMutation = {
   delUser: async (_, { id }, { mutators: { User } }) => {
     await User.del(id);
   },
+  requestDownloadLink: async (_, args, { mutators: { User } }) => {
+    await User.requestDownloadLink();
+  },
 };
 
 module.exports = RootMutation;
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 588ad08dc..c86db06df 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -1435,6 +1435,12 @@ type DelUserResponse implements Response {
   errors: [UserError!]
 }
 
+type RequestDownloadLinkResponse implements Response {
+
+  # An array of errors relating to the mutation that occurred.
+  errors: [UserError!]
+}
+
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -1535,6 +1541,10 @@ type RootMutation {
 
   # delUser will delete the user with the specified id.
   delUser(id: ID!): DelUserResponse
+
+  # requestDownloadLink will request a download link be sent to the primary
+  # users email address.
+  requestDownloadLink: RequestDownloadLinkResponse
 }
 
 type UsernameChangedPayload {
diff --git a/locales/en.yml b/locales/en.yml
index 08d64ddc8..b33ba24b2 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -201,6 +201,10 @@ en:
       we_received_a_request: "We received a request to reset your password. If you did not request this change, you can ignore this email."
       if_you_did: "If you did,"
       please_click: "please click here to reset password"
+    download:
+      subject: "Your download link is ready" # TODO: replace
+      download_link_ready: "Your download link is now ready, visit the following to download an archive of your account:" # TODO: replace
+      download_archive: "Download Archive" # TODO: replace
   embedlink:
     copy: "Copy to Clipboard"
   error:
@@ -479,3 +483,7 @@ en:
   admin_sidebar:
     view_options: "View Options"
     sort_comments: "Sort Comments"
+  download_landing:
+    download_your_account: "Download Your Account"
+    click_to_download: "Click below to download your account"
+    confirm: "Download"
diff --git a/perms/constants/mutation.js b/perms/constants/mutation.js
index d2ebe73f1..94736b419 100644
--- a/perms/constants/mutation.js
+++ b/perms/constants/mutation.js
@@ -19,4 +19,5 @@ module.exports = {
   UPDATE_ASSET_STATUS: 'UPDATE_ASSET_STATUS',
   UPDATE_SETTINGS: 'UPDATE_SETTINGS',
   DELETE_USER: 'DELETE_USER',
+  REQUEST_DOWNLOAD_LINK: 'REQUEST_DOWNLOAD_LINK',
 };
diff --git a/perms/reducers/mutation.js b/perms/reducers/mutation.js
index 73ee7ef28..ab01da4e4 100644
--- a/perms/reducers/mutation.js
+++ b/perms/reducers/mutation.js
@@ -13,6 +13,7 @@ module.exports = (user, perm) => {
     case types.CREATE_ACTION:
     case types.DELETE_ACTION:
     case types.EDIT_COMMENT:
+    case types.REQUEST_DOWNLOAD_LINK:
       // Anyone can do these things if they aren't suspended, banned, or blocked
       // as they're editing their username.
       return !['UNSET', 'REJECTED', 'CHANGED'].includes(
diff --git a/routes/account/index.js b/routes/account/index.js
new file mode 100644
index 000000000..575ae7883
--- /dev/null
+++ b/routes/account/index.js
@@ -0,0 +1,16 @@
+const express = require('express');
+const router = express.Router();
+
+router.get('/email/confirm', (req, res) => {
+  res.render('account/email/confirm');
+});
+
+router.get('/password/reset', (req, res) => {
+  res.render('account/password/reset');
+});
+
+router.get('/download', (req, res) => {
+  res.render('account/download');
+});
+
+module.exports = router;
diff --git a/routes/admin/index.js b/routes/admin/index.js
index 66f9c123d..d00ef8642 100644
--- a/routes/admin/index.js
+++ b/routes/admin/index.js
@@ -1,14 +1,6 @@
 const express = require('express');
 const router = express.Router();
 
-router.get('/confirm-email', (req, res) => {
-  res.render('admin/confirm-email');
-});
-
-router.get('/password-reset', (req, res) => {
-  res.render('admin/password-reset');
-});
-
 router.get('*', (req, res) => {
   res.render('admin');
 });
diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index 23ef46a63..afeaafdb6 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -178,17 +178,20 @@ async function loadCommentsBatch(ctx, csv, variables = {}) {
 
 // loadComments will load batches of the comments and write them to the csv
 // stream. Once the comments have finished writing, it will close the stream.
-async function loadComments(ctx, archive) {
+async function loadComments(ctx, archive, latestContentDate) {
   // Create all the csv writers that'll write the data to the archive.
   const csv = stringify();
 
   // Add all the streams as files to the archive.
-  archive.append(csv, { name: 'my_comments.csv' });
+  archive.append(csv, { name: 'talk-export/my_comments.csv' });
 
   csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
 
-  // Load the first batch's comments.
-  let connection = await loadCommentsBatch(ctx, csv);
+  // Load the first batch's comments from the latest date that we were provided
+  // from the token.
+  let connection = await loadCommentsBatch(ctx, csv, {
+    cursor: latestContentDate,
+  });
 
   // As long as there's more comments, keep paginating.
   while (connection.hasNextPage) {
@@ -201,42 +204,67 @@ async function loadComments(ctx, archive) {
 }
 
 // /download will send back a zipped archive of the users account.
-router.get('/download', authorization.needed(), async (req, res, next) => {
-  try {
-    const result = await req.context.graphql('{ me { username } }');
-    if (result.errors) {
-      throw result.errors;
+router.post(
+  '/download',
+  express.urlencoded({ extended: false }),
+  tokenCheck(UsersService.verifyDownloadToken, new Error('invalid token')),
+  async (req, res, next) => {
+    try {
+      const { token } = req.body;
+
+      // Pull the userID and the date that the token was issued out of the
+      // provided token.
+      const { user: userID, iat } = await UsersService.verifyDownloadToken(
+        token
+      );
+
+      // Unpack the date that the token was issued, and use it as a source for the
+      // earliest comment we should include in the download.
+      const latestContentDate = new Date(iat * 1000);
+
+      // Grab the user that we're generating the export from. We'll use it to
+      // create a new context.
+      const user = await UsersService.findById(userID);
+
+      // Base a new context off of the new user.
+      const ctx = req.context.masqueradeAs(user);
+
+      // Get the current user's username. We need it for the generated filenames.
+      const result = await ctx.graphql('{ me { username } }');
+      if (result.errors) {
+        throw result.errors;
+      }
+      const username = get(result, 'data.me.username');
+
+      // Generate the filename of the file that the user will download.
+      const filename = `talk-${kebabCase(username)}-${kebabCase(
+        moment(latestContentDate).format('YYYY-MM-DD HH:mm:ss')
+      )}.zip`;
+
+      res.writeHead(200, {
+        'Content-Type': 'application/octet-stream',
+        'Content-Disposition': `attachment; filename=${filename}`,
+      });
+
+      // Create the zip archive we'll use to write all the exported files to.
+      const archive = archiver('zip', {
+        zlib: { level: 9 },
+      });
+
+      // Pipe this to the response writer directly.
+      archive.pipe(res);
+
+      // Load the comments csv up with the user's comments.
+      await loadComments(ctx, archive, latestContentDate);
+
+      // Mark the end of adding files, no more files can be added after this. Once
+      // all the stream readers have finished writing, and have closed, the
+      // archiver will close which will finish the HTTP request.
+      archive.finalize();
+    } catch (err) {
+      return next(err);
     }
-    const username = get(result, 'data.me.username');
-
-    // Generate the filename of the file that the user will download.
-    const filename = `talk-${kebabCase(username)}-${kebabCase(
-      moment().format('YYYY-MM-DD HH:mm:ss')
-    )}.zip`;
-
-    res.writeHead(200, {
-      'Content-Type': 'application/octet-stream',
-      'Content-Disposition': `attachment; filename=${filename}`,
-    });
-
-    // Create the zip archive we'll use to write all the exported files to.
-    const archive = archiver('zip', {
-      zlib: { level: 9 },
-    });
-
-    // Pipe this to the response writer directly.
-    archive.pipe(res);
-
-    // Load the comments csv up with the user's comments.
-    await loadComments(req.context, archive);
-
-    // Mark the end of adding files, no more files can be added after this. Once
-    // all the stream readers have finished writing, and have closed, the
-    // archiver will close which will finish the HTTP request.
-    archive.finalize();
-  } catch (err) {
-    return next(err);
   }
-});
+);
 
 module.exports = router;
diff --git a/routes/api/v1/graph.js b/routes/api/v1/graph.js
index 7d13d4c92..40e87415b 100644
--- a/routes/api/v1/graph.js
+++ b/routes/api/v1/graph.js
@@ -10,7 +10,7 @@ router.use('/ql', apollo.graphqlExpress(createGraphOptions));
 if (process.env.NODE_ENV !== 'production') {
   // Interactive graphiql interface.
   router.use('/iql', staticTemplate, (req, res) => {
-    res.render('graphiql', {
+    res.render('api/graphiql', {
       endpointURL: 'api/v1/graph/ql',
     });
   });
diff --git a/routes/assets/index.js b/routes/dev/assets.js
similarity index 93%
rename from routes/assets/index.js
rename to routes/dev/assets.js
index 35fb6e9ed..cb1f27e43 100644
--- a/routes/assets/index.js
+++ b/routes/dev/assets.js
@@ -14,7 +14,7 @@ router.get('/id/:asset_id', async (req, res, next) => {
       return next(errors.ErrNotFound);
     }
 
-    res.render('article', {
+    res.render('dev/article', {
       title: asset.title,
       asset_id: asset.id,
       asset_url: asset.url,
@@ -27,7 +27,7 @@ router.get('/id/:asset_id', async (req, res, next) => {
 });
 
 router.get('/title/:asset_title', (req, res) => {
-  return res.render('article', {
+  return res.render('dev/article', {
     title: req.params.asset_title.split('-').join(' '),
     asset_url: '',
     asset_id: null,
@@ -42,7 +42,7 @@ router.get('/', async (req, res, next) => {
 
   try {
     const assets = await Assets.all(skip, limit);
-    res.render('articles', {
+    res.render('dev/articles', {
       assets: assets,
     });
   } catch (err) {
diff --git a/routes/dev/index.js b/routes/dev/index.js
new file mode 100644
index 000000000..ac72db254
--- /dev/null
+++ b/routes/dev/index.js
@@ -0,0 +1,25 @@
+const express = require('express');
+const url = require('url');
+const router = express.Router();
+
+const { MOUNT_PATH } = require('../../url');
+const SetupService = require('../../services/setup');
+const staticTemplate = require('../../middleware/staticTemplate');
+
+router.use('/assets', staticTemplate, require('./assets'));
+router.get('/', staticTemplate, async (req, res) => {
+  try {
+    await SetupService.isAvailable();
+    return res.redirect(url.resolve(MOUNT_PATH, 'admin/install'));
+  } catch (e) {
+    return res.render('dev/article', {
+      title: 'Coral Talk',
+      asset_url: '',
+      asset_id: '',
+      body: '',
+      basePath: '/static/embed/stream',
+    });
+  }
+});
+
+module.exports = router;
diff --git a/routes/index.js b/routes/index.js
index 489a5e8b5..a05cedee2 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -75,6 +75,7 @@ router.use(compression());
 //==============================================================================
 
 router.use('/admin', staticTemplate, require('./admin'));
+router.use('/account', staticTemplate, require('./account'));
 router.use('/login', staticTemplate, require('./login'));
 router.use('/embed', staticTemplate, require('./embed'));
 
@@ -114,22 +115,14 @@ router.use('/api', require('./api'));
 //==============================================================================
 
 if (process.env.NODE_ENV !== 'production') {
-  router.use('/assets', staticTemplate, require('./assets'));
-  router.get('/', staticTemplate, async (req, res) => {
-    try {
-      await SetupService.isAvailable();
-      return res.redirect('/admin/install');
-    } catch (e) {
-      return res.render('article', {
-        title: 'Coral Talk',
-        asset_url: '',
-        asset_id: '',
-        body: '',
-        basePath: '/static/embed/stream',
-      });
-    }
+  // In development, mount the /dev routes, as well as redirect the root url to
+  // the development route.
+  router.use('/dev', require('./dev'));
+  router.get('/', (req, res) => {
+    res.redirect(url.resolve(MOUNT_PATH, 'dev'), 302);
   });
 } else {
+  // In production, optionally redirect to the install if not ran, or the admin.
   router.get('/', async (req, res, next) => {
     try {
       await SetupService.isAvailable();
diff --git a/services/mailer/templates/download.html.ejs b/services/mailer/templates/download.html.ejs
new file mode 100644
index 000000000..c6aeb8e1e
--- /dev/null
+++ b/services/mailer/templates/download.html.ejs
@@ -0,0 +1 @@
+<p><%= t('email.download.download_link_ready') %> <a href="<%= BASE_URL %>account/download#<%= token %>"><%= t('email.download.download_archive') %></a></p>
diff --git a/services/mailer/templates/download.txt.ejs b/services/mailer/templates/download.txt.ejs
new file mode 100644
index 000000000..4f719bc06
--- /dev/null
+++ b/services/mailer/templates/download.txt.ejs
@@ -0,0 +1,3 @@
+<%= t('email.download.download_link_ready') %>
+
+    <%= BASE_URL %>account/download#<%= token %>
diff --git a/services/mailer/templates/email-confirm.html.ejs b/services/mailer/templates/email-confirm.html.ejs
index 76a8ea47b..396386e21 100644
--- a/services/mailer/templates/email-confirm.html.ejs
+++ b/services/mailer/templates/email-confirm.html.ejs
@@ -1,3 +1,3 @@
 <p><%= t('email.confirm.has_been_requested') %> <b><%= email %></b>.</p>
-<p><%= t('email.confirm.to_confirm') %> <a href="<%= BASE_URL %>admin/confirm-email#<%= token %>"><%= t('email.confirm.confirm_email') %></a></p>
+<p><%= t('email.confirm.to_confirm') %> <a href="<%= BASE_URL %>account/email/confirm#<%= token %>"><%= t('email.confirm.confirm_email') %></a></p>
 <p><%= t('email.confirm.if_you_did_not') %></p>
diff --git a/services/mailer/templates/email-confirm.txt.ejs b/services/mailer/templates/email-confirm.txt.ejs
index b3cf28a01..41fabae46 100644
--- a/services/mailer/templates/email-confirm.txt.ejs
+++ b/services/mailer/templates/email-confirm.txt.ejs
@@ -4,6 +4,6 @@
 
 <%= t('email.confirm.to_confirm') %>
 
-    <%= BASE_URL %>admin/confirm-email#<%= token %>
+    <%= BASE_URL %>account/email/confirm#<%= token %>
 
 <%= t('email.confirm.if_you_did_not') %>
diff --git a/services/mailer/templates/password-reset.html.ejs b/services/mailer/templates/password-reset.html.ejs
index c0ec4ea46..502781440 100644
--- a/services/mailer/templates/password-reset.html.ejs
+++ b/services/mailer/templates/password-reset.html.ejs
@@ -1,2 +1,2 @@
 <p><%= t('email.password_reset.we_received_a_request') %><br />
-<%= t('email.password_reset.if_you_did') %> <a href="<%= BASE_URL %>admin/password-reset#<%= token %>"><%= t('email.password_reset.please_click') %></a>.</p>
+<%= t('email.password_reset.if_you_did') %> <a href="<%= BASE_URL %>account/password/reset#<%= token %>"><%= t('email.password_reset.please_click') %></a>.</p>
diff --git a/services/mailer/templates/password-reset.txt.ejs b/services/mailer/templates/password-reset.txt.ejs
index e8db4bab2..2b5e60a9b 100644
--- a/services/mailer/templates/password-reset.txt.ejs
+++ b/services/mailer/templates/password-reset.txt.ejs
@@ -1,3 +1,3 @@
 <%= t('email.password_reset.we_received_a_request') %>. <%= t('email.password_reset.if_you_did') %> <%= t('email.password_reset.please_click') %>:
 
-<%= BASE_URL %>admin/password-reset#<%= token %>
+<%= BASE_URL %>account/password/reset#<%= token %>
diff --git a/services/users.js b/services/users.js
index 0617d5158..cecbc32c5 100644
--- a/services/users.js
+++ b/services/users.js
@@ -5,38 +5,43 @@ const { difference, sample, some, merge, random } = require('lodash');
 const { ROOT_URL } = require('../config');
 const { jwt: JWT_SECRET } = require('../secrets');
 const debug = require('debug')('talk:services:users');
-const UserModel = require('../models/user');
+const User = require('../models/user');
 const RECAPTCHA_WINDOW = '10m'; // 10 minutes.
 const RECAPTCHA_INCORRECT_TRIGGER = 5; // after 5 incorrect attempts, recaptcha will be required.
-const ActionsService = require('./actions');
+const Actions = require('./actions');
 const mailer = require('./mailer');
 const i18n = require('./i18n');
 const Wordlist = require('./wordlist');
 const DomainList = require('./domain_list');
+const Limit = require('./limit');
 
 const EMAIL_CONFIRM_JWT_SUBJECT = 'email_confirm';
 const PASSWORD_RESET_JWT_SUBJECT = 'password_reset';
+const DOWNLOAD_LINK_SUBJECT = 'download_link';
 
 // SALT_ROUNDS is the number of rounds that the bcrypt algorithm will run
 // through during the salting process.
 const SALT_ROUNDS = 10;
 
 // Create a redis client to use for authentication.
-const Limit = require('./limit');
 const loginRateLimiter = new Limit(
   'loginAttempts',
   RECAPTCHA_INCORRECT_TRIGGER,
   RECAPTCHA_WINDOW
 );
 
-// UsersService is the interface for the application to interact with the
-// UserModel through.
-class UsersService {
+// downloadLinkLimiter can be used to limit downloads for the user's data to
+// once every 24 hours.
+const downloadLinkLimiter = new Limit('downloadLinkLimiter', 1, '1d');
+
+// Users is the interface for the application to interact with the
+// User through.
+class Users {
   /**
    * Returns a user (if found) for the given email address.
    */
   static findLocalUser(email) {
-    return UserModel.findOne({
+    return User.findOne({
       profiles: {
         $elemMatch: {
           id: email.toLowerCase(),
@@ -68,7 +73,7 @@ class UsersService {
   }
 
   static async setSuspensionStatus(id, until, assignedBy = null, message) {
-    let user = await UserModel.findOneAndUpdate(
+    let user = await User.findOneAndUpdate(
       { id },
       {
         $set: {
@@ -89,7 +94,7 @@ class UsersService {
       }
     );
     if (user === null) {
-      user = await UserModel.findOne({ id });
+      user = await User.findOne({ id });
       if (user === null) {
         throw errors.ErrNotFound;
       }
@@ -112,7 +117,7 @@ class UsersService {
 
     // Check to see if the user was suspended now and is currently suspended.
     if (user.suspended && message && message.length > 0) {
-      await UsersService.sendEmail(user, {
+      await Users.sendEmail(user, {
         template: 'plain',
         locals: {
           body: message,
@@ -125,7 +130,7 @@ class UsersService {
   }
 
   static async setBanStatus(id, status, assignedBy = null, message) {
-    let user = await UserModel.findOneAndUpdate(
+    let user = await User.findOneAndUpdate(
       {
         id,
         'status.banned.status': {
@@ -151,7 +156,7 @@ class UsersService {
       }
     );
     if (user === null) {
-      user = await UserModel.findOne({ id });
+      user = await User.findOne({ id });
       if (user === null) {
         throw errors.ErrNotFound;
       }
@@ -165,7 +170,7 @@ class UsersService {
 
     // Check to see if the user was banned now and is currently banned.
     if (user.banned && status && message && message.length > 0) {
-      await UsersService.sendEmail(user, {
+      await Users.sendEmail(user, {
         template: 'plain',
         locals: {
           body: message,
@@ -178,7 +183,7 @@ class UsersService {
   }
 
   static async setUsernameStatus(id, status, assignedBy = null) {
-    let user = await UserModel.findOneAndUpdate(
+    let user = await User.findOneAndUpdate(
       {
         id,
         'status.username.status': {
@@ -202,7 +207,7 @@ class UsersService {
       }
     );
     if (user === null) {
-      user = await UserModel.findOne({ id });
+      user = await User.findOne({ id });
       if (user === null) {
         throw errors.ErrNotFound;
       }
@@ -236,7 +241,7 @@ class UsersService {
         query.username = { $ne: username };
       }
 
-      let user = await UserModel.findOneAndUpdate(
+      let user = await User.findOneAndUpdate(
         query,
         {
           $set: {
@@ -257,7 +262,7 @@ class UsersService {
         }
       );
       if (!user) {
-        user = await UsersService.findById(id);
+        user = await Users.findById(id);
         if (user === null) {
           throw errors.ErrNotFound;
         }
@@ -284,24 +289,11 @@ class UsersService {
   }
 
   static async setUsername(id, username, assignedBy) {
-    return UsersService._setUsername(
-      id,
-      username,
-      'UNSET',
-      'SET',
-      assignedBy,
-      true
-    );
+    return Users._setUsername(id, username, 'UNSET', 'SET', assignedBy, true);
   }
 
   static async changeUsername(id, username, assignedBy) {
-    return UsersService._setUsername(
-      id,
-      username,
-      'REJECTED',
-      'CHANGED',
-      assignedBy
-    );
+    return Users._setUsername(id, username, 'REJECTED', 'CHANGED', assignedBy);
   }
 
   /**
@@ -325,7 +317,7 @@ class UsersService {
    * Sets or removes the recaptcha_required flag on a user's local profile.
    */
   static flagForRecaptchaRequirement(email, required) {
-    return UserModel.update(
+    return User.update(
       {
         profiles: {
           $elemMatch: {
@@ -357,11 +349,11 @@ class UsersService {
     const GROUP_ATTEMPTS = 50;
 
     // Cast the original username.
-    const castedName = UsersService.castUsername(username);
+    const castedName = Users.castUsername(username);
     const lowercaseUsername = castedName.toLowerCase();
 
     // Try to see if our first guess has been taken.
-    const existingUserWithName = await UserModel.findOne({
+    const existingUserWithName = await User.findOne({
       lowercaseUsername,
     });
     if (!existingUserWithName) {
@@ -381,7 +373,7 @@ class UsersService {
       );
 
       // See if any of these users aren't taken already.
-      const existingUsernames = (await UserModel.find(
+      const existingUsernames = (await User.find(
         {
           lowercaseUsername: { $in: lowercaseUsernameGuesses },
         },
@@ -417,7 +409,7 @@ class UsersService {
    * @param  {Function} done    [description]
    */
   static async findOrCreateExternalUser(ctx, id, provider, displayName) {
-    let user = await UserModel.findOne({
+    let user = await User.findOne({
       profiles: {
         $elemMatch: {
           id,
@@ -432,10 +424,10 @@ class UsersService {
     // User does not exist and need to be created.
 
     // Create an initial username for the user.
-    let username = await UsersService.getInitialUsername(displayName);
+    let username = await Users.getInitialUsername(displayName);
 
     // The user was not found, lets create them!
-    user = new UserModel({
+    user = new User({
       username,
       lowercaseUsername: username.toLowerCase(),
       profiles: [{ id, provider }],
@@ -465,11 +457,7 @@ class UsersService {
    * @param {String}     email the email for the user to send the email to
    */
   static async sendEmailConfirmation(user, email, redirectURI = ROOT_URL) {
-    let token = await UsersService.createEmailConfirmToken(
-      user,
-      email,
-      redirectURI
-    );
+    let token = await Users.createEmailConfirmToken(user, email, redirectURI);
 
     return mailer.send({
       template: 'email-confirm',
@@ -483,6 +471,43 @@ class UsersService {
     });
   }
 
+  static async sendDownloadLink(user) {
+    // Check that the user has not already requested a download within the last
+    // 24 hours.
+    const attempts = await downloadLinkLimiter.get(user.id);
+    if (attempts && attempts >= 1) {
+      throw errors.ErrMaxRateLimit;
+    }
+
+    // The account currently does not have a download link, let's record the
+    // download. This will throw an error if a race ocurred and we should stop
+    // now.
+    await downloadLinkLimiter.test(user.id);
+
+    // Generate a token for the download link.
+    const token = await JWT_SECRET.sign(
+      { user: user.id },
+      { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
+    );
+
+    // Send the download link via the user's attached email account.
+    await Users.sendEmail(user, {
+      template: 'download',
+      locals: {
+        token,
+      },
+      subject: i18n.t('email.download.subject'),
+    });
+  }
+
+  static async verifyDownloadToken(token) {
+    const jwt = await Users.verifyToken(token, {
+      subject: DOWNLOAD_LINK_SUBJECT,
+    });
+
+    return jwt;
+  }
+
   static async sendEmail(user, options) {
     return mailer.send(
       merge({}, options, {
@@ -494,7 +519,7 @@ class UsersService {
   static async changePassword(id, password) {
     const hashedPassword = await bcrypt.hash(password, SALT_ROUNDS);
 
-    return UserModel.update(
+    return User.update(
       { id },
       {
         $inc: { __v: 1 },
@@ -565,13 +590,13 @@ class UsersService {
     username = username.trim();
 
     await Promise.all([
-      UsersService.isValidUsername(username),
-      UsersService.isValidPassword(password),
+      Users.isValidUsername(username),
+      Users.isValidPassword(password),
     ]);
 
     const hashedPassword = await bcrypt.hash(password, SALT_ROUNDS);
 
-    let user = new UserModel({
+    let user = new User({
       username,
       lowercaseUsername: username.toLowerCase(),
       password: hashedPassword,
@@ -615,11 +640,7 @@ class UsersService {
    * @param  {String}   role role to add
    */
   static setRole(id, role) {
-    return UserModel.update(
-      { id },
-      { $set: { role } },
-      { runValidators: true }
-    );
+    return User.update({ id }, { $set: { role } }, { runValidators: true });
   }
 
   /**
@@ -627,7 +648,7 @@ class UsersService {
    * @param {String} id  user id (uuid)
    */
   static findById(id) {
-    return UserModel.findOne({ id });
+    return User.findOne({ id });
   }
 
   /**
@@ -637,7 +658,7 @@ class UsersService {
    */
   static async findOrCreateByIDToken(id, token) {
     // Try to get the user.
-    let user = await UserModel.findOne({ id });
+    let user = await User.findOne({ id });
 
     // If the user was not found, try to look it up.
     if (user === null) {
@@ -654,7 +675,7 @@ class UsersService {
    * @param {Array} ids  array of user identifiers (uuid)
    */
   static findByIdArray(ids) {
-    return UserModel.find({
+    return User.find({
       id: { $in: ids },
     });
   }
@@ -664,7 +685,7 @@ class UsersService {
    * @param {Array} ids  array of user identifiers (uuid)
    */
   static findPublicByIdArray(ids) {
-    return UserModel.find(
+    return User.find(
       {
         id: { $in: ids },
       },
@@ -686,7 +707,7 @@ class UsersService {
     email = email.toLowerCase();
 
     const [user, domainValidated] = await Promise.all([
-      UserModel.findOne({ profiles: { $elemMatch: { id: email } } }),
+      User.findOne({ profiles: { $elemMatch: { id: email } } }),
       DomainList.urlCheck(loc),
     ]);
     if (!user) {
@@ -744,11 +765,11 @@ class UsersService {
       throw new Error('cannot verify an empty token');
     }
 
-    const { userId, loc, version } = await UsersService.verifyToken(token, {
+    const { userId, loc, version } = await Users.verifyToken(token, {
       subject: PASSWORD_RESET_JWT_SUBJECT,
     });
 
-    const user = await UsersService.findById(userId);
+    const user = await Users.findById(userId);
 
     if (version !== user.__v) {
       throw new Error('password reset token has expired');
@@ -762,7 +783,7 @@ class UsersService {
    * @return {Promise}
    */
   static count(query = {}) {
-    return UserModel.count(query);
+    return User.count(query);
   }
 
   /**
@@ -770,7 +791,7 @@ class UsersService {
    * @return {Promise}
    */
   static all() {
-    return UserModel.find();
+    return User.find();
   }
 
   /**
@@ -778,7 +799,7 @@ class UsersService {
    * @return {Promise}
    */
   static updateSettings(id, settings) {
-    return UserModel.update(
+    return User.update(
       {
         id,
       },
@@ -798,7 +819,7 @@ class UsersService {
    * @return {Promise}
    */
   static addAction(item_id, user_id, action_type, metadata) {
-    return ActionsService.create({
+    return Actions.create({
       item_id,
       item_type: 'users',
       user_id,
@@ -861,11 +882,11 @@ class UsersService {
       throw new Error('cannot verify an empty token');
     }
 
-    const decoded = await UsersService.verifyToken(token, {
+    const decoded = await Users.verifyToken(token, {
       subject: EMAIL_CONFIRM_JWT_SUBJECT,
     });
 
-    const user = await UserModel.findOne({
+    const user = await User.findOne({
       id: decoded.userID,
       profiles: {
         $elemMatch: {
@@ -898,13 +919,11 @@ class UsersService {
    * @return {Promise}
    */
   static async verifyEmailConfirmation(token) {
-    let {
-      userID,
-      email,
-      referer,
-    } = await UsersService.verifyEmailConfirmationToken(token);
+    let { userID, email, referer } = await Users.verifyEmailConfirmationToken(
+      token
+    );
 
-    await UsersService.confirmEmail(userID, email);
+    await Users.confirmEmail(userID, email);
 
     return { userID, email, referer };
   }
@@ -913,7 +932,7 @@ class UsersService {
    * Marks the email on the user as confirmed.
    */
   static confirmEmail(id, email) {
-    return UserModel.update(
+    return User.update(
       {
         id,
         profiles: {
@@ -941,12 +960,12 @@ class UsersService {
       throw new Error('Users cannot ignore themselves');
     }
 
-    const users = await UsersService.findByIdArray(usersToIgnore);
+    const users = await Users.findByIdArray(usersToIgnore);
     if (some(users, user => user.isStaff())) {
       throw errors.ErrCannotIgnoreStaff;
     }
 
-    return UserModel.update(
+    return User.update(
       { id },
       {
         $addToSet: {
@@ -964,7 +983,7 @@ class UsersService {
    * @param  {Array<String>} usersToStopIgnoring Array of user IDs to stop ignoring
    */
   static async stopIgnoringUsers(id, usersToStopIgnoring) {
-    await UserModel.update(
+    await User.update(
       { id },
       {
         $pullAll: {
@@ -975,7 +994,7 @@ class UsersService {
   }
 }
 
-module.exports = UsersService;
+module.exports = Users;
 
 // Extract all the tokenUserNotFound plugins so we can integrate with other
 // providers.
diff --git a/views/account/download.ejs b/views/account/download.ejs
new file mode 100644
index 000000000..d8bdc6e27
--- /dev/null
+++ b/views/account/download.ejs
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
+    <title><%= t('download_landing.download_your_account') %></title>
+    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
+    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
+    <%- include ../partials/head %>
+  </head>
+  <body class="confirm-email-page">
+    <div id="root">
+      <div class="error-console container"></div>
+      <form id="download-form" class="container" method="post" action="<%= BASE_PATH %>api/v1/account/download">
+        <legend class="legend"><%= t('download_landing.click_to_download') %></legend>
+        <button type="submit"><%= t('download_landing.confirm') %></button>
+      </form>
+    </div>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+    <script type="text/javascript">
+      $(function() {
+        function showError(error) {
+          try {
+            let err = JSON.parse(error);
+            $('.error-console').text(err.message).addClass('active');
+          } catch (err) {
+            $('.error-console').text(error).addClass('active');
+          }
+        }
+
+        var token = location.hash.replace('#', '');
+
+        $.ajax({
+          url: '<%= BASE_PATH %>api/v1/account/download',
+          contentType: 'application/json',
+          method: 'POST',
+          data: JSON.stringify({token: token, check: true})
+        })
+        .then(function () {
+          $('#download-form').append('<input name="token" type="hidden" value="' + token + '"/>').fadeIn();
+        })
+        .catch(function (error) {
+          showError(error.responseText);
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/views/admin/confirm-email.ejs b/views/account/email/confirm.ejs
similarity index 98%
rename from views/admin/confirm-email.ejs
rename to views/account/email/confirm.ejs
index 4e59de1d8..8c726b4e5 100644
--- a/views/admin/confirm-email.ejs
+++ b/views/account/email/confirm.ejs
@@ -5,7 +5,7 @@
     <title>Email Verification</title>
     <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
     <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-    <%- include ../partials/head %>
+    <%- include ../../partials/head %>
   </head>
   <body class="confirm-email-page">
     <div id="root">
diff --git a/views/admin/password-reset.ejs b/views/account/password/reset.ejs
similarity index 98%
rename from views/admin/password-reset.ejs
rename to views/account/password/reset.ejs
index 75770a15e..c551034b3 100644
--- a/views/admin/password-reset.ejs
+++ b/views/account/password/reset.ejs
@@ -5,7 +5,7 @@
     <title>Password Reset</title>
     <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
     <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-    <%- include ../partials/head %>
+    <%- include ../../partials/head %>
   </head>
   <body class="password-reset-page">
     <div id="root">
diff --git a/views/graphiql.ejs b/views/api/graphiql.ejs
similarity index 100%
rename from views/graphiql.ejs
rename to views/api/graphiql.ejs
diff --git a/views/article.ejs b/views/dev/article.ejs
similarity index 98%
rename from views/article.ejs
rename to views/dev/article.ejs
index 4e12fa04a..8abfc34af 100644
--- a/views/article.ejs
+++ b/views/dev/article.ejs
@@ -23,7 +23,7 @@
   <main>
     <h1><%= title %></h1>
     <p><%= body %></p>
-    <p><a href="<%= BASE_PATH %>admin">Admin</a> - <a href="<%= BASE_PATH %>assets">All Assets</a></p>
+    <p><a href="<%= BASE_PATH %>admin">Admin</a> - <a href="<%= BASE_PATH %>dev/assets">All Assets</a></p>
     <div id='coralStreamEmbed'></div>
     <script src="<%= resolve('embed.js') %>" async onload="
       window.TalkEmbed = Coral.Talk.render(document.getElementById('coralStreamEmbed'), {
diff --git a/views/articles.ejs b/views/dev/articles.ejs
similarity index 66%
rename from views/articles.ejs
rename to views/dev/articles.ejs
index 49d6281b6..0ce684029 100644
--- a/views/articles.ejs
+++ b/views/dev/articles.ejs
@@ -4,7 +4,7 @@
   Asset list
 </h1>
 <% assets.forEach(function (asset) { %>
-  <a href="<%= BASE_PATH %>assets/id/<%= asset.id %>"><%= asset.url %></a><br />
+  <a href="<%= BASE_PATH %>dev/assets/id/<%= asset.id %>"><%= asset.url %></a><br />
 <% }) %>
 <p>
   (For dev use only. FYI, you can: ?skip=100&limit=25)

From bb7f1a57f0af181c7a2134472966e1b16af965fd Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 2 Apr 2018 17:53:27 -0600
Subject: [PATCH 11/44] Added UI for downloading your comment data

- Added button on profile page
- Added date when last downloaded data
---
 .../coral-embed-stream/src/graphql/index.js   |  12 +
 .../DownloadCommentHistorySection.css         |  12 +
 .../DownloadCommentHistorySection.js          | 109 ++++++++
 .../src/tabs/profile/components/Settings.js   |   2 +
 .../src/tabs/profile/containers/Settings.js   |   4 +
 graph/resolvers/user.js                       |   2 +
 graph/typeDefs.graphql                        |   4 +
 locales/en.yml                                |  11 +
 models/user.js                                |   7 +
 perms/constants/query.js                      |   1 +
 perms/reducers/query.js                       |   1 +
 services/users.js                             |  17 ++
 yarn.lock                                     | 248 +++++++++++++++++-
 13 files changed, 424 insertions(+), 6 deletions(-)
 create mode 100644 client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css
 create mode 100644 client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index d9f6b4f64..5c9da6751 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -247,5 +247,17 @@ export default {
         },
       },
     }),
+    DownloadCommentHistory: () => ({
+      updateQueries: {
+        CoralEmbedStream_Profile: previousData =>
+          update(previousData, {
+            me: {
+              lastAccountDownload: {
+                $set: new Date().toISOString(),
+              },
+            },
+          }),
+      },
+    }),
   },
 };
diff --git a/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css b/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css
new file mode 100644
index 000000000..55ea39969
--- /dev/null
+++ b/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css
@@ -0,0 +1,12 @@
+.button {
+  margin: 0;
+
+  i {
+    font-size: inherit;
+    vertical-align: sub;
+  }
+}
+
+.most_recent {
+  color: #808080;
+}
diff --git a/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js b/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js
new file mode 100644
index 000000000..494e79d9e
--- /dev/null
+++ b/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js
@@ -0,0 +1,109 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'coral-ui';
+import { compose, gql } from 'react-apollo';
+import { t } from 'plugin-api/beta/client/services';
+import styles from './DownloadCommentHistorySection.css';
+import { withFragments, withMutation } from 'coral-framework/hocs';
+
+export const readableDuration = durAsHours => {
+  const durAsDays = Math.ceil(durAsHours / 24);
+
+  return durAsHours > 23
+    ? durAsDays > 1
+      ? t('download_request.days', durAsDays)
+      : t('download_request.day', durAsDays)
+    : durAsHours > 1
+      ? t('download_request.hours', durAsHours)
+      : t('download_request.hour', durAsHours);
+};
+
+class DownloadCommentHistorySection extends Component {
+  static propTypes = {
+    requestDownloadLink: PropTypes.func.isRequired,
+    root: PropTypes.object.isRequired,
+  };
+
+  render() {
+    const {
+      root: { me: { lastAccountDownload } },
+      requestDownloadLink,
+    } = this.props;
+
+    const now = new Date();
+    const lastAccountDownloadDate =
+      lastAccountDownload && new Date(lastAccountDownload);
+    const hoursLeft = lastAccountDownloadDate
+      ? Math.ceil(
+          24 - (now.getTime() - lastAccountDownloadDate.getTime()) / 3.6e6
+        )
+      : 0;
+    const canRequestDownload = !lastAccountDownloadDate || hoursLeft <= 0;
+
+    return (
+      <section className={'talk-plugin-ignore-user-section'}>
+        <h3>{t('download_request.section_title')}</h3>
+        <p>
+          {t('download_request.you_will_get_a_copy')}{' '}
+          <b>{t('download_request.download_rate')}</b>.
+        </p>
+        {lastAccountDownloadDate && (
+          <p className={styles.most_recent}>
+            {t('download_request.most_recent_request')}:{' '}
+            {lastAccountDownloadDate.toLocaleString()}
+          </p>
+        )}
+        {canRequestDownload ? (
+          <Button className={styles.button} onClick={requestDownloadLink}>
+            <i className="material-icons" aria-hidden={true}>
+              file_download
+            </i>{' '}
+            {t('download_request.request')}
+          </Button>
+        ) : (
+          <Button className={styles.button} disabled>
+            <i className="material-icons" aria-hidden={true}>
+              access_time
+            </i>{' '}
+            {t('download_request.rate_limit', readableDuration(hoursLeft))}
+          </Button>
+        )}
+      </section>
+    );
+  }
+}
+
+const withDownloadCommentHistorySectionFragments = withFragments({
+  root: gql`
+    fragment TalkDownloadCommentHistory_DownloadCommentHistorySection_root on RootQuery {
+      me {
+        id
+        lastAccountDownload
+      }
+    }
+  `,
+});
+
+const withRequestDownloadLink = withMutation(
+  gql`
+    mutation DownloadCommentHistory {
+      requestDownloadLink {
+        errors {
+          translation_key
+        }
+      }
+    }
+  `,
+  {
+    props: ({ mutate }) => ({
+      requestDownloadLink: () => mutate({ variables: {} }),
+    }),
+  }
+);
+
+const enhance = compose(
+  withDownloadCommentHistorySectionFragments,
+  withRequestDownloadLink
+);
+
+export default enhance(DownloadCommentHistorySection);
diff --git a/client/coral-embed-stream/src/tabs/profile/components/Settings.js b/client/coral-embed-stream/src/tabs/profile/components/Settings.js
index c61a09a92..c07dbfcd6 100644
--- a/client/coral-embed-stream/src/tabs/profile/components/Settings.js
+++ b/client/coral-embed-stream/src/tabs/profile/components/Settings.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Slot } from 'coral-framework/components';
+import DownloadCommentHistorySection from './DownloadCommentHistorySection';
 
 class Settings extends React.Component {
   render() {
@@ -9,6 +10,7 @@ class Settings extends React.Component {
     return (
       <div>
         <Slot fill="profileSettings" passthrough={slotPassthrough} />
+        <DownloadCommentHistorySection root={root} />
       </div>
     );
   }
diff --git a/client/coral-embed-stream/src/tabs/profile/containers/Settings.js b/client/coral-embed-stream/src/tabs/profile/containers/Settings.js
index 795a3c10a..8535d95ca 100644
--- a/client/coral-embed-stream/src/tabs/profile/containers/Settings.js
+++ b/client/coral-embed-stream/src/tabs/profile/containers/Settings.js
@@ -3,6 +3,8 @@ import { compose, gql } from 'react-apollo';
 import Settings from '../components/Settings';
 import { withFragments } from 'coral-framework/hocs';
 import { getSlotFragmentSpreads } from 'coral-framework/utils';
+import { getDefinitionName } from 'coral-framework/utils';
+import DownloadCommentHistorySection from '../components/DownloadCommentHistorySection';
 
 const slots = ['profileSettings'];
 
@@ -18,7 +20,9 @@ const enhance = compose(
       fragment TalkEmbedStream_ProfileSettings_root on RootQuery {
         __typename
         ${getSlotFragmentSpreads(slots, 'root')}
+        ...${getDefinitionName(DownloadCommentHistorySection.fragments.root)}
       }
+      ${DownloadCommentHistorySection.fragments.root}
     `,
   })
 );
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 46fe0ac3c..1305a0746 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -12,6 +12,7 @@ const {
   LIST_OWN_TOKENS,
   VIEW_USER_STATUS,
   VIEW_USER_EMAIL,
+  VIEW_LAST_DOWNLOADED_DATE,
 } = require('../../perms/constants');
 const { property } = require('lodash');
 
@@ -64,6 +65,7 @@ decorateWithPermissionCheck(
     tokens: [LIST_OWN_TOKENS],
     profiles: [SEARCH_OTHER_USERS],
     comments: [SEARCH_OTHERS_COMMENTS],
+    lastAccountDownload: [VIEW_LAST_DOWNLOADED_DATE],
   },
   checkSelfField('id')
 );
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index c86db06df..714c9e2f9 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -238,6 +238,10 @@ type User {
 
   # returns user status
   state: UserState
+
+  # lastAccountDownload is the date that the user last requested a comment
+  # download.
+  lastAccountDownload: Date
 }
 
 # UserConnection represents a paginable subset of a user list.
diff --git a/locales/en.yml b/locales/en.yml
index b33ba24b2..f9fa56632 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -483,6 +483,17 @@ en:
   admin_sidebar:
     view_options: "View Options"
     sort_comments: "Sort Comments"
+  download_request:
+    section_title: "Download My Comment History"
+    you_will_get_a_copy: "You will recieve an email with a link to download your comment history. You can make"
+    download_rate: "one download request every 24 hours"
+    most_recent_request: "Your most recent request"
+    request: "Request Comment History"
+    rate_limit: "You can submit another Comment History request in {0}"
+    hours: "{0} hours"
+    days: "{0} days"
+    hour: "{0} hour"
+    day: "{0} day"
   download_landing:
     download_your_account: "Download Your Account"
     click_to_download: "Click below to download your account"
diff --git a/models/user.js b/models/user.js
index 717e43a88..9ab60c983 100644
--- a/models/user.js
+++ b/models/user.js
@@ -191,6 +191,13 @@ const UserSchema = new Schema(
     // Tags are added by the self or by administrators.
     tags: [TagLinkSchema],
 
+    // lastAccountDownload is the date that the user last downloaded their
+    // account details.
+    lastAccountDownload: {
+      type: Date,
+      default: null,
+    },
+
     // Additional metadata stored on the field.
     metadata: {
       default: {},
diff --git a/perms/constants/query.js b/perms/constants/query.js
index b846b15ce..531cf7aae 100644
--- a/perms/constants/query.js
+++ b/perms/constants/query.js
@@ -10,4 +10,5 @@ module.exports = {
   LIST_OWN_TOKENS: 'LIST_OWN_TOKENS',
   VIEW_USER_ROLE: 'VIEW_USER_ROLE',
   VIEW_USER_EMAIL: 'VIEW_USER_EMAIL',
+  VIEW_LAST_DOWNLOADED_DATE: 'VIEW_LAST_DOWNLOADED_DATE',
 };
diff --git a/perms/reducers/query.js b/perms/reducers/query.js
index 0852d8e2b..cbd789c6a 100644
--- a/perms/reducers/query.js
+++ b/perms/reducers/query.js
@@ -13,6 +13,7 @@ module.exports = (user, perm) => {
     case types.VIEW_PROTECTED_SETTINGS:
     case types.VIEW_USER_ROLE:
     case types.VIEW_USER_EMAIL:
+    case types.VIEW_LAST_DOWNLOADED_DATE:
       return check(user, ['ADMIN', 'MODERATOR']);
     case types.LIST_OWN_TOKENS:
       return check(user, ['ADMIN']);
diff --git a/services/users.js b/services/users.js
index cecbc32c5..b59224676 100644
--- a/services/users.js
+++ b/services/users.js
@@ -14,6 +14,7 @@ const i18n = require('./i18n');
 const Wordlist = require('./wordlist');
 const DomainList = require('./domain_list');
 const Limit = require('./limit');
+const moment = require('moment');
 
 const EMAIL_CONFIRM_JWT_SUBJECT = 'email_confirm';
 const PASSWORD_RESET_JWT_SUBJECT = 'password_reset';
@@ -479,6 +480,16 @@ class Users {
       throw errors.ErrMaxRateLimit;
     }
 
+    // Check if the lastAccountDownload time is within 24 hours.
+    if (
+      user.lastAccountDownload &&
+      moment(user.lastAccountDownload)
+        .add(24, 'hours')
+        .isAfter(moment())
+    ) {
+      throw errors.ErrMaxRateLimit;
+    }
+
     // The account currently does not have a download link, let's record the
     // download. This will throw an error if a race ocurred and we should stop
     // now.
@@ -498,6 +509,12 @@ class Users {
       },
       subject: i18n.t('email.download.subject'),
     });
+
+    // Amend the lastAccountDownload on the user.
+    await User.update(
+      { id: user.id },
+      { $set: { lastAccountDownload: new Date() } }
+    );
   }
 
   static async verifyDownloadToken(token) {
diff --git a/yarn.lock b/yarn.lock
index 07786f9c9..ba8e393c5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -68,7 +68,7 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@coralproject/eslint-config-talk@^0.1.0":
+"@coralproject/eslint-config-talk@^0.1.0", "@coralproject/eslint-config-talk@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@coralproject/eslint-config-talk/-/eslint-config-talk-0.1.1.tgz#71991b4937a3ffe657128d7f1170da4b5fb75c9e"
   dependencies:
@@ -174,6 +174,13 @@ accepts@^1.3.4, accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
+accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -228,6 +235,10 @@ acorn@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
+acorn@^5.5.0:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
@@ -1794,6 +1805,13 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+casual@^1.5.19:
+  version "1.5.19"
+  resolved "https://registry.yarnpkg.com/casual/-/casual-1.5.19.tgz#66fac46f7ae463f468f5913eb139f9c41c58bbf2"
+  dependencies:
+    mersenne-twister "^1.0.1"
+    moment "^2.15.2"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -2467,6 +2485,10 @@ crc32-stream@^2.0.0:
     crc "^3.4.4"
     readable-stream "^2.0.0"
 
+crc@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
+
 crc@^3.4.4:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
@@ -2966,7 +2988,7 @@ dns-prefetch-control@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
 
-doctrine@^2.0.0:
+doctrine@^2.0.0, doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -3107,6 +3129,10 @@ ejs@2.5.7, ejs@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
+ejs@^2.5.8:
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.8.tgz#2ab6954619f225e6193b7ac5f7c39c48fefe4380"
+
 electron-to-chromium@^1.2.7:
   version "1.3.26"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz#996427294861a74d9c7c82b9260ea301e8c02d66"
@@ -3402,6 +3428,49 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
+eslint@^4.19.1:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
+    esquery "^1.0.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    regexpp "^1.0.1"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "4.0.2"
+    text-table "~0.2.0"
+
 eslint@^4.5.0:
   version "4.13.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
@@ -3451,6 +3520,13 @@ espree@^3.5.2:
     acorn "^5.2.1"
     acorn-jsx "^3.0.0"
 
+espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  dependencies:
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
+
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -3625,6 +3701,20 @@ exports-loader@^0.6.4:
     loader-utils "^1.0.2"
     source-map "0.5.x"
 
+express-session@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.6.tgz#47b4160c88f42ab70fe8a508e31cbff76757ab0a"
+  dependencies:
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    crc "3.4.4"
+    debug "2.6.9"
+    depd "~1.1.1"
+    on-headers "~1.0.1"
+    parseurl "~1.3.2"
+    uid-safe "~2.1.5"
+    utils-merge "1.0.1"
+
 express-static-gzip@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-0.3.2.tgz#89ede84547a5717de3146315f62dc996c071a88d"
@@ -3666,6 +3756,41 @@ express@4.16.0, express@^4.12.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.16.3:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.3"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3863,6 +3988,18 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -5169,6 +5306,10 @@ ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
 
+ipaddr.js@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -7031,6 +7172,10 @@ merge@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
+mersenne-twister@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
+
 metascraper-author@^3.9.2:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-3.9.2.tgz#ff2020ac428f59a875d655df3b0d4bea171fde19"
@@ -7171,7 +7316,7 @@ miller-rabin@^4.0.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-"mime-db@>= 1.33.0 < 2":
+"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
@@ -7181,6 +7326,12 @@ mime-types@^2.1.10, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16,
   dependencies:
     mime-db "~1.30.0"
 
+mime-types@~2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
 mime@1.4.1, mime@^1.3.4, mime@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -7313,6 +7464,10 @@ moment@^2.10.3:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
 
+moment@^2.15.2:
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
+
 mongodb-core@2.1.17:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8"
@@ -8270,6 +8425,15 @@ passport-oauth2@1.x.x, passport-oauth2@^1.1.2:
     uid2 "0.0.x"
     utils-merge "1.x.x"
 
+passport-openidconnect@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/passport-openidconnect/-/passport-openidconnect-0.0.2.tgz#e488f8bdb386c9a9fd39c91d5ab8c880156e8153"
+  dependencies:
+    oauth "0.9.x"
+    passport-strategy "1.x.x"
+    request "^2.75.0"
+    webfinger "0.4.x"
+
 passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
@@ -8994,6 +9158,13 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
+proxy-addr@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.6.0"
+
 proxy-agent@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.0.0.tgz#57eb5347aa805d74ec681cb25649dba39c933499"
@@ -9244,6 +9415,10 @@ randexp@^0.4.2:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -9714,6 +9889,10 @@ regexp-clone@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
 
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -9864,6 +10043,33 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@^2.75.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -10078,7 +10284,7 @@ sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
-sax@^1.1.4, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
+sax@>=0.1.1, sax@^1.1.4, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -10217,7 +10423,7 @@ serve-static@1.13.0:
     parseurl "~1.3.2"
     send "0.16.0"
 
-serve-static@^1.10.0:
+serve-static@1.13.2, serve-static@^1.10.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   dependencies:
@@ -10634,6 +10840,10 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
+step@0.0.x:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz#143e7849a5d7d3f4a088fe29af94915216eeede2"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -10931,7 +11141,7 @@ symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-table@^4.0.1:
+table@4.0.2, table@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
@@ -11260,6 +11470,13 @@ type-is@~1.6.15:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -11334,6 +11551,12 @@ uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
+uid-safe@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  dependencies:
+    random-bytes "~1.0.0"
+
 uid2@0.0.x:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
@@ -11624,6 +11847,13 @@ watchpack@^1.4.0:
     chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
+webfinger@0.4.x:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d"
+  dependencies:
+    step "0.0.x"
+    xml2js "0.1.x"
+
 webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
@@ -11860,6 +12090,12 @@ xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
+xml2js@0.1.x:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c"
+  dependencies:
+    sax ">=0.1.1"
+
 xml@^1.0.0, xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"

From 1a39727e389c94589a2e6399f2d218d68f1bb514 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 3 Apr 2018 10:29:07 -0300
Subject: [PATCH 12/44] account history to user history

---
 .../src/components/AccountHistory.js          | 20 +++++++++----------
 .../coral-admin/src/components/UserDetail.js  |  2 +-
 locales/ar.yml                                |  4 ++--
 locales/da.yml                                |  4 ++--
 locales/de.yml                                |  4 ++--
 locales/en.yml                                |  4 ++--
 locales/es.yml                                |  4 ++--
 locales/fr.yml                                |  4 ++--
 locales/nl_NL.yml                             |  4 ++--
 locales/pt_BR.yml                             |  4 ++--
 locales/zh_CN.yml                             |  4 ++--
 locales/zh_TW.yml                             |  4 ++--
 12 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/client/coral-admin/src/components/AccountHistory.js b/client/coral-admin/src/components/AccountHistory.js
index 0d85b62af..6079187c6 100644
--- a/client/coral-admin/src/components/AccountHistory.js
+++ b/client/coral-admin/src/components/AccountHistory.js
@@ -43,15 +43,15 @@ const readableDuration = (startDate, endDate) => {
 const buildActionResponse = (typename, created_at, until, status) => {
   switch (typename) {
     case 'UsernameStatusHistory':
-      return t('account_history.username_status', status);
+      return t('user_history.username_status', status);
     case 'BannedStatusHistory':
       return status
-        ? t('account_history.user_banned')
-        : t('account_history.ban_removed');
+        ? t('user_history.user_banned')
+        : t('user_history.ban_removed');
     case 'SuspensionStatusHistory':
       return until
-        ? t('account_history.suspended', readableDuration(created_at, until))
-        : t('account_history.suspension_removed');
+        ? t('user_history.suspended', readableDuration(created_at, until))
+        : t('user_history.suspension_removed');
     default:
       return '-';
   }
@@ -62,7 +62,7 @@ const getModerationValue = assignedBy =>
     assignedBy.username
   ) : (
     <span>
-      <Icon name="computer" /> {t('account_history.system')}
+      <Icon name="computer" /> {t('user_history.system')}
     </span>
   );
 
@@ -79,14 +79,12 @@ class AccountHistory extends React.Component {
               'talk-admin-account-history-header-row'
             )}
           >
+            <div className={styles.headerRowItem}>{t('user_history.date')}</div>
             <div className={styles.headerRowItem}>
-              {t('account_history.date')}
+              {t('user_history.action')}
             </div>
             <div className={styles.headerRowItem}>
-              {t('account_history.action')}
-            </div>
-            <div className={styles.headerRowItem}>
-              {t('account_history.taken_by')}
+              {t('user_history.taken_by')}
             </div>
           </div>
           {userHistory.map(
diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 31ad999dc..7181a6f52 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -286,7 +286,7 @@ class UserDetail extends React.Component {
                 'talk-admin-user-detail-history-tab'
               )}
             >
-              {t('user_detail.account_history')}
+              {t('user_detail.user_history')}
             </Tab>
           </TabBar>
 
diff --git a/locales/ar.yml b/locales/ar.yml
index 3c94c06f0..98f6cc54e 100644
--- a/locales/ar.yml
+++ b/locales/ar.yml
@@ -438,8 +438,8 @@ ar:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/da.yml b/locales/da.yml
index 9618b2f58..0afe4c5ce 100644
--- a/locales/da.yml
+++ b/locales/da.yml
@@ -431,8 +431,8 @@ da:
     reports: "Rapporter"
     all: "Alle"
     rejected: "Afvist"
-    account_history: "Konto historik"
-  account_history:
+    user_history: "Konto historik"
+  user_history:
     user_banned: "Bruger bannet"
     ban_removed: "Ban fjernet"
     username_status: "Brugernavn {0}"
diff --git a/locales/de.yml b/locales/de.yml
index 972c2735b..6f7a1a66e 100644
--- a/locales/de.yml
+++ b/locales/de.yml
@@ -430,8 +430,8 @@ de:
     reports: "Meldungen"
     all: "Alle"
     rejected: "Abgelehnte"
-    account_history: "Konto-Verlauf"
-  account_history:
+    user_history: "Konto-Verlauf"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/en.yml b/locales/en.yml
index 08d64ddc8..6e4f82c0d 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -439,8 +439,8 @@ en:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/es.yml b/locales/es.yml
index ba6cb8ad3..e492aca6f 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -432,8 +432,8 @@ es:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/fr.yml b/locales/fr.yml
index dd14bea81..1f027d49a 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -432,8 +432,8 @@ fr:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/nl_NL.yml b/locales/nl_NL.yml
index aa80f58be..9d4057065 100644
--- a/locales/nl_NL.yml
+++ b/locales/nl_NL.yml
@@ -431,8 +431,8 @@ nl_NL:
     reports: "Rapportages"
     all: "Alle"
     rejected: "Afgewezen"
-    account_history: "Accountgeschiedenis"
-  account_history:
+    user_history: "Accountgeschiedenis"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/pt_BR.yml b/locales/pt_BR.yml
index 86267d51d..d9ef119ed 100644
--- a/locales/pt_BR.yml
+++ b/locales/pt_BR.yml
@@ -430,8 +430,8 @@ pt_BR:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/zh_CN.yml b/locales/zh_CN.yml
index 59e028eb7..b3307a886 100644
--- a/locales/zh_CN.yml
+++ b/locales/zh_CN.yml
@@ -432,8 +432,8 @@ zh_CN:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"
diff --git a/locales/zh_TW.yml b/locales/zh_TW.yml
index 1b131f636..c186a667f 100644
--- a/locales/zh_TW.yml
+++ b/locales/zh_TW.yml
@@ -432,8 +432,8 @@ zh_TW:
     reports: "Reports"
     all: "All"
     rejected: "Rejected"
-    account_history: "Account History"
-  account_history:
+    user_history: "User History"
+  user_history:
     user_banned: "User banned"
     ban_removed: "Ban removed"
     username_status: "Username {0}"

From ef10ab80888c33063f22aadb2f4320277ccc9393 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 3 Apr 2018 11:20:22 -0300
Subject: [PATCH 13/44] Renaming components and styles

---
 .../{AccountHistory.css => UserHistory.css}   |  0
 .../{AccountHistory.js => UserHistory.js}     | 20 +++++++-------
 package-lock.json                             | 27 +++++++++++++++++++
 test/e2e/page_objects/admin.js                |  4 +--
 test/e2e/specs/06_suspendUser.js              |  2 +-
 5 files changed, 40 insertions(+), 13 deletions(-)
 rename client/coral-admin/src/components/{AccountHistory.css => UserHistory.css} (100%)
 rename client/coral-admin/src/components/{AccountHistory.js => UserHistory.js} (86%)
 create mode 100644 package-lock.json

diff --git a/client/coral-admin/src/components/AccountHistory.css b/client/coral-admin/src/components/UserHistory.css
similarity index 100%
rename from client/coral-admin/src/components/AccountHistory.css
rename to client/coral-admin/src/components/UserHistory.css
diff --git a/client/coral-admin/src/components/AccountHistory.js b/client/coral-admin/src/components/UserHistory.js
similarity index 86%
rename from client/coral-admin/src/components/AccountHistory.js
rename to client/coral-admin/src/components/UserHistory.js
index 6079187c6..3a3472c86 100644
--- a/client/coral-admin/src/components/AccountHistory.js
+++ b/client/coral-admin/src/components/UserHistory.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { murmur3 } from 'murmurhash-js';
-import styles from './AccountHistory.css';
+import styles from './UserHistory.css';
 import cn from 'classnames';
 import flatten from 'lodash/flatten';
 import orderBy from 'lodash/orderBy';
@@ -66,17 +66,17 @@ const getModerationValue = assignedBy =>
     </span>
   );
 
-class AccountHistory extends React.Component {
+class UserHistory extends React.Component {
   render() {
     const { user } = this.props;
     const userHistory = buildUserHistory(user.state);
     return (
       <div>
-        <div className={cn(styles.table, 'talk-admin-account-history')}>
+        <div className={cn(styles.table, 'talk-admin-user-history')}>
           <div
             className={cn(
               styles.headerRow,
-              'talk-admin-account-history-header-row'
+              'talk-admin-user-history-header-row'
             )}
           >
             <div className={styles.headerRowItem}>{t('user_history.date')}</div>
@@ -90,13 +90,13 @@ class AccountHistory extends React.Component {
           {userHistory.map(
             ({ __typename, created_at, assigned_by, until, status }) => (
               <div
-                className={cn(styles.row, 'talk-admin-account-history-row')}
+                className={cn(styles.row, 'talk-admin-user-history-row')}
                 key={`${__typename}_${murmur3(created_at)}`}
               >
                 <div
                   className={cn(
                     styles.item,
-                    'talk-admin-account-history-row-date'
+                    'talk-admin-user-history-row-date'
                   )}
                 >
                   {moment(new Date(created_at)).format('MMM DD, YYYY')}
@@ -105,7 +105,7 @@ class AccountHistory extends React.Component {
                   className={cn(
                     styles.item,
                     styles.action,
-                    'talk-admin-account-history-row-status'
+                    'talk-admin-user-history-row-status'
                   )}
                 >
                   {buildActionResponse(__typename, created_at, until, status)}
@@ -114,7 +114,7 @@ class AccountHistory extends React.Component {
                   className={cn(
                     styles.item,
                     styles.username,
-                    'talk-admin-account-history-row-assigned-by'
+                    'talk-admin-user-history-row-assigned-by'
                   )}
                 >
                   {getModerationValue(assigned_by)}
@@ -128,8 +128,8 @@ class AccountHistory extends React.Component {
   }
 }
 
-AccountHistory.propTypes = {
+UserHistory.propTypes = {
   user: PropTypes.object.isRequired,
 };
 
-export default AccountHistory;
+export default UserHistory;
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..d6105c594
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,27 @@
+{
+  "name": "talk",
+  "version": "4.3.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "exenv": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/exenv/-/exenv-1.2.2.tgz",
+      "integrity": "sha1-KueOhdmJQVhnCwPUe+wfA72Ru50="
+    },
+    "react-side-effect": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/react-side-effect/-/react-side-effect-1.1.5.tgz",
+      "integrity": "sha512-Z2ZJE4p/jIfvUpiUMRydEVpQRf2f8GMHczT6qLcARmX7QRb28JDBTpnM2g/i5y/p7ZDEXYGHWg0RbhikE+hJRw==",
+      "requires": {
+        "exenv": "1.2.2",
+        "shallowequal": "1.0.2"
+      }
+    },
+    "shallowequal": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.0.2.tgz",
+      "integrity": "sha512-zlVXeVUKvo+HEv1e2KQF/csyeMKx2oHvatQ9l6XjCUj3agvC8XGf6R9HvIPDSmp8FNPvx7b5kaEJTRi7CqxtEw=="
+    }
+  }
+}
diff --git a/test/e2e/page_objects/admin.js b/test/e2e/page_objects/admin.js
index 218afe425..8e319e499 100644
--- a/test/e2e/page_objects/admin.js
+++ b/test/e2e/page_objects/admin.js
@@ -128,8 +128,8 @@ module.exports = {
         rejectedTab: '.talk-admin-user-detail-rejected-tab',
         historyTab: '.talk-admin-user-detail-history-tab',
         historyPane: '.talk-admin-user-detail-history-tab-pane',
-        accountHistory: '.talk-admin-account-history',
-        accountHistoryRowStatus: '.talk-admin-account-history-row-status',
+        UserHistory: '.talk-admin-user-history',
+        UserHistoryRowStatus: '.talk-admin-user-history-row-status',
         actionsMenu: '.talk-admin-user-detail-actions-button',
         actionItemSuspendUser: '.action-menu-item#suspendUser',
         actionMenuButton:
diff --git a/test/e2e/specs/06_suspendUser.js b/test/e2e/specs/06_suspendUser.js
index 0b89c5c01..81fde3781 100644
--- a/test/e2e/specs/06_suspendUser.js
+++ b/test/e2e/specs/06_suspendUser.js
@@ -125,7 +125,7 @@ module.exports = {
       .waitForElementVisible('@historyTab')
       .click('@historyTab')
       .waitForElementVisible('@historyPane')
-      .waitForElementVisible('@accountHistory')
+      .waitForElementVisible('@UserHistory')
       .click('@closeButton');
   },
   'admin logs out': client => {

From 06f8926964abebf667bf332415973d250b07b1a7 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 4 Apr 2018 07:25:47 -0300
Subject: [PATCH 14/44] Avoiding refetching

---
 .../coral-admin/src/components/UserDetail.js  | 20 ++++++-------------
 .../coral-admin/src/containers/UserDetail.js  |  3 ++-
 client/coral-framework/graphql/mutations.js   |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 31ad999dc..90df62f4a 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -28,16 +28,6 @@ import UserInfoTooltip from './UserInfoTooltip';
 import t from 'coral-framework/services/i18n';
 
 class UserDetail extends React.Component {
-  rejectThenReload = async info => {
-    await this.props.rejectComment(info);
-    this.props.data.refetch();
-  };
-
-  acceptThenReload = async info => {
-    await this.props.acceptComment(info);
-    this.props.data.refetch();
-  };
-
   bulkAcceptThenReload = async () => {
     await this.props.bulkAccept();
     this.props.data.refetch();
@@ -110,6 +100,8 @@ class UserDetail extends React.Component {
       unbanUser,
       unsuspendUser,
       modal,
+      acceptComment,
+      rejectComment,
     } = this.props;
 
     // if totalComments is 0, you're dividing by zero
@@ -304,8 +296,8 @@ class UserDetail extends React.Component {
                 loadMore={loadMore}
                 toggleSelect={toggleSelect}
                 viewUserDetail={viewUserDetail}
-                acceptComment={this.acceptThenReload}
-                rejectComment={this.rejectThenReload}
+                acceptComment={acceptComment}
+                rejectComment={rejectComment}
                 selectedCommentIds={selectedCommentIds}
                 toggleSelectAll={toggleSelectAll}
                 bulkAcceptThenReload={this.bulkAcceptThenReload}
@@ -322,8 +314,8 @@ class UserDetail extends React.Component {
                 loadMore={loadMore}
                 toggleSelect={toggleSelect}
                 viewUserDetail={viewUserDetail}
-                acceptComment={this.acceptThenReload}
-                rejectComment={this.rejectThenReload}
+                acceptComment={acceptComment}
+                rejectComment={rejectComment}
                 selectedCommentIds={selectedCommentIds}
                 toggleSelectAll={toggleSelectAll}
                 bulkAcceptThenReload={this.bulkAcceptThenReload}
diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index fb1508a2f..73b46db3c 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -109,6 +109,7 @@ class UserDetailContainer extends React.Component {
   componentWillReceiveProps(next) {
     if (this.props.userId === null && next.userId) {
       next.data.refetch();
+      console.log('fetching');
     }
   }
 
@@ -148,6 +149,7 @@ UserDetailContainer.propTypes = {
   selectedCommentIds: PropTypes.array,
   unbanUser: PropTypes.func.isRequired,
   unsuspendUser: PropTypes.func.isRequired,
+  userId: PropTypes.string,
 };
 
 const LOAD_MORE_QUERY = gql`
@@ -245,7 +247,6 @@ export const withUserDetailQuery = withQuery(
     options: ({ userId, statuses }) => {
       return {
         variables: { author_id: userId, statuses },
-        fetchPolicy: 'network-only',
       };
     },
     skip: ownProps => !ownProps.userId,
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 1b3b4c6fc..0c8d404f6 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -180,7 +180,7 @@ export const withSetCommentStatus = withMutation(
             const fragmentId = `Comment_${commentId}`;
 
             const data = proxy.readFragment({ fragment, id: fragmentId });
-
+            console.log('data', data);
             data.status = status;
             data.status_history = data.status_history
               ? data.status_history

From a6a0b3e93174f8eb915f29ff257fcfa818c531f7 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 4 Apr 2018 07:33:50 -0300
Subject: [PATCH 15/44] Removing reloads

---
 .../coral-admin/src/components/UserDetail.js  | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 90df62f4a..22a85ac88 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -28,16 +28,6 @@ import UserInfoTooltip from './UserInfoTooltip';
 import t from 'coral-framework/services/i18n';
 
 class UserDetail extends React.Component {
-  bulkAcceptThenReload = async () => {
-    await this.props.bulkAccept();
-    this.props.data.refetch();
-  };
-
-  bulkRejectThenReload = async () => {
-    await this.props.bulkReject();
-    this.props.data.refetch();
-  };
-
   changeTab = tab => {
     this.props.changeTab(tab);
   };
@@ -102,6 +92,8 @@ class UserDetail extends React.Component {
       modal,
       acceptComment,
       rejectComment,
+      bulkAccept,
+      bulkReject,
     } = this.props;
 
     // if totalComments is 0, you're dividing by zero
@@ -300,8 +292,8 @@ class UserDetail extends React.Component {
                 rejectComment={rejectComment}
                 selectedCommentIds={selectedCommentIds}
                 toggleSelectAll={toggleSelectAll}
-                bulkAcceptThenReload={this.bulkAcceptThenReload}
-                bulkRejectThenReload={this.bulkRejectThenReload}
+                bulkAcceptThenReload={bulkAccept}
+                bulkRejectThenReload={bulkReject}
               />
             </TabPane>
             <TabPane
@@ -318,8 +310,8 @@ class UserDetail extends React.Component {
                 rejectComment={rejectComment}
                 selectedCommentIds={selectedCommentIds}
                 toggleSelectAll={toggleSelectAll}
-                bulkAcceptThenReload={this.bulkAcceptThenReload}
-                bulkRejectThenReload={this.bulkRejectThenReload}
+                bulkAcceptThenReload={bulkAccept}
+                bulkRejectThenReload={bulkReject}
               />
             </TabPane>
             <TabPane

From 0b6b85b2a53428ee39434bb70aa35422c1d2a194 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Wed, 4 Apr 2018 07:37:27 -0300
Subject: [PATCH 16/44] Removing logs

---
 client/coral-admin/src/containers/UserDetail.js | 1 -
 client/coral-framework/graphql/mutations.js     | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/coral-admin/src/containers/UserDetail.js b/client/coral-admin/src/containers/UserDetail.js
index 73b46db3c..360819dd6 100644
--- a/client/coral-admin/src/containers/UserDetail.js
+++ b/client/coral-admin/src/containers/UserDetail.js
@@ -109,7 +109,6 @@ class UserDetailContainer extends React.Component {
   componentWillReceiveProps(next) {
     if (this.props.userId === null && next.userId) {
       next.data.refetch();
-      console.log('fetching');
     }
   }
 
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 0c8d404f6..1b3b4c6fc 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -180,7 +180,7 @@ export const withSetCommentStatus = withMutation(
             const fragmentId = `Comment_${commentId}`;
 
             const data = proxy.readFragment({ fragment, id: fragmentId });
-            console.log('data', data);
+
             data.status = status;
             data.status_history = data.status_history
               ? data.status_history

From 0c6ee2fe992bf86179da3ddfd7123fd8047ed7d4 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 5 Apr 2018 10:33:38 -0600
Subject: [PATCH 17/44] updated yarn.lock

---
 yarn.lock | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 273 insertions(+), 6 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 07a395260..f97cf762f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -68,7 +68,7 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@coralproject/eslint-config-talk@^0.1.0":
+"@coralproject/eslint-config-talk@^0.1.0", "@coralproject/eslint-config-talk@^0.1.1":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@coralproject/eslint-config-talk/-/eslint-config-talk-0.1.1.tgz#71991b4937a3ffe657128d7f1170da4b5fb75c9e"
   dependencies:
@@ -126,6 +126,12 @@
     to-title-case "~1.0.0"
     url-regex "~4.1.1"
 
+"@types/form-data@*":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@types/form-data/-/form-data-2.2.1.tgz#ee2b3b8eaa11c0938289953606b745b738c54b1e"
+  dependencies:
+    "@types/node" "*"
+
 "@types/graphql@0.10.2":
   version "0.10.2"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.10.2.tgz#d7c79acbaa17453b6681c80c34b38fcb10c4c08c"
@@ -138,10 +144,25 @@
   version "0.9.4"
   resolved "https://registry.yarnpkg.com/@types/graphql/-/graphql-0.9.4.tgz#cdeb6bcbef9b6c584374b81aa7f48ecf3da404fa"
 
+"@types/lodash@^4.14.50":
+  version "4.14.106"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.106.tgz#6093e9a02aa567ddecfe9afadca89e53e5dce4dd"
+
 "@types/node@*":
   version "8.0.53"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
 
+"@types/node@^7.0.0":
+  version "7.0.59"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.59.tgz#fd7dceba9521c2d62c3e0eda8c5d704bf88b261d"
+
+"@types/request@^0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/request/-/request-0.0.39.tgz#168b96cf4253c5d54d403f746f82ee7aed47ce2c"
+  dependencies:
+    "@types/form-data" "*"
+    "@types/node" "*"
+
 "@types/ws@^3.0.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-3.2.0.tgz#988ff690e6ed10068a86aa0e9f842d0a03c09e21"
@@ -174,6 +195,13 @@ accepts@^1.3.4, accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
+accepts@~1.3.5:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
+  dependencies:
+    mime-types "~2.1.18"
+    negotiator "0.6.1"
+
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -228,6 +256,10 @@ acorn@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
+acorn@^5.5.0:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
@@ -1770,6 +1802,13 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
+casual@^1.5.19:
+  version "1.5.19"
+  resolved "https://registry.yarnpkg.com/casual/-/casual-1.5.19.tgz#66fac46f7ae463f468f5913eb139f9c41c58bbf2"
+  dependencies:
+    mersenne-twister "^1.0.1"
+    moment "^2.15.2"
+
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -2427,6 +2466,10 @@ cosmiconfig@^4.0.0, cosmiconfig@~4.0.0:
     parse-json "^4.0.0"
     require-from-string "^2.0.1"
 
+crc@3.4.4:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
+
 create-ecdh@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
@@ -2916,7 +2959,7 @@ dns-prefetch-control@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
 
-doctrine@^2.0.0:
+doctrine@^2.0.0, doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -3057,6 +3100,10 @@ ejs@2.5.7, ejs@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
+ejs@^2.5.8:
+  version "2.5.8"
+  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.8.tgz#2ab6954619f225e6193b7ac5f7c39c48fefe4380"
+
 electron-to-chromium@^1.2.7:
   version "1.3.26"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz#996427294861a74d9c7c82b9260ea301e8c02d66"
@@ -3352,6 +3399,49 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
+eslint@^4.19.1:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
+    esquery "^1.0.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    regexpp "^1.0.1"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "4.0.2"
+    text-table "~0.2.0"
+
 eslint@^4.5.0:
   version "4.13.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
@@ -3401,6 +3491,13 @@ espree@^3.5.2:
     acorn "^5.2.1"
     acorn-jsx "^3.0.0"
 
+espree@^3.5.4:
+  version "3.5.4"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
+  dependencies:
+    acorn "^5.5.0"
+    acorn-jsx "^3.0.0"
+
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -3575,6 +3672,20 @@ exports-loader@^0.6.4:
     loader-utils "^1.0.2"
     source-map "0.5.x"
 
+express-session@^1.15.6:
+  version "1.15.6"
+  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.6.tgz#47b4160c88f42ab70fe8a508e31cbff76757ab0a"
+  dependencies:
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    crc "3.4.4"
+    debug "2.6.9"
+    depd "~1.1.1"
+    on-headers "~1.0.1"
+    parseurl "~1.3.2"
+    uid-safe "~2.1.5"
+    utils-merge "1.0.1"
+
 express-static-gzip@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-0.3.2.tgz#89ede84547a5717de3146315f62dc996c071a88d"
@@ -3616,6 +3727,41 @@ express@4.16.0, express@^4.12.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+express@^4.16.3:
+  version "4.16.3"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
+  dependencies:
+    accepts "~1.3.5"
+    array-flatten "1.1.1"
+    body-parser "1.18.2"
+    content-disposition "0.5.2"
+    content-type "~1.0.4"
+    cookie "0.3.1"
+    cookie-signature "1.0.6"
+    debug "2.6.9"
+    depd "~1.1.2"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    etag "~1.8.1"
+    finalhandler "1.1.1"
+    fresh "0.5.2"
+    merge-descriptors "1.0.1"
+    methods "~1.1.2"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    path-to-regexp "0.1.7"
+    proxy-addr "~2.0.3"
+    qs "6.5.1"
+    range-parser "~1.2.0"
+    safe-buffer "5.1.1"
+    send "0.16.2"
+    serve-static "1.13.2"
+    setprototypeof "1.1.0"
+    statuses "~1.4.0"
+    type-is "~1.6.16"
+    utils-merge "1.0.1"
+    vary "~1.1.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3813,6 +3959,18 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
+finalhandler@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.2"
+    statuses "~1.4.0"
+    unpipe "~1.0.0"
+
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -4123,6 +4281,16 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+gigya@2.0.33:
+  version "2.0.33"
+  resolved "https://registry.yarnpkg.com/gigya/-/gigya-2.0.33.tgz#c5845cd16fac8ebcfb5e727e1ebe9e51352482fb"
+  dependencies:
+    "@types/lodash" "^4.14.50"
+    "@types/node" "^7.0.0"
+    "@types/request" "^0.0.39"
+    lodash "^4.17.4"
+    request "^2.79.0"
+
 git-up@^2.0.0:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/git-up/-/git-up-2.0.9.tgz#219bfd27c82daeead8495beb386dc18eae63636d"
@@ -5119,6 +5287,10 @@ ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
 
+ipaddr.js@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
+
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -6975,6 +7147,10 @@ merge@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
+mersenne-twister@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
+
 metascraper-author@^3.9.2:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-3.9.2.tgz#ff2020ac428f59a875d655df3b0d4bea171fde19"
@@ -7115,7 +7291,7 @@ miller-rabin@^4.0.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-"mime-db@>= 1.33.0 < 2":
+"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
@@ -7125,6 +7301,12 @@ mime-types@^2.1.10, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16,
   dependencies:
     mime-db "~1.30.0"
 
+mime-types@~2.1.18:
+  version "2.1.18"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
+  dependencies:
+    mime-db "~1.33.0"
+
 mime@1.4.1, mime@^1.3.4, mime@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -7257,6 +7439,10 @@ moment@^2.10.3:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
 
+moment@^2.15.2:
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
+
 mongodb-core@2.1.17:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8"
@@ -8214,6 +8400,15 @@ passport-oauth2@1.x.x, passport-oauth2@^1.1.2:
     uid2 "0.0.x"
     utils-merge "1.x.x"
 
+passport-openidconnect@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/passport-openidconnect/-/passport-openidconnect-0.0.2.tgz#e488f8bdb386c9a9fd39c91d5ab8c880156e8153"
+  dependencies:
+    oauth "0.9.x"
+    passport-strategy "1.x.x"
+    request "^2.75.0"
+    webfinger "0.4.x"
+
 passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
@@ -8938,6 +9133,13 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
+proxy-addr@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
+  dependencies:
+    forwarded "~0.1.2"
+    ipaddr.js "1.6.0"
+
 proxy-agent@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.0.0.tgz#57eb5347aa805d74ec681cb25649dba39c933499"
@@ -9188,6 +9390,10 @@ randexp@^0.4.2:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
+random-bytes@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
+
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -9658,6 +9864,10 @@ regexp-clone@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
 
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -9808,6 +10018,33 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
+request@^2.75.0:
+  version "2.85.0"
+  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
+  dependencies:
+    aws-sign2 "~0.7.0"
+    aws4 "^1.6.0"
+    caseless "~0.12.0"
+    combined-stream "~1.0.5"
+    extend "~3.0.1"
+    forever-agent "~0.6.1"
+    form-data "~2.3.1"
+    har-validator "~5.0.3"
+    hawk "~6.0.2"
+    http-signature "~1.2.0"
+    is-typedarray "~1.0.0"
+    isstream "~0.1.2"
+    json-stringify-safe "~5.0.1"
+    mime-types "~2.1.17"
+    oauth-sign "~0.8.2"
+    performance-now "^2.1.0"
+    qs "~6.5.1"
+    safe-buffer "^5.1.1"
+    stringstream "~0.0.5"
+    tough-cookie "~2.3.3"
+    tunnel-agent "^0.6.0"
+    uuid "^3.1.0"
+
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -10022,7 +10259,7 @@ sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
-sax@^1.1.4, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
+sax@>=0.1.1, sax@^1.1.4, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -10161,7 +10398,7 @@ serve-static@1.13.0:
     parseurl "~1.3.2"
     send "0.16.0"
 
-serve-static@^1.10.0:
+serve-static@1.13.2, serve-static@^1.10.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   dependencies:
@@ -10578,6 +10815,10 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
+step@0.0.x:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz#143e7849a5d7d3f4a088fe29af94915216eeede2"
+
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -10875,7 +11116,7 @@ symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-table@^4.0.1:
+table@4.0.2, table@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
@@ -11195,6 +11436,13 @@ type-is@~1.6.15:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
+type-is@~1.6.16:
+  version "1.6.16"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.18"
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -11269,6 +11517,12 @@ uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
+uid-safe@~2.1.5:
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
+  dependencies:
+    random-bytes "~1.0.0"
+
 uid2@0.0.x:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
@@ -11559,6 +11813,13 @@ watchpack@^1.4.0:
     chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
+webfinger@0.4.x:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d"
+  dependencies:
+    step "0.0.x"
+    xml2js "0.1.x"
+
 webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
@@ -11795,6 +12056,12 @@ xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
+xml2js@0.1.x:
+  version "0.1.14"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c"
+  dependencies:
+    sax ">=0.1.1"
+
 xml@^1.0.0, xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"

From 9bbcb6a073d0c26f6b7ff0dba22d611acb9c3a03 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Fri, 6 Apr 2018 18:39:23 -0300
Subject: [PATCH 18/44] wip - inconcistencies with cache, considering
 refetching

---
 .../coral-admin/src/components/UserDetail.js  |  2 ++
 client/coral-framework/graphql/mutations.js   | 35 ++++++++++++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 22a85ac88..02de6f47b 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -96,6 +96,8 @@ class UserDetail extends React.Component {
       bulkReject,
     } = this.props;
 
+    console.log(rejectedComments, totalComments);
+
     // if totalComments is 0, you're dividing by zero
     let rejectedPercent = rejectedComments / totalComments * 100;
 
diff --git a/client/coral-framework/graphql/mutations.js b/client/coral-framework/graphql/mutations.js
index 1b3b4c6fc..bd31be630 100644
--- a/client/coral-framework/graphql/mutations.js
+++ b/client/coral-framework/graphql/mutations.js
@@ -1,5 +1,6 @@
 import { gql } from 'react-apollo';
 import withMutation from '../hocs/withMutation';
+import update from 'immutability-helper';
 
 function convertItemType(item_type) {
   switch (item_type) {
@@ -167,9 +168,39 @@ export const withSetCommentStatus = withMutation(
               errors: null,
             },
           },
+          updateQueries: {
+            CoralAdmin_UserDetail: prev => {
+              const increment = {
+                rejectedComments: {
+                  $apply: count =>
+                    count < prev.totalComments ? count + 1 : count,
+                },
+              };
+
+              const decrement = {
+                rejectedComments: {
+                  $apply: count => (count > 0 ? count - 1 : 0),
+                },
+              };
+
+              // If rejected then increment rejectedComments by one
+              if (status === 'REJECTED') {
+                const updated = update(prev, increment);
+                return updated;
+              }
+
+              // If approved then decrement rejectedComments by one
+              if (status === 'ACCEPTED') {
+                const updated = update(prev, decrement);
+                return updated;
+              }
+
+              return prev;
+            },
+          },
           update: proxy => {
             const fragment = gql`
-              fragment Talk_SetCommentStatus on Comment {
+              fragment Talk_SetCommentStatus_Comment on Comment {
                 status
                 status_history {
                   type
@@ -182,9 +213,11 @@ export const withSetCommentStatus = withMutation(
             const data = proxy.readFragment({ fragment, id: fragmentId });
 
             data.status = status;
+
             data.status_history = data.status_history
               ? data.status_history
               : [];
+
             data.status_history.push({
               __typename: 'CommentStatusHistory',
               type: status,

From 6d4623f8bfaf1b1f1a60a8a95bda7fcb8ba746ca Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Mon, 9 Apr 2018 17:43:58 -0300
Subject: [PATCH 19/44] Wip - Almost finished!

---
 client/coral-admin/src/AppRouter.js           |  2 +
 .../routes/Configure/components/Configure.js  |  2 +-
 .../components/OrganizationSettings.css       | 48 +++++++++++
 .../components/OrganizationSettings.js        | 84 ++++++++++++++-----
 .../components/ConfigureCard.js               |  2 +-
 5 files changed, 115 insertions(+), 23 deletions(-)

diff --git a/client/coral-admin/src/AppRouter.js b/client/coral-admin/src/AppRouter.js
index 28255aeb5..360ceaa93 100644
--- a/client/coral-admin/src/AppRouter.js
+++ b/client/coral-admin/src/AppRouter.js
@@ -10,6 +10,7 @@ import Configure from 'routes/Configure';
 import StreamSettings from './routes/Configure/containers/StreamSettings';
 import ModerationSettings from './routes/Configure/containers/ModerationSettings';
 import TechSettings from './routes/Configure/containers/TechSettings';
+import OrganizationSettings from './routes/Configure/containers/OrganizationSettings';
 
 import { ModerationLayout, Moderation } from 'routes/Moderation';
 
@@ -25,6 +26,7 @@ const routes = (
         <Route path="stream" component={StreamSettings} />
         <Route path="moderation" component={ModerationSettings} />
         <Route path="tech" component={TechSettings} />
+        <Route path="organization" component={OrganizationSettings} />
         <IndexRedirect to="stream" />
       </Route>
 
diff --git a/client/coral-admin/src/routes/Configure/components/Configure.js b/client/coral-admin/src/routes/Configure/components/Configure.js
index fe3df3e81..69ab4f06c 100644
--- a/client/coral-admin/src/routes/Configure/components/Configure.js
+++ b/client/coral-admin/src/routes/Configure/components/Configure.js
@@ -42,7 +42,7 @@ class Configure extends React.Component {
               {t('configure.tech_settings')}
             </Item>
             <Item itemId="organization" icon="people">
-              {t('configure.organization_settings')}
+              {t('configure.organization_information')}
             </Item>
           </List>
           <div className={styles.saveBox}>
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index 4902e37a3..06ada55c4 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -1,3 +1,51 @@
 .label {
   display: block;
+}
+
+.detailList {
+  padding: 0;
+  margin: 0;
+}
+
+.detailLabel {
+  color: #000;
+  font-size: 1.1em;
+  font-weight: bold;
+  display: block;
+  margin-bottom: 8px; 
+}
+
+.detailValue {
+  padding: 6px 10px;
+  border: solid 1px transparent;
+  display: block;
+  font-size: 1em;
+  border-radius: 2px;
+}
+
+.editable {
+  border-color: grey;
+}
+
+.detailItem {
+  margin-bottom: 16px;
+  list-style: none;
+}
+
+.editButton {
+  position: absolute;
+  right: 10px;
+  top: 10px;
+}
+
+.actionBox {
+  position: absolute;
+  right: 10px;
+  top: 10px; 
+  text-align: center;
+}
+
+.cancelButton {
+  padding: 10px;
+  display: block;
 }
\ No newline at end of file
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
index 684b61751..18fe653e1 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
@@ -1,6 +1,7 @@
 import React from 'react';
+import cn from 'classnames';
+import { Button } from 'coral-ui';
 import PropTypes from 'prop-types';
-import { Textfield } from 'react-mdl';
 import styles from './OrganizationSettings.css';
 import Slot from 'coral-framework/components/Slot';
 import t from 'coral-framework/services/i18n';
@@ -8,6 +9,19 @@ import ConfigurePage from './ConfigurePage';
 import ConfigureCard from 'coral-framework/components/ConfigureCard';
 
 class OrganizationSettings extends React.Component {
+  state = { editing: false };
+
+  toggleEditing = () => {
+    this.setState(({ editing }) => ({
+      editing: !editing,
+    }));
+  };
+
+  updateName = event => {
+    const updater = { organizationName: { $set: event.target.value } };
+    this.props.updatePending({ updater });
+  };
+
   updateEmail = event => {
     const updater = { organizationContactEmail: { $set: event.target.value } };
     this.props.updatePending({ updater });
@@ -15,37 +29,65 @@ class OrganizationSettings extends React.Component {
 
   render() {
     const { settings, slotPassthrough } = this.props;
-
     return (
       <ConfigurePage title={t('configure.organization_information')}>
         <p>{t('configure.organization_info_copy')}</p>
-        <p>{t('configure.organization_info_copy2')}</p>
-        <ConfigureCard title={t('configure.organization_details')}>
-          <ul>
-            <li>
-              {t('configure.organization_name')}: {settings.organizationName}
-            </li>
-            <li>
-              {t('configure.organization_contact_email')}:{' '}
+        <p>{t('configure.organization_info_copy_2')}</p>
+        <ConfigureCard>
+          {!this.state.editing ? (
+            <Button
+              className={styles.editButton}
+              icon="settings"
+              onClick={this.toggleEditing}
+            >
+              Edit Info
+            </Button>
+          ) : (
+            <div className={styles.actionBox}>
+              <Button icon="done" onClick={this.toggleEditing}>
+                Save
+              </Button>
+              <a className={styles.cancelButton}>Cancel</a>
+            </div>
+          )}
+
+          {console.log(this.props.slotPassthrough)}
+
+          <ul className={styles.detailList}>
+            <li className={styles.detailItem}>
+              <label
+                className={styles.detailLabel}
+                id={t('configure.organization_name')}
+              >
+                {t('configure.organization_name')}
+              </label>
               <input
-                defaultValue={settings.organizationContactEmail}
-                readOnly
+                type="text"
+                className={cn(styles.detailValue, {
+                  [styles.editable]: this.state.editing,
+                })}
+                onChange={this.updateName}
+                value={settings.organizationName}
+                id={t('configure.organization_name')}
+                readOnly={!this.state.editing}
               />
             </li>
-          </ul>
-        </ConfigureCard>
-        <ConfigureCard title={'Edit Organization Settings'}>
-          <ul>
-            <li>
-              <label className={styles.label}>
+            <li className={styles.detailItem}>
+              <label
+                className={styles.detailLabel}
+                id={t('configure.organization_contact_email')}
+              >
                 {t('configure.organization_contact_email')}
               </label>
-
-              <Textfield
+              <input
                 type="text"
+                className={cn(styles.detailValue, {
+                  [styles.editable]: this.state.editing,
+                })}
                 onChange={this.updateEmail}
                 value={settings.organizationContactEmail}
-                label={t('configure.organizationContactEmail')}
+                id={t('configure.organization_contact_email')}
+                readOnly={!this.state.editing}
               />
             </li>
           </ul>
diff --git a/client/coral-framework/components/ConfigureCard.js b/client/coral-framework/components/ConfigureCard.js
index 703733a7d..7a2872318 100644
--- a/client/coral-framework/components/ConfigureCard.js
+++ b/client/coral-framework/components/ConfigureCard.js
@@ -43,7 +43,7 @@ const ConfigureCard = ({
 );
 
 ConfigureCard.propTypes = {
-  title: PropTypes.string.isRequired,
+  title: PropTypes.string,
   className: PropTypes.string,
   onCheckbox: PropTypes.func,
   checked: PropTypes.bool,

From 5941bfac7cb919d5ef8295a271afc3b56e1f1e51 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 9 Apr 2018 15:52:40 -0600
Subject: [PATCH 20/44] pulled data download into seperate plugin

---
 .../coral-embed-stream/src/graphql/index.js   |  12 -
 .../DownloadCommentHistorySection.css         |  12 -
 .../DownloadCommentHistorySection.js          | 109 --------
 .../src/tabs/profile/components/Settings.js   |   2 -
 .../src/tabs/profile/containers/Settings.js   |   4 -
 graph/mutators/user.js                        |  10 -
 graph/resolvers/comment.js                    |   4 +
 graph/resolvers/root_mutation.js              |   3 -
 graph/resolvers/user.js                       |   2 -
 graph/typeDefs.graphql                        |  14 -
 locales/en.yml                                |  19 --
 models/user.js                                |   7 -
 package.json                                  |   2 -
 perms/constants/mutation.js                   |   1 -
 perms/constants/query.js                      |   1 -
 perms/reducers/mutation.js                    |   1 -
 perms/reducers/query.js                       |   1 -
 plugins.default.json                          |   6 +-
 routes/account/index.js                       |   4 -
 routes/api/v1/account.js                      | 140 ----------
 services/mailer/templates/download.html.ejs   |   1 -
 services/mailer/templates/download.txt.ejs    |   3 -
 services/users.js                             |  59 ----
 views/account/download.ejs                    |  47 ----
 yarn.lock                                     | 254 +-----------------
 25 files changed, 17 insertions(+), 701 deletions(-)
 delete mode 100644 client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css
 delete mode 100644 client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js
 delete mode 100644 services/mailer/templates/download.html.ejs
 delete mode 100644 services/mailer/templates/download.txt.ejs
 delete mode 100644 views/account/download.ejs

diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 5c9da6751..d9f6b4f64 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -247,17 +247,5 @@ export default {
         },
       },
     }),
-    DownloadCommentHistory: () => ({
-      updateQueries: {
-        CoralEmbedStream_Profile: previousData =>
-          update(previousData, {
-            me: {
-              lastAccountDownload: {
-                $set: new Date().toISOString(),
-              },
-            },
-          }),
-      },
-    }),
   },
 };
diff --git a/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css b/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css
deleted file mode 100644
index 55ea39969..000000000
--- a/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.button {
-  margin: 0;
-
-  i {
-    font-size: inherit;
-    vertical-align: sub;
-  }
-}
-
-.most_recent {
-  color: #808080;
-}
diff --git a/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js b/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js
deleted file mode 100644
index 494e79d9e..000000000
--- a/client/coral-embed-stream/src/tabs/profile/components/DownloadCommentHistorySection.js
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import { Button } from 'coral-ui';
-import { compose, gql } from 'react-apollo';
-import { t } from 'plugin-api/beta/client/services';
-import styles from './DownloadCommentHistorySection.css';
-import { withFragments, withMutation } from 'coral-framework/hocs';
-
-export const readableDuration = durAsHours => {
-  const durAsDays = Math.ceil(durAsHours / 24);
-
-  return durAsHours > 23
-    ? durAsDays > 1
-      ? t('download_request.days', durAsDays)
-      : t('download_request.day', durAsDays)
-    : durAsHours > 1
-      ? t('download_request.hours', durAsHours)
-      : t('download_request.hour', durAsHours);
-};
-
-class DownloadCommentHistorySection extends Component {
-  static propTypes = {
-    requestDownloadLink: PropTypes.func.isRequired,
-    root: PropTypes.object.isRequired,
-  };
-
-  render() {
-    const {
-      root: { me: { lastAccountDownload } },
-      requestDownloadLink,
-    } = this.props;
-
-    const now = new Date();
-    const lastAccountDownloadDate =
-      lastAccountDownload && new Date(lastAccountDownload);
-    const hoursLeft = lastAccountDownloadDate
-      ? Math.ceil(
-          24 - (now.getTime() - lastAccountDownloadDate.getTime()) / 3.6e6
-        )
-      : 0;
-    const canRequestDownload = !lastAccountDownloadDate || hoursLeft <= 0;
-
-    return (
-      <section className={'talk-plugin-ignore-user-section'}>
-        <h3>{t('download_request.section_title')}</h3>
-        <p>
-          {t('download_request.you_will_get_a_copy')}{' '}
-          <b>{t('download_request.download_rate')}</b>.
-        </p>
-        {lastAccountDownloadDate && (
-          <p className={styles.most_recent}>
-            {t('download_request.most_recent_request')}:{' '}
-            {lastAccountDownloadDate.toLocaleString()}
-          </p>
-        )}
-        {canRequestDownload ? (
-          <Button className={styles.button} onClick={requestDownloadLink}>
-            <i className="material-icons" aria-hidden={true}>
-              file_download
-            </i>{' '}
-            {t('download_request.request')}
-          </Button>
-        ) : (
-          <Button className={styles.button} disabled>
-            <i className="material-icons" aria-hidden={true}>
-              access_time
-            </i>{' '}
-            {t('download_request.rate_limit', readableDuration(hoursLeft))}
-          </Button>
-        )}
-      </section>
-    );
-  }
-}
-
-const withDownloadCommentHistorySectionFragments = withFragments({
-  root: gql`
-    fragment TalkDownloadCommentHistory_DownloadCommentHistorySection_root on RootQuery {
-      me {
-        id
-        lastAccountDownload
-      }
-    }
-  `,
-});
-
-const withRequestDownloadLink = withMutation(
-  gql`
-    mutation DownloadCommentHistory {
-      requestDownloadLink {
-        errors {
-          translation_key
-        }
-      }
-    }
-  `,
-  {
-    props: ({ mutate }) => ({
-      requestDownloadLink: () => mutate({ variables: {} }),
-    }),
-  }
-);
-
-const enhance = compose(
-  withDownloadCommentHistorySectionFragments,
-  withRequestDownloadLink
-);
-
-export default enhance(DownloadCommentHistorySection);
diff --git a/client/coral-embed-stream/src/tabs/profile/components/Settings.js b/client/coral-embed-stream/src/tabs/profile/components/Settings.js
index c07dbfcd6..c61a09a92 100644
--- a/client/coral-embed-stream/src/tabs/profile/components/Settings.js
+++ b/client/coral-embed-stream/src/tabs/profile/components/Settings.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Slot } from 'coral-framework/components';
-import DownloadCommentHistorySection from './DownloadCommentHistorySection';
 
 class Settings extends React.Component {
   render() {
@@ -10,7 +9,6 @@ class Settings extends React.Component {
     return (
       <div>
         <Slot fill="profileSettings" passthrough={slotPassthrough} />
-        <DownloadCommentHistorySection root={root} />
       </div>
     );
   }
diff --git a/client/coral-embed-stream/src/tabs/profile/containers/Settings.js b/client/coral-embed-stream/src/tabs/profile/containers/Settings.js
index 8535d95ca..795a3c10a 100644
--- a/client/coral-embed-stream/src/tabs/profile/containers/Settings.js
+++ b/client/coral-embed-stream/src/tabs/profile/containers/Settings.js
@@ -3,8 +3,6 @@ import { compose, gql } from 'react-apollo';
 import Settings from '../components/Settings';
 import { withFragments } from 'coral-framework/hocs';
 import { getSlotFragmentSpreads } from 'coral-framework/utils';
-import { getDefinitionName } from 'coral-framework/utils';
-import DownloadCommentHistorySection from '../components/DownloadCommentHistorySection';
 
 const slots = ['profileSettings'];
 
@@ -20,9 +18,7 @@ const enhance = compose(
       fragment TalkEmbedStream_ProfileSettings_root on RootQuery {
         __typename
         ${getSlotFragmentSpreads(slots, 'root')}
-        ...${getDefinitionName(DownloadCommentHistorySection.fragments.root)}
       }
-      ${DownloadCommentHistorySection.fragments.root}
     `,
   })
 );
diff --git a/graph/mutators/user.js b/graph/mutators/user.js
index d9e3374a5..19cf4b55e 100644
--- a/graph/mutators/user.js
+++ b/graph/mutators/user.js
@@ -9,7 +9,6 @@ const {
   SET_USER_SUSPENSION_STATUS,
   UPDATE_USER_ROLES,
   DELETE_USER,
-  REQUEST_DOWNLOAD_LINK,
 } = require('../../perms/constants');
 
 const setUserUsernameStatus = async (ctx, id, status) => {
@@ -144,10 +143,6 @@ const delUser = async (ctx, id) => {
   await user.remove();
 };
 
-// requestDownloadLink will request the current user's account be available via
-// a download link sent to their email address.
-const requestDownloadLink = async ({ user }) => Users.sendDownloadLink(user);
-
 module.exports = ctx => {
   let mutators = {
     User: {
@@ -160,7 +155,6 @@ module.exports = ctx => {
       setUsername: () => Promise.reject(errors.ErrNotAuthorized),
       stopIgnoringUser: () => Promise.reject(errors.ErrNotAuthorized),
       del: () => Promise.reject(errors.ErrNotAuthorized),
-      requestDownloadLink: () => Promise.reject(errors.ErrNotAuthorized),
     },
   };
 
@@ -200,10 +194,6 @@ module.exports = ctx => {
     if (ctx.user.can(DELETE_USER)) {
       mutators.User.del = id => delUser(ctx, id);
     }
-
-    if (ctx.user.can(REQUEST_DOWNLOAD_LINK)) {
-      mutators.User.requestDownloadLink = () => requestDownloadLink(ctx);
-    }
   }
 
   return mutators;
diff --git a/graph/resolvers/comment.js b/graph/resolvers/comment.js
index 2e4d9a08d..a8d524dba 100644
--- a/graph/resolvers/comment.js
+++ b/graph/resolvers/comment.js
@@ -58,6 +58,10 @@ const Comment = {
   },
   async url(comment, args, { loaders: { Assets } }) {
     const asset = await Assets.getByID.load(comment.asset_id);
+    if (!asset) {
+      return null;
+    }
+
     const assetURL = new URL(asset.url);
     assetURL.searchParams.set('commentId', comment.id);
     return assetURL.href;
diff --git a/graph/resolvers/root_mutation.js b/graph/resolvers/root_mutation.js
index eea296196..2838f0f99 100644
--- a/graph/resolvers/root_mutation.js
+++ b/graph/resolvers/root_mutation.js
@@ -139,9 +139,6 @@ const RootMutation = {
   delUser: async (_, { id }, { mutators: { User } }) => {
     await User.del(id);
   },
-  requestDownloadLink: async (_, args, { mutators: { User } }) => {
-    await User.requestDownloadLink();
-  },
 };
 
 module.exports = RootMutation;
diff --git a/graph/resolvers/user.js b/graph/resolvers/user.js
index 1305a0746..46fe0ac3c 100644
--- a/graph/resolvers/user.js
+++ b/graph/resolvers/user.js
@@ -12,7 +12,6 @@ const {
   LIST_OWN_TOKENS,
   VIEW_USER_STATUS,
   VIEW_USER_EMAIL,
-  VIEW_LAST_DOWNLOADED_DATE,
 } = require('../../perms/constants');
 const { property } = require('lodash');
 
@@ -65,7 +64,6 @@ decorateWithPermissionCheck(
     tokens: [LIST_OWN_TOKENS],
     profiles: [SEARCH_OTHER_USERS],
     comments: [SEARCH_OTHERS_COMMENTS],
-    lastAccountDownload: [VIEW_LAST_DOWNLOADED_DATE],
   },
   checkSelfField('id')
 );
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index 714c9e2f9..588ad08dc 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -238,10 +238,6 @@ type User {
 
   # returns user status
   state: UserState
-
-  # lastAccountDownload is the date that the user last requested a comment
-  # download.
-  lastAccountDownload: Date
 }
 
 # UserConnection represents a paginable subset of a user list.
@@ -1439,12 +1435,6 @@ type DelUserResponse implements Response {
   errors: [UserError!]
 }
 
-type RequestDownloadLinkResponse implements Response {
-
-  # An array of errors relating to the mutation that occurred.
-  errors: [UserError!]
-}
-
 # All mutations for the application are defined on this object.
 type RootMutation {
 
@@ -1545,10 +1535,6 @@ type RootMutation {
 
   # delUser will delete the user with the specified id.
   delUser(id: ID!): DelUserResponse
-
-  # requestDownloadLink will request a download link be sent to the primary
-  # users email address.
-  requestDownloadLink: RequestDownloadLinkResponse
 }
 
 type UsernameChangedPayload {
diff --git a/locales/en.yml b/locales/en.yml
index f9fa56632..08d64ddc8 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -201,10 +201,6 @@ en:
       we_received_a_request: "We received a request to reset your password. If you did not request this change, you can ignore this email."
       if_you_did: "If you did,"
       please_click: "please click here to reset password"
-    download:
-      subject: "Your download link is ready" # TODO: replace
-      download_link_ready: "Your download link is now ready, visit the following to download an archive of your account:" # TODO: replace
-      download_archive: "Download Archive" # TODO: replace
   embedlink:
     copy: "Copy to Clipboard"
   error:
@@ -483,18 +479,3 @@ en:
   admin_sidebar:
     view_options: "View Options"
     sort_comments: "Sort Comments"
-  download_request:
-    section_title: "Download My Comment History"
-    you_will_get_a_copy: "You will recieve an email with a link to download your comment history. You can make"
-    download_rate: "one download request every 24 hours"
-    most_recent_request: "Your most recent request"
-    request: "Request Comment History"
-    rate_limit: "You can submit another Comment History request in {0}"
-    hours: "{0} hours"
-    days: "{0} days"
-    hour: "{0} hour"
-    day: "{0} day"
-  download_landing:
-    download_your_account: "Download Your Account"
-    click_to_download: "Click below to download your account"
-    confirm: "Download"
diff --git a/models/user.js b/models/user.js
index 9ab60c983..717e43a88 100644
--- a/models/user.js
+++ b/models/user.js
@@ -191,13 +191,6 @@ const UserSchema = new Schema(
     // Tags are added by the self or by administrators.
     tags: [TagLinkSchema],
 
-    // lastAccountDownload is the date that the user last downloaded their
-    // account details.
-    lastAccountDownload: {
-      type: Date,
-      default: null,
-    },
-
     // Additional metadata stored on the field.
     metadata: {
       default: {},
diff --git a/package.json b/package.json
index 314104032..d331f62b4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,6 @@
     "apollo-server-express": "^1.2.0",
     "apollo-utilities": "^1.0.3",
     "app-module-path": "^2.2.0",
-    "archiver": "^2.1.1",
     "autoprefixer": "^6.5.2",
     "babel-cli": "6.26.0",
     "babel-core": "6.26.0",
@@ -93,7 +92,6 @@
     "copy-webpack-plugin": "^4.0.0",
     "cross-spawn": "^5.1.0",
     "css-loader": "^0.28.5",
-    "csv-stringify": "^2.0.4",
     "dataloader": "^1.3.0",
     "debug": "3.1.0",
     "dialog-polyfill": "^0.4.9",
diff --git a/perms/constants/mutation.js b/perms/constants/mutation.js
index 94736b419..d2ebe73f1 100644
--- a/perms/constants/mutation.js
+++ b/perms/constants/mutation.js
@@ -19,5 +19,4 @@ module.exports = {
   UPDATE_ASSET_STATUS: 'UPDATE_ASSET_STATUS',
   UPDATE_SETTINGS: 'UPDATE_SETTINGS',
   DELETE_USER: 'DELETE_USER',
-  REQUEST_DOWNLOAD_LINK: 'REQUEST_DOWNLOAD_LINK',
 };
diff --git a/perms/constants/query.js b/perms/constants/query.js
index 531cf7aae..b846b15ce 100644
--- a/perms/constants/query.js
+++ b/perms/constants/query.js
@@ -10,5 +10,4 @@ module.exports = {
   LIST_OWN_TOKENS: 'LIST_OWN_TOKENS',
   VIEW_USER_ROLE: 'VIEW_USER_ROLE',
   VIEW_USER_EMAIL: 'VIEW_USER_EMAIL',
-  VIEW_LAST_DOWNLOADED_DATE: 'VIEW_LAST_DOWNLOADED_DATE',
 };
diff --git a/perms/reducers/mutation.js b/perms/reducers/mutation.js
index ab01da4e4..73ee7ef28 100644
--- a/perms/reducers/mutation.js
+++ b/perms/reducers/mutation.js
@@ -13,7 +13,6 @@ module.exports = (user, perm) => {
     case types.CREATE_ACTION:
     case types.DELETE_ACTION:
     case types.EDIT_COMMENT:
-    case types.REQUEST_DOWNLOAD_LINK:
       // Anyone can do these things if they aren't suspended, banned, or blocked
       // as they're editing their username.
       return !['UNSET', 'REJECTED', 'CHANGED'].includes(
diff --git a/perms/reducers/query.js b/perms/reducers/query.js
index cbd789c6a..0852d8e2b 100644
--- a/perms/reducers/query.js
+++ b/perms/reducers/query.js
@@ -13,7 +13,6 @@ module.exports = (user, perm) => {
     case types.VIEW_PROTECTED_SETTINGS:
     case types.VIEW_USER_ROLE:
     case types.VIEW_USER_EMAIL:
-    case types.VIEW_LAST_DOWNLOADED_DATE:
       return check(user, ['ADMIN', 'MODERATOR']);
     case types.LIST_OWN_TOKENS:
       return check(user, ['ADMIN']);
diff --git a/plugins.default.json b/plugins.default.json
index ca17c79d8..e1011aa87 100644
--- a/plugins.default.json
+++ b/plugins.default.json
@@ -2,7 +2,8 @@
   "server": [
     "talk-plugin-auth",
     "talk-plugin-featured-comments",
-    "talk-plugin-respect"
+    "talk-plugin-respect",
+    "talk-plugin-profile-data"
   ],
   "client": [
     "talk-plugin-auth",
@@ -18,6 +19,7 @@
     "talk-plugin-sort-most-respected",
     "talk-plugin-sort-newest",
     "talk-plugin-sort-oldest",
-    "talk-plugin-viewing-options"
+    "talk-plugin-viewing-options",
+    "talk-plugin-profile-data"
   ]
 }
diff --git a/routes/account/index.js b/routes/account/index.js
index 575ae7883..70e62accc 100644
--- a/routes/account/index.js
+++ b/routes/account/index.js
@@ -9,8 +9,4 @@ router.get('/password/reset', (req, res) => {
   res.render('account/password/reset');
 });
 
-router.get('/download', (req, res) => {
-  res.render('account/download');
-});
-
 module.exports = router;
diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index afeaafdb6..561134885 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -4,10 +4,6 @@ const UsersService = require('../../../services/users');
 const mailer = require('../../../services/mailer');
 const authorization = require('../../../middleware/authorization');
 const errors = require('../../../errors');
-const archiver = require('archiver');
-const stringify = require('csv-stringify');
-const moment = require('moment');
-const { pick, get, kebabCase } = require('lodash');
 
 // Return the current logged in user.
 router.get('/', authorization.needed(), (req, res, next) => {
@@ -131,140 +127,4 @@ router.put(
   }
 );
 
-// loadCommentsBatch will load a batch of the comments and write them to the
-// stream.
-async function loadCommentsBatch(ctx, csv, variables = {}) {
-  let result = await ctx.graphql(
-    `
-    query GetMyComments($cursor: Cursor) {
-      me {
-        comments(query: {
-          limit: 100,
-          cursor: $cursor
-        }) {
-          hasNextPage
-          endCursor
-          nodes {
-            id
-            created_at
-            asset {
-              url
-            }
-            body
-            url
-          }
-        }
-      }
-    }
-  `,
-    variables
-  );
-  if (result.errors) {
-    throw result.errors;
-  }
-
-  for (const comment of get(result, 'data.me.comments.nodes', [])) {
-    csv.write([
-      comment.id,
-      moment(comment.created_at).format('YYYY-MM-DD HH:mm:ss'),
-      comment.asset.url,
-      comment.url,
-      comment.body,
-    ]);
-  }
-
-  return pick(result.data.me.comments, ['hasNextPage', 'endCursor']);
-}
-
-// loadComments will load batches of the comments and write them to the csv
-// stream. Once the comments have finished writing, it will close the stream.
-async function loadComments(ctx, archive, latestContentDate) {
-  // Create all the csv writers that'll write the data to the archive.
-  const csv = stringify();
-
-  // Add all the streams as files to the archive.
-  archive.append(csv, { name: 'talk-export/my_comments.csv' });
-
-  csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
-
-  // Load the first batch's comments from the latest date that we were provided
-  // from the token.
-  let connection = await loadCommentsBatch(ctx, csv, {
-    cursor: latestContentDate,
-  });
-
-  // As long as there's more comments, keep paginating.
-  while (connection.hasNextPage) {
-    connection = await loadCommentsBatch(ctx, csv, {
-      cursor: connection.endCursor,
-    });
-  }
-
-  csv.end();
-}
-
-// /download will send back a zipped archive of the users account.
-router.post(
-  '/download',
-  express.urlencoded({ extended: false }),
-  tokenCheck(UsersService.verifyDownloadToken, new Error('invalid token')),
-  async (req, res, next) => {
-    try {
-      const { token } = req.body;
-
-      // Pull the userID and the date that the token was issued out of the
-      // provided token.
-      const { user: userID, iat } = await UsersService.verifyDownloadToken(
-        token
-      );
-
-      // Unpack the date that the token was issued, and use it as a source for the
-      // earliest comment we should include in the download.
-      const latestContentDate = new Date(iat * 1000);
-
-      // Grab the user that we're generating the export from. We'll use it to
-      // create a new context.
-      const user = await UsersService.findById(userID);
-
-      // Base a new context off of the new user.
-      const ctx = req.context.masqueradeAs(user);
-
-      // Get the current user's username. We need it for the generated filenames.
-      const result = await ctx.graphql('{ me { username } }');
-      if (result.errors) {
-        throw result.errors;
-      }
-      const username = get(result, 'data.me.username');
-
-      // Generate the filename of the file that the user will download.
-      const filename = `talk-${kebabCase(username)}-${kebabCase(
-        moment(latestContentDate).format('YYYY-MM-DD HH:mm:ss')
-      )}.zip`;
-
-      res.writeHead(200, {
-        'Content-Type': 'application/octet-stream',
-        'Content-Disposition': `attachment; filename=${filename}`,
-      });
-
-      // Create the zip archive we'll use to write all the exported files to.
-      const archive = archiver('zip', {
-        zlib: { level: 9 },
-      });
-
-      // Pipe this to the response writer directly.
-      archive.pipe(res);
-
-      // Load the comments csv up with the user's comments.
-      await loadComments(ctx, archive, latestContentDate);
-
-      // Mark the end of adding files, no more files can be added after this. Once
-      // all the stream readers have finished writing, and have closed, the
-      // archiver will close which will finish the HTTP request.
-      archive.finalize();
-    } catch (err) {
-      return next(err);
-    }
-  }
-);
-
 module.exports = router;
diff --git a/services/mailer/templates/download.html.ejs b/services/mailer/templates/download.html.ejs
deleted file mode 100644
index c6aeb8e1e..000000000
--- a/services/mailer/templates/download.html.ejs
+++ /dev/null
@@ -1 +0,0 @@
-<p><%= t('email.download.download_link_ready') %> <a href="<%= BASE_URL %>account/download#<%= token %>"><%= t('email.download.download_archive') %></a></p>
diff --git a/services/mailer/templates/download.txt.ejs b/services/mailer/templates/download.txt.ejs
deleted file mode 100644
index 4f719bc06..000000000
--- a/services/mailer/templates/download.txt.ejs
+++ /dev/null
@@ -1,3 +0,0 @@
-<%= t('email.download.download_link_ready') %>
-
-    <%= BASE_URL %>account/download#<%= token %>
diff --git a/services/users.js b/services/users.js
index b59224676..e2c4fb61b 100644
--- a/services/users.js
+++ b/services/users.js
@@ -14,11 +14,9 @@ const i18n = require('./i18n');
 const Wordlist = require('./wordlist');
 const DomainList = require('./domain_list');
 const Limit = require('./limit');
-const moment = require('moment');
 
 const EMAIL_CONFIRM_JWT_SUBJECT = 'email_confirm';
 const PASSWORD_RESET_JWT_SUBJECT = 'password_reset';
-const DOWNLOAD_LINK_SUBJECT = 'download_link';
 
 // SALT_ROUNDS is the number of rounds that the bcrypt algorithm will run
 // through during the salting process.
@@ -31,10 +29,6 @@ const loginRateLimiter = new Limit(
   RECAPTCHA_WINDOW
 );
 
-// downloadLinkLimiter can be used to limit downloads for the user's data to
-// once every 24 hours.
-const downloadLinkLimiter = new Limit('downloadLinkLimiter', 1, '1d');
-
 // Users is the interface for the application to interact with the
 // User through.
 class Users {
@@ -472,59 +466,6 @@ class Users {
     });
   }
 
-  static async sendDownloadLink(user) {
-    // Check that the user has not already requested a download within the last
-    // 24 hours.
-    const attempts = await downloadLinkLimiter.get(user.id);
-    if (attempts && attempts >= 1) {
-      throw errors.ErrMaxRateLimit;
-    }
-
-    // Check if the lastAccountDownload time is within 24 hours.
-    if (
-      user.lastAccountDownload &&
-      moment(user.lastAccountDownload)
-        .add(24, 'hours')
-        .isAfter(moment())
-    ) {
-      throw errors.ErrMaxRateLimit;
-    }
-
-    // The account currently does not have a download link, let's record the
-    // download. This will throw an error if a race ocurred and we should stop
-    // now.
-    await downloadLinkLimiter.test(user.id);
-
-    // Generate a token for the download link.
-    const token = await JWT_SECRET.sign(
-      { user: user.id },
-      { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
-    );
-
-    // Send the download link via the user's attached email account.
-    await Users.sendEmail(user, {
-      template: 'download',
-      locals: {
-        token,
-      },
-      subject: i18n.t('email.download.subject'),
-    });
-
-    // Amend the lastAccountDownload on the user.
-    await User.update(
-      { id: user.id },
-      { $set: { lastAccountDownload: new Date() } }
-    );
-  }
-
-  static async verifyDownloadToken(token) {
-    const jwt = await Users.verifyToken(token, {
-      subject: DOWNLOAD_LINK_SUBJECT,
-    });
-
-    return jwt;
-  }
-
   static async sendEmail(user, options) {
     return mailer.send(
       merge({}, options, {
diff --git a/views/account/download.ejs b/views/account/download.ejs
deleted file mode 100644
index d8bdc6e27..000000000
--- a/views/account/download.ejs
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <title><%= t('download_landing.download_your_account') %></title>
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-    <%- include ../partials/head %>
-  </head>
-  <body class="confirm-email-page">
-    <div id="root">
-      <div class="error-console container"></div>
-      <form id="download-form" class="container" method="post" action="<%= BASE_PATH %>api/v1/account/download">
-        <legend class="legend"><%= t('download_landing.click_to_download') %></legend>
-        <button type="submit"><%= t('download_landing.confirm') %></button>
-      </form>
-    </div>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
-    <script type="text/javascript">
-      $(function() {
-        function showError(error) {
-          try {
-            let err = JSON.parse(error);
-            $('.error-console').text(err.message).addClass('active');
-          } catch (err) {
-            $('.error-console').text(error).addClass('active');
-          }
-        }
-
-        var token = location.hash.replace('#', '');
-
-        $.ajax({
-          url: '<%= BASE_PATH %>api/v1/account/download',
-          contentType: 'application/json',
-          method: 'POST',
-          data: JSON.stringify({token: token, check: true})
-        })
-        .then(function () {
-          $('#download-form').append('<input name="token" type="hidden" value="' + token + '"/>').fadeIn();
-        })
-        .catch(function (error) {
-          showError(error.responseText);
-        });
-      });
-    </script>
-  </body>
-</html>
diff --git a/yarn.lock b/yarn.lock
index ba8e393c5..47ce8caa0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -68,7 +68,7 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@coralproject/eslint-config-talk@^0.1.0", "@coralproject/eslint-config-talk@^0.1.1":
+"@coralproject/eslint-config-talk@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@coralproject/eslint-config-talk/-/eslint-config-talk-0.1.1.tgz#71991b4937a3ffe657128d7f1170da4b5fb75c9e"
   dependencies:
@@ -174,13 +174,6 @@ accepts@^1.3.4, accepts@~1.3.4:
     mime-types "~2.1.16"
     negotiator "0.6.1"
 
-accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
-
 acorn-dynamic-import@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz#c752bd210bef679501b6c6cb7fc84f8f47158cc4"
@@ -235,10 +228,6 @@ acorn@^5.3.0:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.4.1.tgz#fdc58d9d17f4a4e98d102ded826a9b9759125102"
 
-acorn@^5.5.0:
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
-
 addressparser@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-1.0.1.tgz#47afbe1a2a9262191db6838e4fd1d39b40821746"
@@ -1805,13 +1794,6 @@ caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
 
-casual@^1.5.19:
-  version "1.5.19"
-  resolved "https://registry.yarnpkg.com/casual/-/casual-1.5.19.tgz#66fac46f7ae463f468f5913eb139f9c41c58bbf2"
-  dependencies:
-    mersenne-twister "^1.0.1"
-    moment "^2.15.2"
-
 center-align@^0.1.1:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/center-align/-/center-align-0.1.3.tgz#aa0d32629b6ee972200411cbd4461c907bc2b7ad"
@@ -2485,10 +2467,6 @@ crc32-stream@^2.0.0:
     crc "^3.4.4"
     readable-stream "^2.0.0"
 
-crc@3.4.4:
-  version "3.4.4"
-  resolved "https://registry.yarnpkg.com/crc/-/crc-3.4.4.tgz#9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"
-
 crc@^3.4.4:
   version "3.5.0"
   resolved "https://registry.yarnpkg.com/crc/-/crc-3.5.0.tgz#98b8ba7d489665ba3979f59b21381374101a1964"
@@ -2723,9 +2701,9 @@ cssom@0.3.x, "cssom@>= 0.3.0 < 0.4.0", "cssom@>= 0.3.2 < 0.4.0":
   dependencies:
     cssom "0.3.x"
 
-csv-stringify@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-2.0.4.tgz#9ace220df98ffa7ca91314ac77ff8cba0a08c863"
+csv-stringify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-3.0.0.tgz#ed2b4eaae5a3be382309f7864168458970307d7f"
   dependencies:
     lodash.get "~4.4.2"
 
@@ -2988,7 +2966,7 @@ dns-prefetch-control@0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz#60ddb457774e178f1f9415f0cabb0e85b0b300b2"
 
-doctrine@^2.0.0, doctrine@^2.1.0:
+doctrine@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   dependencies:
@@ -3129,10 +3107,6 @@ ejs@2.5.7, ejs@^2.5.7:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
 
-ejs@^2.5.8:
-  version "2.5.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.8.tgz#2ab6954619f225e6193b7ac5f7c39c48fefe4380"
-
 electron-to-chromium@^1.2.7:
   version "1.3.26"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.26.tgz#996427294861a74d9c7c82b9260ea301e8c02d66"
@@ -3428,49 +3402,6 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^4.19.1:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    regexpp "^1.0.1"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
 eslint@^4.5.0:
   version "4.13.1"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
@@ -3520,13 +3451,6 @@ espree@^3.5.2:
     acorn "^5.2.1"
     acorn-jsx "^3.0.0"
 
-espree@^3.5.4:
-  version "3.5.4"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
-  dependencies:
-    acorn "^5.5.0"
-    acorn-jsx "^3.0.0"
-
 esprima@3.x.x, esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -3701,20 +3625,6 @@ exports-loader@^0.6.4:
     loader-utils "^1.0.2"
     source-map "0.5.x"
 
-express-session@^1.15.6:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/express-session/-/express-session-1.15.6.tgz#47b4160c88f42ab70fe8a508e31cbff76757ab0a"
-  dependencies:
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    crc "3.4.4"
-    debug "2.6.9"
-    depd "~1.1.1"
-    on-headers "~1.0.1"
-    parseurl "~1.3.2"
-    uid-safe "~2.1.5"
-    utils-merge "1.0.1"
-
 express-static-gzip@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-0.3.2.tgz#89ede84547a5717de3146315f62dc996c071a88d"
@@ -3756,41 +3666,6 @@ express@4.16.0, express@^4.12.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.16.3:
-  version "4.16.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53"
-  dependencies:
-    accepts "~1.3.5"
-    array-flatten "1.1.1"
-    body-parser "1.18.2"
-    content-disposition "0.5.2"
-    content-type "~1.0.4"
-    cookie "0.3.1"
-    cookie-signature "1.0.6"
-    debug "2.6.9"
-    depd "~1.1.2"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    finalhandler "1.1.1"
-    fresh "0.5.2"
-    merge-descriptors "1.0.1"
-    methods "~1.1.2"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    path-to-regexp "0.1.7"
-    proxy-addr "~2.0.3"
-    qs "6.5.1"
-    range-parser "~1.2.0"
-    safe-buffer "5.1.1"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
-    utils-merge "1.0.1"
-    vary "~1.1.2"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -3988,18 +3863,6 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  dependencies:
-    debug "2.6.9"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
-    unpipe "~1.0.0"
-
 find-cache-dir@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-1.0.0.tgz#9288e3e9e3cc3748717d39eade17cf71fc30ee6f"
@@ -5306,10 +5169,6 @@ ipaddr.js@1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.5.2.tgz#d4b505bde9946987ccf0fc58d9010ff9607e3fa0"
 
-ipaddr.js@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.6.0.tgz#e3fa357b773da619f26e95f049d055c72796f86b"
-
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
@@ -7172,10 +7031,6 @@ merge@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
 
-mersenne-twister@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mersenne-twister/-/mersenne-twister-1.1.0.tgz#f916618ee43d7179efcf641bec4531eb9670978a"
-
 metascraper-author@^3.9.2:
   version "3.9.2"
   resolved "https://registry.yarnpkg.com/metascraper-author/-/metascraper-author-3.9.2.tgz#ff2020ac428f59a875d655df3b0d4bea171fde19"
@@ -7316,7 +7171,7 @@ miller-rabin@^4.0.0:
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.30.0.tgz#74c643da2dd9d6a45399963465b26d5ca7d71f01"
 
-"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0:
+"mime-db@>= 1.33.0 < 2":
   version "1.33.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db"
 
@@ -7326,12 +7181,6 @@ mime-types@^2.1.10, mime-types@^2.1.12, mime-types@~2.1.15, mime-types@~2.1.16,
   dependencies:
     mime-db "~1.30.0"
 
-mime-types@~2.1.18:
-  version "2.1.18"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.18.tgz#6f323f60a83d11146f831ff11fd66e2fe5503bb8"
-  dependencies:
-    mime-db "~1.33.0"
-
 mime@1.4.1, mime@^1.3.4, mime@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
@@ -7464,10 +7313,6 @@ moment@^2.10.3:
   version "2.19.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.1.tgz#56da1a2d1cbf01d38b7e1afc31c10bcfa1929167"
 
-moment@^2.15.2:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
-
 mongodb-core@2.1.17:
   version "2.1.17"
   resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8"
@@ -8425,15 +8270,6 @@ passport-oauth2@1.x.x, passport-oauth2@^1.1.2:
     uid2 "0.0.x"
     utils-merge "1.x.x"
 
-passport-openidconnect@^0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/passport-openidconnect/-/passport-openidconnect-0.0.2.tgz#e488f8bdb386c9a9fd39c91d5ab8c880156e8153"
-  dependencies:
-    oauth "0.9.x"
-    passport-strategy "1.x.x"
-    request "^2.75.0"
-    webfinger "0.4.x"
-
 passport-strategy@1.x.x, passport-strategy@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/passport-strategy/-/passport-strategy-1.0.0.tgz#b5539aa8fc225a3d1ad179476ddf236b440f52e4"
@@ -9158,13 +8994,6 @@ proxy-addr@~2.0.2:
     forwarded "~0.1.2"
     ipaddr.js "1.5.2"
 
-proxy-addr@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.3.tgz#355f262505a621646b3130a728eb647e22055341"
-  dependencies:
-    forwarded "~0.1.2"
-    ipaddr.js "1.6.0"
-
 proxy-agent@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.0.0.tgz#57eb5347aa805d74ec681cb25649dba39c933499"
@@ -9415,10 +9244,6 @@ randexp@^0.4.2:
     discontinuous-range "1.0.0"
     ret "~0.1.10"
 
-random-bytes@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
-
 randomatic@^1.1.3:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
@@ -9889,10 +9714,6 @@ regexp-clone@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/regexp-clone/-/regexp-clone-0.0.1.tgz#a7c2e09891fdbf38fbb10d376fb73003e68ac589"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-
 regexpu-core@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-1.0.0.tgz#86a763f58ee4d7c2f6b102e4764050de7ed90c6b"
@@ -10043,33 +9864,6 @@ request@2.81.0:
     tunnel-agent "^0.6.0"
     uuid "^3.0.0"
 
-request@^2.75.0:
-  version "2.85.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa"
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.6.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.5"
-    extend "~3.0.1"
-    forever-agent "~0.6.1"
-    form-data "~2.3.1"
-    har-validator "~5.0.3"
-    hawk "~6.0.2"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.17"
-    oauth-sign "~0.8.2"
-    performance-now "^2.1.0"
-    qs "~6.5.1"
-    safe-buffer "^5.1.1"
-    stringstream "~0.0.5"
-    tough-cookie "~2.3.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.1.0"
-
 require-directory@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@@ -10284,7 +10078,7 @@ sax@0.5.x:
   version "0.5.8"
   resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
 
-sax@>=0.1.1, sax@^1.1.4, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
+sax@^1.1.4, sax@^1.2.1, sax@^1.2.4, sax@~1.2.1:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
@@ -10423,7 +10217,7 @@ serve-static@1.13.0:
     parseurl "~1.3.2"
     send "0.16.0"
 
-serve-static@1.13.2, serve-static@^1.10.0:
+serve-static@^1.10.0:
   version "1.13.2"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
   dependencies:
@@ -10840,10 +10634,6 @@ stealthy-require@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
 
-step@0.0.x:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/step/-/step-0.0.6.tgz#143e7849a5d7d3f4a088fe29af94915216eeede2"
-
 stream-browserify@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.1.tgz#66266ee5f9bdb9940a4e4514cafb43bb71e5c9db"
@@ -11141,7 +10931,7 @@ symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
-table@4.0.2, table@^4.0.1:
+table@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
   dependencies:
@@ -11470,13 +11260,6 @@ type-is@~1.6.15:
     media-typer "0.3.0"
     mime-types "~2.1.15"
 
-type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  dependencies:
-    media-typer "0.3.0"
-    mime-types "~2.1.18"
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -11551,12 +11334,6 @@ uid-number@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
 
-uid-safe@~2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
-  dependencies:
-    random-bytes "~1.0.0"
-
 uid2@0.0.x:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/uid2/-/uid2-0.0.3.tgz#483126e11774df2f71b8b639dcd799c376162b82"
@@ -11847,13 +11624,6 @@ watchpack@^1.4.0:
     chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
-webfinger@0.4.x:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/webfinger/-/webfinger-0.4.2.tgz#3477a6d97799461896039fcffc650b73468ee76d"
-  dependencies:
-    step "0.0.x"
-    xml2js "0.1.x"
-
 webidl-conversions@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-2.0.1.tgz#3bf8258f7d318c7443c36f2e169402a1a6703506"
@@ -12090,12 +11860,6 @@ xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
 
-xml2js@0.1.x:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.1.14.tgz#5274e67f5a64c5f92974cd85139e0332adc6b90c"
-  dependencies:
-    sax ">=0.1.1"
-
 xml@^1.0.0, xml@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"

From 333ef9837884ae9ec7b826e01b1593ed3386ec2e Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 9 Apr 2018 15:58:31 -0600
Subject: [PATCH 21/44] Added new plugin

---
 .gitignore                                    |   1 +
 docs/source/_data/plugins.yml                 |   5 +
 .../source/plugin/talk-plugin-profile-data.md |   1 +
 plugins/talk-plugin-profile-data/README.md    |  21 ++
 .../client/.eslintrc.json                     |   3 +
 .../components/DownloadCommentHistory.css     |  12 +
 .../components/DownloadCommentHistory.js      |  74 +++++
 .../containers/DownloadCommentHistory.js      |  39 +++
 .../client/graphql.js                         |  18 +
 .../talk-plugin-profile-data/client/index.js  |  11 +
 .../client/mutations.js                       |  19 ++
 .../client/translations.yml                   |  12 +
 plugins/talk-plugin-profile-data/index.js     | 307 ++++++++++++++++++
 plugins/talk-plugin-profile-data/package.json |  12 +
 .../server/emails/download.html.ejs           |   1 +
 .../server/emails/download.txt.ejs            |   3 +
 .../server/views/download.ejs                 |  47 +++
 .../talk-plugin-profile-data/translations.yml |  10 +
 18 files changed, 596 insertions(+)
 create mode 120000 docs/source/plugin/talk-plugin-profile-data.md
 create mode 100644 plugins/talk-plugin-profile-data/README.md
 create mode 100644 plugins/talk-plugin-profile-data/client/.eslintrc.json
 create mode 100644 plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
 create mode 100644 plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js
 create mode 100644 plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js
 create mode 100644 plugins/talk-plugin-profile-data/client/graphql.js
 create mode 100644 plugins/talk-plugin-profile-data/client/index.js
 create mode 100644 plugins/talk-plugin-profile-data/client/mutations.js
 create mode 100644 plugins/talk-plugin-profile-data/client/translations.yml
 create mode 100644 plugins/talk-plugin-profile-data/index.js
 create mode 100644 plugins/talk-plugin-profile-data/package.json
 create mode 100644 plugins/talk-plugin-profile-data/server/emails/download.html.ejs
 create mode 100644 plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
 create mode 100644 plugins/talk-plugin-profile-data/server/views/download.ejs
 create mode 100644 plugins/talk-plugin-profile-data/translations.yml

diff --git a/.gitignore b/.gitignore
index 1235e0db0..e8cb92653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ plugins/*
 !plugins/talk-plugin-offtopic
 !plugins/talk-plugin-permalink
 !plugins/talk-plugin-profile-settings
+!plugins/talk-plugin-profile-data
 !plugins/talk-plugin-remember-sort
 !plugins/talk-plugin-respect
 !plugins/talk-plugin-slack-notifications
diff --git a/docs/source/_data/plugins.yml b/docs/source/_data/plugins.yml
index 4c3621fcb..a5621b0d6 100644
--- a/docs/source/_data/plugins.yml
+++ b/docs/source/_data/plugins.yml
@@ -81,6 +81,11 @@
   description: Shows a Link button on comments for direct-linking to a comment.
   tags:
     - default
+- name: talk-plugin-profile-data
+  description: Enables users to manage their own data within Talk.
+  tags:
+    - default
+    - gdpr
 - name: talk-plugin-remember-sort
   description: Remembers the sort selection made by a user.
 - name: talk-plugin-respect
diff --git a/docs/source/plugin/talk-plugin-profile-data.md b/docs/source/plugin/talk-plugin-profile-data.md
new file mode 120000
index 000000000..022085ed6
--- /dev/null
+++ b/docs/source/plugin/talk-plugin-profile-data.md
@@ -0,0 +1 @@
+../../../plugins/talk-plugin-profile-data/README.md
\ No newline at end of file
diff --git a/plugins/talk-plugin-profile-data/README.md b/plugins/talk-plugin-profile-data/README.md
new file mode 100644
index 000000000..fe10a817b
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/README.md
@@ -0,0 +1,21 @@
+---
+title: talk-plugin-profile-data
+layout: plugin
+plugin:
+    name: talk-plugin-profile-data
+    provides:
+        - Client
+        - Server
+---
+
+Provides a series of profile data management utilities to users via their
+profile tab.
+
+## Download My Profile
+
+Enables the ability for users to download their profile data in a zip file from
+their profile tab in the comment stream. Once clicked, an email will be sent
+that contains a download link. Only one link can be generated every 7 days, and
+the link will be valid for 24 hours.
+
+The downloaded zip file will contain the users comments in a CSV format.
diff --git a/plugins/talk-plugin-profile-data/client/.eslintrc.json b/plugins/talk-plugin-profile-data/client/.eslintrc.json
new file mode 100644
index 000000000..c8a6db18a
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/.eslintrc.json
@@ -0,0 +1,3 @@
+{
+  "extends": "@coralproject/eslint-config-talk/client"
+}
diff --git a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
new file mode 100644
index 000000000..55ea39969
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.css
@@ -0,0 +1,12 @@
+.button {
+  margin: 0;
+
+  i {
+    font-size: inherit;
+    vertical-align: sub;
+  }
+}
+
+.most_recent {
+  color: #808080;
+}
diff --git a/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js
new file mode 100644
index 000000000..06fa1fa89
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/components/DownloadCommentHistory.js
@@ -0,0 +1,74 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { t } from 'plugin-api/beta/client/services';
+import { Button } from 'plugin-api/beta/client/components/ui';
+import styles from './DownloadCommentHistory.css';
+
+export const readableDuration = durAsHours => {
+  const durAsDays = Math.ceil(durAsHours / 24);
+
+  return durAsHours > 23
+    ? durAsDays > 1
+      ? t('download_request.days', durAsDays)
+      : t('download_request.day', durAsDays)
+    : durAsHours > 1
+      ? t('download_request.hours', durAsHours)
+      : t('download_request.hour', durAsHours);
+};
+
+class DownloadCommentHistory extends Component {
+  static propTypes = {
+    requestDownloadLink: PropTypes.func.isRequired,
+    root: PropTypes.object.isRequired,
+  };
+
+  render() {
+    const {
+      root: { me: { lastAccountDownload } },
+      requestDownloadLink,
+    } = this.props;
+
+    const now = new Date();
+    const lastAccountDownloadDate =
+      lastAccountDownload && new Date(lastAccountDownload);
+    const hoursLeft = lastAccountDownloadDate
+      ? Math.ceil(
+          7 * 24 - (now.getTime() - lastAccountDownloadDate.getTime()) / 3.6e6
+        )
+      : 0;
+    const canRequestDownload = !lastAccountDownloadDate || hoursLeft <= 0;
+
+    return (
+      <section className={'talk-plugin-ignore-user-section'}>
+        <h3>{t('download_request.section_title')}</h3>
+        <p>
+          {t('download_request.you_will_get_a_copy')}{' '}
+          <b>{t('download_request.download_rate')}</b>.
+        </p>
+        {lastAccountDownloadDate && (
+          <p className={styles.most_recent}>
+            {t('download_request.most_recent_request')}:{' '}
+            {lastAccountDownloadDate.toLocaleString()}
+          </p>
+        )}
+        {canRequestDownload ? (
+          <Button className={styles.button} onClick={requestDownloadLink}>
+            <i className="material-icons" aria-hidden={true}>
+              file_download
+            </i>{' '}
+            {t('download_request.request')}
+          </Button>
+        ) : (
+          <Button className={styles.button} disabled>
+            <i className="material-icons" aria-hidden={true}>
+              access_time
+            </i>{' '}
+            {t('download_request.rate_limit', readableDuration(hoursLeft))}
+          </Button>
+        )}
+      </section>
+    );
+  }
+}
+
+export default DownloadCommentHistory;
diff --git a/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js b/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js
new file mode 100644
index 000000000..96dbf6975
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/containers/DownloadCommentHistory.js
@@ -0,0 +1,39 @@
+import React, { Component } from 'react';
+import PropTypes from 'prop-types';
+import { compose, gql } from 'react-apollo';
+import DownloadCommentHistory from '../components/DownloadCommentHistory';
+import { withFragments } from 'plugin-api/beta/client/hocs';
+import { withRequestDownloadLink } from '../mutations';
+
+class DownloadCommentHistoryContainer extends Component {
+  static propTypes = {
+    requestDownloadLink: PropTypes.func.isRequired,
+    root: PropTypes.object.isRequired,
+  };
+
+  render() {
+    return (
+      <DownloadCommentHistory
+        root={this.props.root}
+        requestDownloadLink={this.props.requestDownloadLink}
+      />
+    );
+  }
+}
+
+const enhance = compose(
+  withFragments({
+    root: gql`
+      fragment TalkDownloadCommentHistory_DownloadCommentHistorySection_root on RootQuery {
+        __typename
+        me {
+          id
+          lastAccountDownload
+        }
+      }
+    `,
+  }),
+  withRequestDownloadLink
+);
+
+export default enhance(DownloadCommentHistoryContainer);
diff --git a/plugins/talk-plugin-profile-data/client/graphql.js b/plugins/talk-plugin-profile-data/client/graphql.js
new file mode 100644
index 000000000..b24c31568
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/graphql.js
@@ -0,0 +1,18 @@
+import update from 'immutability-helper';
+
+export default {
+  mutations: {
+    DownloadCommentHistory: () => ({
+      updateQueries: {
+        CoralEmbedStream_Profile: previousData =>
+          update(previousData, {
+            me: {
+              lastAccountDownload: {
+                $set: new Date().toISOString(),
+              },
+            },
+          }),
+      },
+    }),
+  },
+};
diff --git a/plugins/talk-plugin-profile-data/client/index.js b/plugins/talk-plugin-profile-data/client/index.js
new file mode 100644
index 000000000..fee9f2129
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/index.js
@@ -0,0 +1,11 @@
+import DownloadCommentHistory from './containers/DownloadCommentHistory';
+import translations from './translations.yml';
+import graphql from './graphql';
+
+export default {
+  slots: {
+    profileSettings: [DownloadCommentHistory],
+  },
+  translations,
+  ...graphql,
+};
diff --git a/plugins/talk-plugin-profile-data/client/mutations.js b/plugins/talk-plugin-profile-data/client/mutations.js
new file mode 100644
index 000000000..a370c9ff0
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/mutations.js
@@ -0,0 +1,19 @@
+import { withMutation } from 'plugin-api/beta/client/hocs';
+import { gql } from 'react-apollo';
+
+export const withRequestDownloadLink = withMutation(
+  gql`
+    mutation DownloadCommentHistory {
+      requestDownloadLink {
+        errors {
+          translation_key
+        }
+      }
+    }
+  `,
+  {
+    props: ({ mutate }) => ({
+      requestDownloadLink: () => mutate({ variables: {} }),
+    }),
+  }
+);
diff --git a/plugins/talk-plugin-profile-data/client/translations.yml b/plugins/talk-plugin-profile-data/client/translations.yml
new file mode 100644
index 000000000..ee6dc4e51
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/client/translations.yml
@@ -0,0 +1,12 @@
+en:
+  download_request:
+    section_title: "Download My Comment History"
+    you_will_get_a_copy: "You will recieve an email with a link to download your comment history. You can make"
+    download_rate: "one download request every 7 days"
+    most_recent_request: "Your most recent request"
+    request: "Request Comment History"
+    rate_limit: "You can submit another Comment History request in {0}"
+    hours: "{0} hours"
+    days: "{0} days"
+    hour: "{0} hour"
+    day: "{0} day"
diff --git a/plugins/talk-plugin-profile-data/index.js b/plugins/talk-plugin-profile-data/index.js
new file mode 100644
index 000000000..6990d00ad
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/index.js
@@ -0,0 +1,307 @@
+const express = require('express');
+const path = require('path');
+const { get, pick, kebabCase } = require('lodash');
+const moment = require('moment');
+const uuid = require('uuid/v4');
+const archiver = require('archiver');
+const stringify = require('csv-stringify');
+
+const DOWNLOAD_LINK_SUBJECT = 'download_link';
+
+async function verifyDownloadToken(
+  { connectors: { services: { Users } } },
+  token
+) {
+  const jwt = await Users.verifyToken(token, {
+    subject: DOWNLOAD_LINK_SUBJECT,
+  });
+
+  return jwt;
+}
+
+async function sendDownloadLink({
+  user,
+  connectors: {
+    errors,
+    secrets,
+    services: { Users, I18n, Limit },
+    models: { User },
+  },
+}) {
+  // downloadLinkLimiter can be used to limit downloads for the user's data to
+  // once every 7 days.
+  const downloadLinkLimiter = new Limit('profileDataDownloadLimiter', 1, '7d');
+
+  // Check that the user has not already requested a download within the last
+  // 7 days.
+  const attempts = await downloadLinkLimiter.get(user.id);
+  if (attempts && attempts >= 1) {
+    throw errors.ErrMaxRateLimit;
+  }
+
+  // Check if the lastAccountDownload time is within 7 days.
+  if (
+    user.lastAccountDownload &&
+    moment(user.lastAccountDownload)
+      .add(7, 'days')
+      .isAfter(moment())
+  ) {
+    throw errors.ErrMaxRateLimit;
+  }
+
+  // The account currently does not have a download link, let's record the
+  // download. This will throw an error if a race ocurred and we should stop
+  // now.
+  await downloadLinkLimiter.test(user.id);
+
+  // Generate a token for the download link.
+  const token = await secrets.jwt.sign(
+    { user: user.id },
+    { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
+  );
+
+  // Send the download link via the user's attached email account.
+  await Users.sendEmail(user, {
+    template: 'download',
+    locals: {
+      token,
+    },
+    subject: I18n.t('email.download.subject'),
+  });
+
+  // Amend the lastAccountDownload on the user.
+  await User.update(
+    { id: user.id },
+    { $set: { 'metadata.lastAccountDownload': new Date() } }
+  );
+}
+
+// loadCommentsBatch will load a batch of the comments and write them to the
+// stream.
+async function loadCommentsBatch(ctx, csv, variables = {}) {
+  let result = await ctx.graphql(
+    `
+    query GetMyComments($cursor: Cursor) {
+      me {
+        comments(query: {
+          limit: 100,
+          cursor: $cursor
+        }) {
+          hasNextPage
+          endCursor
+          nodes {
+            id
+            created_at
+            asset {
+              url
+            }
+            body
+            url
+          }
+        }
+      }
+    }
+  `,
+    variables
+  );
+  if (result.errors) {
+    throw result.errors;
+  }
+
+  for (const comment of get(result, 'data.me.comments.nodes', [])) {
+    csv.write([
+      comment.id,
+      moment(comment.created_at).format('YYYY-MM-DD HH:mm:ss'),
+      get(comment, 'asset.url'),
+      comment.url,
+      comment.body,
+    ]);
+  }
+
+  return pick(result.data.me.comments, ['hasNextPage', 'endCursor']);
+}
+
+// loadComments will load batches of the comments and write them to the csv
+// stream. Once the comments have finished writing, it will close the stream.
+async function loadComments(ctx, archive, latestContentDate) {
+  // Create all the csv writers that'll write the data to the archive.
+  const csv = stringify();
+
+  // Add all the streams as files to the archive.
+  archive.append(csv, { name: 'talk-export/my_comments.csv' });
+
+  csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
+
+  // Load the first batch's comments from the latest date that we were provided
+  // from the token.
+  let connection = await loadCommentsBatch(ctx, csv, {
+    cursor: latestContentDate,
+  });
+
+  // As long as there's more comments, keep paginating.
+  while (connection.hasNextPage) {
+    connection = await loadCommentsBatch(ctx, csv, {
+      cursor: connection.endCursor,
+    });
+  }
+
+  csv.end();
+}
+
+const router = router => {
+  // /account/download will render the download page.
+  router.get('/account/download', (req, res) => {
+    res.render(path.join(__dirname, 'server/views/download'));
+  });
+
+  // /api/v1/account/download will send back a zipped archive of the users
+  // account.
+  router.post(
+    '/api/v1/account/download',
+    express.urlencoded({ extended: false }),
+    async (req, res, next) => {
+      const { token = null, check = false } = req.body;
+
+      if (check) {
+        // This request is checking to see if the token is valid.
+        try {
+          // Verify the token
+          await verifyDownloadToken(req.context, token);
+        } catch (err) {
+          // Log out the error, slurp it and send out the predefined error to the
+          // error handler.
+          console.error(err);
+          return next(new Error('invalid token'));
+        }
+
+        res.status(204).end();
+
+        // Don't continue to pass it onto the next middleware, as we've only been
+        // asked to verify the token.
+        return;
+      }
+
+      const { connectors: { services: { Users } } } = req.context;
+
+      try {
+        // Pull the userID and the date that the token was issued out of the
+        // provided token.
+        const { user: userID, iat } = await verifyDownloadToken(
+          req.context,
+          token
+        );
+
+        // Unpack the date that the token was issued, and use it as a source for the
+        // earliest comment we should include in the download.
+        const latestContentDate = new Date(iat * 1000);
+
+        // Grab the user that we're generating the export from. We'll use it to
+        // create a new context.
+        const user = await Users.findById(userID);
+
+        // Base a new context off of the new user.
+        const ctx = req.context.masqueradeAs(user);
+
+        // Get the current user's username. We need it for the generated filenames.
+        const result = await ctx.graphql('{ me { username } }');
+        if (result.errors) {
+          throw result.errors;
+        }
+        const username = get(result, 'data.me.username');
+
+        // Generate the filename of the file that the user will download.
+        const filename = `talk-${kebabCase(username)}-${kebabCase(
+          moment(latestContentDate).format('YYYY-MM-DD HH:mm:ss')
+        )}.zip`;
+
+        res.writeHead(200, {
+          'Content-Type': 'application/octet-stream',
+          'Content-Disposition': `attachment; filename=${filename}`,
+        });
+
+        // Create the zip archive we'll use to write all the exported files to.
+        const archive = archiver('zip', {
+          zlib: { level: 9 },
+        });
+
+        // Pipe this to the response writer directly.
+        archive.pipe(res);
+
+        // Load the comments csv up with the user's comments.
+        await loadComments(ctx, archive, latestContentDate);
+
+        // Mark the end of adding files, no more files can be added after this. Once
+        // all the stream readers have finished writing, and have closed, the
+        // archiver will close which will finish the HTTP request.
+        archive.finalize();
+      } catch (err) {
+        return next(err);
+      }
+    }
+  );
+};
+
+const typeDefs = `
+  type User {
+
+    # lastAccountDownload is the date that the user last requested a comment
+    # download.
+    lastAccountDownload: Date
+  }
+
+  type RequestDownloadLinkResponse implements Response {
+
+    # An array of errors relating to the mutation that occurred.
+    errors: [UserError!]
+  }
+
+  type RootMutation {
+
+    # requestDownloadLink will request a download link be sent to the primary
+    # users email address.
+    requestDownloadLink: RequestDownloadLinkResponse
+  }
+`;
+
+const connect = connectors => {
+  const { services: { Mailer } } = connectors;
+
+  // Setup the mail templates.
+  ['txt', 'html'].forEach(format => {
+    Mailer.templates.register(
+      path.join(__dirname, 'server', 'emails', `download.${format}.ejs`),
+      'download',
+      format
+    );
+  });
+};
+
+module.exports = {
+  mutators: ctx => ({
+    User: {
+      requestDownloadLink: () => sendDownloadLink(ctx),
+    },
+  }),
+  router,
+  connect,
+  typeDefs,
+  translations: path.join(__dirname, 'translations.yml'),
+  resolvers: {
+    RootMutation: {
+      requestDownloadLink: async (_, args, { mutators: { User } }) => {
+        await User.requestDownloadLink();
+      },
+    },
+    User: {
+      lastAccountDownload: (user, args, { user: currentUser }) => {
+        // If the current user is not the requesting user, and the user is not
+        // an admin, return nothing.
+        if (user.id !== currentUser.id && user.role !== 'ADMIN') {
+          return null;
+        }
+
+        return get(user, 'metadata.lastAccountDownload', null);
+      },
+    },
+  },
+};
diff --git a/plugins/talk-plugin-profile-data/package.json b/plugins/talk-plugin-profile-data/package.json
new file mode 100644
index 000000000..ed5a29050
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "@coralproject/talk-plugin-profile-data",
+  "version": "1.0.0",
+  "description": "Adds profile data management for Talk",
+  "main": "index.js",
+  "license": "Apache-2.0",
+  "private": false,
+  "dependencies": {
+    "archiver": "^2.1.1",
+    "csv-stringify": "^3.0.0"
+  }
+}
diff --git a/plugins/talk-plugin-profile-data/server/emails/download.html.ejs b/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
new file mode 100644
index 000000000..c6aeb8e1e
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
@@ -0,0 +1 @@
+<p><%= t('email.download.download_link_ready') %> <a href="<%= BASE_URL %>account/download#<%= token %>"><%= t('email.download.download_archive') %></a></p>
diff --git a/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs b/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
new file mode 100644
index 000000000..4f719bc06
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
@@ -0,0 +1,3 @@
+<%= t('email.download.download_link_ready') %>
+
+    <%= BASE_URL %>account/download#<%= token %>
diff --git a/plugins/talk-plugin-profile-data/server/views/download.ejs b/plugins/talk-plugin-profile-data/server/views/download.ejs
new file mode 100644
index 000000000..53ee8a4e9
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/views/download.ejs
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
+    <title><%= t('download_landing.download_your_account') %></title>
+    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
+    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
+    <%- include(root + '/partials/head') %>
+  </head>
+  <body class="confirm-email-page">
+    <div id="root">
+      <div class="error-console container"></div>
+      <form id="download-form" class="container" method="post" action="<%= BASE_PATH %>api/v1/account/download">
+        <legend class="legend"><%= t('download_landing.click_to_download') %></legend>
+        <button type="submit"><%= t('download_landing.confirm') %></button>
+      </form>
+    </div>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+    <script type="text/javascript">
+      $(function() {
+        function showError(error) {
+          try {
+            let err = JSON.parse(error);
+            $('.error-console').text(err.message).addClass('active');
+          } catch (err) {
+            $('.error-console').text(error).addClass('active');
+          }
+        }
+
+        var token = location.hash.replace('#', '');
+
+        $.ajax({
+          url: '<%= BASE_PATH %>api/v1/account/download',
+          contentType: 'application/json',
+          method: 'POST',
+          data: JSON.stringify({token: token, check: true})
+        })
+        .then(function () {
+          $('#download-form').append('<input name="token" type="hidden" value="' + token + '"/>').fadeIn();
+        })
+        .catch(function (error) {
+          showError(error.responseText);
+        });
+      });
+    </script>
+  </body>
+</html>
diff --git a/plugins/talk-plugin-profile-data/translations.yml b/plugins/talk-plugin-profile-data/translations.yml
new file mode 100644
index 000000000..42afe2313
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/translations.yml
@@ -0,0 +1,10 @@
+en:
+  download_landing:
+    download_your_account: "Download Your Account"
+    click_to_download: "Click below to download your account"
+    confirm: "Download"
+  email:
+    download:
+      subject: "Your download link is ready" # TODO: replace
+      download_link_ready: "Your download link is now ready, visit the following to download an archive of your account:" # TODO: replace
+      download_archive: "Download Archive" # TODO: replace

From 43e3cb8f10fbf21b54eb0f66b32c59eb1e11553d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 9 Apr 2018 16:07:05 -0600
Subject: [PATCH 22/44] cleanup of plugin code

---
 plugins/talk-plugin-profile-data/index.js     | 306 +-----------------
 .../server/connect.js                         |  14 +
 .../server/constants.js                       |   3 +
 .../server/mutators.js                        |  66 ++++
 .../server/resolvers.js                       |  20 ++
 .../talk-plugin-profile-data/server/router.js | 183 +++++++++++
 .../server/typeDefs.graphql                   |  19 ++
 .../server/typeDefs.js                        |   7 +
 8 files changed, 319 insertions(+), 299 deletions(-)
 create mode 100644 plugins/talk-plugin-profile-data/server/connect.js
 create mode 100644 plugins/talk-plugin-profile-data/server/constants.js
 create mode 100644 plugins/talk-plugin-profile-data/server/mutators.js
 create mode 100644 plugins/talk-plugin-profile-data/server/resolvers.js
 create mode 100644 plugins/talk-plugin-profile-data/server/router.js
 create mode 100644 plugins/talk-plugin-profile-data/server/typeDefs.graphql
 create mode 100644 plugins/talk-plugin-profile-data/server/typeDefs.js

diff --git a/plugins/talk-plugin-profile-data/index.js b/plugins/talk-plugin-profile-data/index.js
index 6990d00ad..7bfa81748 100644
--- a/plugins/talk-plugin-profile-data/index.js
+++ b/plugins/talk-plugin-profile-data/index.js
@@ -1,307 +1,15 @@
-const express = require('express');
 const path = require('path');
-const { get, pick, kebabCase } = require('lodash');
-const moment = require('moment');
-const uuid = require('uuid/v4');
-const archiver = require('archiver');
-const stringify = require('csv-stringify');
-
-const DOWNLOAD_LINK_SUBJECT = 'download_link';
-
-async function verifyDownloadToken(
-  { connectors: { services: { Users } } },
-  token
-) {
-  const jwt = await Users.verifyToken(token, {
-    subject: DOWNLOAD_LINK_SUBJECT,
-  });
-
-  return jwt;
-}
-
-async function sendDownloadLink({
-  user,
-  connectors: {
-    errors,
-    secrets,
-    services: { Users, I18n, Limit },
-    models: { User },
-  },
-}) {
-  // downloadLinkLimiter can be used to limit downloads for the user's data to
-  // once every 7 days.
-  const downloadLinkLimiter = new Limit('profileDataDownloadLimiter', 1, '7d');
-
-  // Check that the user has not already requested a download within the last
-  // 7 days.
-  const attempts = await downloadLinkLimiter.get(user.id);
-  if (attempts && attempts >= 1) {
-    throw errors.ErrMaxRateLimit;
-  }
-
-  // Check if the lastAccountDownload time is within 7 days.
-  if (
-    user.lastAccountDownload &&
-    moment(user.lastAccountDownload)
-      .add(7, 'days')
-      .isAfter(moment())
-  ) {
-    throw errors.ErrMaxRateLimit;
-  }
-
-  // The account currently does not have a download link, let's record the
-  // download. This will throw an error if a race ocurred and we should stop
-  // now.
-  await downloadLinkLimiter.test(user.id);
-
-  // Generate a token for the download link.
-  const token = await secrets.jwt.sign(
-    { user: user.id },
-    { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
-  );
-
-  // Send the download link via the user's attached email account.
-  await Users.sendEmail(user, {
-    template: 'download',
-    locals: {
-      token,
-    },
-    subject: I18n.t('email.download.subject'),
-  });
-
-  // Amend the lastAccountDownload on the user.
-  await User.update(
-    { id: user.id },
-    { $set: { 'metadata.lastAccountDownload': new Date() } }
-  );
-}
-
-// loadCommentsBatch will load a batch of the comments and write them to the
-// stream.
-async function loadCommentsBatch(ctx, csv, variables = {}) {
-  let result = await ctx.graphql(
-    `
-    query GetMyComments($cursor: Cursor) {
-      me {
-        comments(query: {
-          limit: 100,
-          cursor: $cursor
-        }) {
-          hasNextPage
-          endCursor
-          nodes {
-            id
-            created_at
-            asset {
-              url
-            }
-            body
-            url
-          }
-        }
-      }
-    }
-  `,
-    variables
-  );
-  if (result.errors) {
-    throw result.errors;
-  }
-
-  for (const comment of get(result, 'data.me.comments.nodes', [])) {
-    csv.write([
-      comment.id,
-      moment(comment.created_at).format('YYYY-MM-DD HH:mm:ss'),
-      get(comment, 'asset.url'),
-      comment.url,
-      comment.body,
-    ]);
-  }
-
-  return pick(result.data.me.comments, ['hasNextPage', 'endCursor']);
-}
-
-// loadComments will load batches of the comments and write them to the csv
-// stream. Once the comments have finished writing, it will close the stream.
-async function loadComments(ctx, archive, latestContentDate) {
-  // Create all the csv writers that'll write the data to the archive.
-  const csv = stringify();
-
-  // Add all the streams as files to the archive.
-  archive.append(csv, { name: 'talk-export/my_comments.csv' });
-
-  csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
-
-  // Load the first batch's comments from the latest date that we were provided
-  // from the token.
-  let connection = await loadCommentsBatch(ctx, csv, {
-    cursor: latestContentDate,
-  });
-
-  // As long as there's more comments, keep paginating.
-  while (connection.hasNextPage) {
-    connection = await loadCommentsBatch(ctx, csv, {
-      cursor: connection.endCursor,
-    });
-  }
-
-  csv.end();
-}
-
-const router = router => {
-  // /account/download will render the download page.
-  router.get('/account/download', (req, res) => {
-    res.render(path.join(__dirname, 'server/views/download'));
-  });
-
-  // /api/v1/account/download will send back a zipped archive of the users
-  // account.
-  router.post(
-    '/api/v1/account/download',
-    express.urlencoded({ extended: false }),
-    async (req, res, next) => {
-      const { token = null, check = false } = req.body;
-
-      if (check) {
-        // This request is checking to see if the token is valid.
-        try {
-          // Verify the token
-          await verifyDownloadToken(req.context, token);
-        } catch (err) {
-          // Log out the error, slurp it and send out the predefined error to the
-          // error handler.
-          console.error(err);
-          return next(new Error('invalid token'));
-        }
-
-        res.status(204).end();
-
-        // Don't continue to pass it onto the next middleware, as we've only been
-        // asked to verify the token.
-        return;
-      }
-
-      const { connectors: { services: { Users } } } = req.context;
-
-      try {
-        // Pull the userID and the date that the token was issued out of the
-        // provided token.
-        const { user: userID, iat } = await verifyDownloadToken(
-          req.context,
-          token
-        );
-
-        // Unpack the date that the token was issued, and use it as a source for the
-        // earliest comment we should include in the download.
-        const latestContentDate = new Date(iat * 1000);
-
-        // Grab the user that we're generating the export from. We'll use it to
-        // create a new context.
-        const user = await Users.findById(userID);
-
-        // Base a new context off of the new user.
-        const ctx = req.context.masqueradeAs(user);
-
-        // Get the current user's username. We need it for the generated filenames.
-        const result = await ctx.graphql('{ me { username } }');
-        if (result.errors) {
-          throw result.errors;
-        }
-        const username = get(result, 'data.me.username');
-
-        // Generate the filename of the file that the user will download.
-        const filename = `talk-${kebabCase(username)}-${kebabCase(
-          moment(latestContentDate).format('YYYY-MM-DD HH:mm:ss')
-        )}.zip`;
-
-        res.writeHead(200, {
-          'Content-Type': 'application/octet-stream',
-          'Content-Disposition': `attachment; filename=${filename}`,
-        });
-
-        // Create the zip archive we'll use to write all the exported files to.
-        const archive = archiver('zip', {
-          zlib: { level: 9 },
-        });
-
-        // Pipe this to the response writer directly.
-        archive.pipe(res);
-
-        // Load the comments csv up with the user's comments.
-        await loadComments(ctx, archive, latestContentDate);
-
-        // Mark the end of adding files, no more files can be added after this. Once
-        // all the stream readers have finished writing, and have closed, the
-        // archiver will close which will finish the HTTP request.
-        archive.finalize();
-      } catch (err) {
-        return next(err);
-      }
-    }
-  );
-};
-
-const typeDefs = `
-  type User {
-
-    # lastAccountDownload is the date that the user last requested a comment
-    # download.
-    lastAccountDownload: Date
-  }
-
-  type RequestDownloadLinkResponse implements Response {
-
-    # An array of errors relating to the mutation that occurred.
-    errors: [UserError!]
-  }
-
-  type RootMutation {
-
-    # requestDownloadLink will request a download link be sent to the primary
-    # users email address.
-    requestDownloadLink: RequestDownloadLinkResponse
-  }
-`;
-
-const connect = connectors => {
-  const { services: { Mailer } } = connectors;
-
-  // Setup the mail templates.
-  ['txt', 'html'].forEach(format => {
-    Mailer.templates.register(
-      path.join(__dirname, 'server', 'emails', `download.${format}.ejs`),
-      'download',
-      format
-    );
-  });
-};
+const router = require('./server/router');
+const mutators = require('./server/mutators');
+const typeDefs = require('./server/typeDefs');
+const connect = require('./server/connect');
+const resolvers = require('./server/resolvers');
 
 module.exports = {
-  mutators: ctx => ({
-    User: {
-      requestDownloadLink: () => sendDownloadLink(ctx),
-    },
-  }),
+  mutators,
   router,
   connect,
   typeDefs,
   translations: path.join(__dirname, 'translations.yml'),
-  resolvers: {
-    RootMutation: {
-      requestDownloadLink: async (_, args, { mutators: { User } }) => {
-        await User.requestDownloadLink();
-      },
-    },
-    User: {
-      lastAccountDownload: (user, args, { user: currentUser }) => {
-        // If the current user is not the requesting user, and the user is not
-        // an admin, return nothing.
-        if (user.id !== currentUser.id && user.role !== 'ADMIN') {
-          return null;
-        }
-
-        return get(user, 'metadata.lastAccountDownload', null);
-      },
-    },
-  },
+  resolvers,
 };
diff --git a/plugins/talk-plugin-profile-data/server/connect.js b/plugins/talk-plugin-profile-data/server/connect.js
new file mode 100644
index 000000000..f09b2dc7b
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/connect.js
@@ -0,0 +1,14 @@
+const path = require('path');
+
+module.exports = connectors => {
+  const { services: { Mailer } } = connectors;
+
+  // Setup the mail templates.
+  ['txt', 'html'].forEach(format => {
+    Mailer.templates.register(
+      path.join(__dirname, 'emails', `download.${format}.ejs`),
+      'download',
+      format
+    );
+  });
+};
diff --git a/plugins/talk-plugin-profile-data/server/constants.js b/plugins/talk-plugin-profile-data/server/constants.js
new file mode 100644
index 000000000..6183e8bbe
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/constants.js
@@ -0,0 +1,3 @@
+module.exports = {
+  DOWNLOAD_LINK_SUBJECT: 'download_link',
+};
diff --git a/plugins/talk-plugin-profile-data/server/mutators.js b/plugins/talk-plugin-profile-data/server/mutators.js
new file mode 100644
index 000000000..e5d717978
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/mutators.js
@@ -0,0 +1,66 @@
+const moment = require('moment');
+const uuid = require('uuid/v4');
+const { DOWNLOAD_LINK_SUBJECT } = require('./constants');
+
+async function sendDownloadLink({
+  user,
+  connectors: {
+    errors,
+    secrets,
+    services: { Users, I18n, Limit },
+    models: { User },
+  },
+}) {
+  // downloadLinkLimiter can be used to limit downloads for the user's data to
+  // once every 7 days.
+  const downloadLinkLimiter = new Limit('profileDataDownloadLimiter', 1, '7d');
+
+  // Check that the user has not already requested a download within the last
+  // 7 days.
+  const attempts = await downloadLinkLimiter.get(user.id);
+  if (attempts && attempts >= 1) {
+    throw errors.ErrMaxRateLimit;
+  }
+
+  // Check if the lastAccountDownload time is within 7 days.
+  if (
+    user.lastAccountDownload &&
+    moment(user.lastAccountDownload)
+      .add(7, 'days')
+      .isAfter(moment())
+  ) {
+    throw errors.ErrMaxRateLimit;
+  }
+
+  // The account currently does not have a download link, let's record the
+  // download. This will throw an error if a race ocurred and we should stop
+  // now.
+  await downloadLinkLimiter.test(user.id);
+
+  // Generate a token for the download link.
+  const token = await secrets.jwt.sign(
+    { user: user.id },
+    { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
+  );
+
+  // Send the download link via the user's attached email account.
+  await Users.sendEmail(user, {
+    template: 'download',
+    locals: {
+      token,
+    },
+    subject: I18n.t('email.download.subject'),
+  });
+
+  // Amend the lastAccountDownload on the user.
+  await User.update(
+    { id: user.id },
+    { $set: { 'metadata.lastAccountDownload': new Date() } }
+  );
+}
+
+module.exports = ctx => ({
+  User: {
+    requestDownloadLink: () => sendDownloadLink(ctx),
+  },
+});
diff --git a/plugins/talk-plugin-profile-data/server/resolvers.js b/plugins/talk-plugin-profile-data/server/resolvers.js
new file mode 100644
index 000000000..691907f8c
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/resolvers.js
@@ -0,0 +1,20 @@
+const { get } = require('lodash');
+
+module.exports = {
+  RootMutation: {
+    requestDownloadLink: async (_, args, { mutators: { User } }) => {
+      await User.requestDownloadLink();
+    },
+  },
+  User: {
+    lastAccountDownload: (user, args, { user: currentUser }) => {
+      // If the current user is not the requesting user, and the user is not
+      // an admin, return nothing.
+      if (user.id !== currentUser.id && user.role !== 'ADMIN') {
+        return null;
+      }
+
+      return get(user, 'metadata.lastAccountDownload', null);
+    },
+  },
+};
diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js
new file mode 100644
index 000000000..5ef3b0cfc
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/router.js
@@ -0,0 +1,183 @@
+const path = require('path');
+const express = require('express');
+const { DOWNLOAD_LINK_SUBJECT } = require('./constants');
+const { get, pick, kebabCase } = require('lodash');
+const moment = require('moment');
+const archiver = require('archiver');
+const stringify = require('csv-stringify');
+
+async function verifyDownloadToken(
+  { connectors: { services: { Users } } },
+  token
+) {
+  const jwt = await Users.verifyToken(token, {
+    subject: DOWNLOAD_LINK_SUBJECT,
+  });
+
+  return jwt;
+}
+
+// loadCommentsBatch will load a batch of the comments and write them to the
+// stream.
+async function loadCommentsBatch(ctx, csv, variables = {}) {
+  let result = await ctx.graphql(
+    `
+    query GetMyComments($cursor: Cursor) {
+      me {
+        comments(query: {
+          limit: 100,
+          cursor: $cursor
+        }) {
+          hasNextPage
+          endCursor
+          nodes {
+            id
+            created_at
+            asset {
+              url
+            }
+            body
+            url
+          }
+        }
+      }
+    }
+  `,
+    variables
+  );
+  if (result.errors) {
+    throw result.errors;
+  }
+
+  for (const comment of get(result, 'data.me.comments.nodes', [])) {
+    csv.write([
+      comment.id,
+      moment(comment.created_at).format('YYYY-MM-DD HH:mm:ss'),
+      get(comment, 'asset.url'),
+      comment.url,
+      comment.body,
+    ]);
+  }
+
+  return pick(result.data.me.comments, ['hasNextPage', 'endCursor']);
+}
+
+// loadComments will load batches of the comments and write them to the csv
+// stream. Once the comments have finished writing, it will close the stream.
+async function loadComments(ctx, archive, latestContentDate) {
+  // Create all the csv writers that'll write the data to the archive.
+  const csv = stringify();
+
+  // Add all the streams as files to the archive.
+  archive.append(csv, { name: 'talk-export/my_comments.csv' });
+
+  csv.write(['ID', 'Timestamp', 'Article', 'Link', 'Body']);
+
+  // Load the first batch's comments from the latest date that we were provided
+  // from the token.
+  let connection = await loadCommentsBatch(ctx, csv, {
+    cursor: latestContentDate,
+  });
+
+  // As long as there's more comments, keep paginating.
+  while (connection.hasNextPage) {
+    connection = await loadCommentsBatch(ctx, csv, {
+      cursor: connection.endCursor,
+    });
+  }
+
+  csv.end();
+}
+
+module.exports = router => {
+  // /account/download will render the download page.
+  router.get('/account/download', (req, res) => {
+    res.render(path.join(__dirname, 'views', 'download'));
+  });
+
+  // /api/v1/account/download will send back a zipped archive of the users
+  // account.
+  router.post(
+    '/api/v1/account/download',
+    express.urlencoded({ extended: false }),
+    async (req, res, next) => {
+      const { token = null, check = false } = req.body;
+
+      if (check) {
+        // This request is checking to see if the token is valid.
+        try {
+          // Verify the token
+          await verifyDownloadToken(req.context, token);
+        } catch (err) {
+          // Log out the error, slurp it and send out the predefined error to the
+          // error handler.
+          console.error(err);
+          return next(new Error('invalid token'));
+        }
+
+        res.status(204).end();
+
+        // Don't continue to pass it onto the next middleware, as we've only been
+        // asked to verify the token.
+        return;
+      }
+
+      const { connectors: { services: { Users } } } = req.context;
+
+      try {
+        // Pull the userID and the date that the token was issued out of the
+        // provided token.
+        const { user: userID, iat } = await verifyDownloadToken(
+          req.context,
+          token
+        );
+
+        // Unpack the date that the token was issued, and use it as a source for the
+        // earliest comment we should include in the download.
+        const latestContentDate = new Date(iat * 1000);
+
+        // Grab the user that we're generating the export from. We'll use it to
+        // create a new context.
+        const user = await Users.findById(userID);
+
+        // Base a new context off of the new user.
+        const ctx = req.context.masqueradeAs(user);
+
+        // Get the current user's username. We need it for the generated filenames.
+        const result = await ctx.graphql('{ me { username } }');
+        if (result.errors) {
+          throw result.errors;
+        }
+        const username = get(result, 'data.me.username');
+
+        // Generate the filename of the file that the user will download.
+        const filename = `talk-${kebabCase(username)}-${kebabCase(
+          moment(latestContentDate).format('YYYY-MM-DD HH:mm:ss')
+        )}.zip`;
+
+        res.writeHead(200, {
+          'Content-Type': 'application/octet-stream',
+          'Content-Disposition': `attachment; filename=${filename}`,
+        });
+
+        // Create the zip archive we'll use to write all the exported files to.
+        const archive = archiver('zip', {
+          zlib: { level: 9 },
+        });
+
+        // Pipe this to the response writer directly.
+        archive.pipe(res);
+
+        // Load the comments csv up with the user's comments.
+        await loadComments(ctx, archive, latestContentDate);
+
+        // Mark the end of adding files, no more files can be added after this. Once
+        // all the stream readers have finished writing, and have closed, the
+        // archiver will close which will finish the HTTP request.
+        archive.finalize();
+      } catch (err) {
+        return next(err);
+      }
+    }
+  );
+};
diff --git a/plugins/talk-plugin-profile-data/server/typeDefs.graphql b/plugins/talk-plugin-profile-data/server/typeDefs.graphql
new file mode 100644
index 000000000..0029111c3
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/typeDefs.graphql
@@ -0,0 +1,19 @@
+type User {
+
+  # lastAccountDownload is the date that the user last requested a comment
+  # download.
+  lastAccountDownload: Date
+}
+
+type RequestDownloadLinkResponse implements Response {
+
+  # An array of errors relating to the mutation that occurred.
+  errors: [UserError!]
+}
+
+type RootMutation {
+
+  # requestDownloadLink will request a download link be sent to the primary
+  # users email address.
+  requestDownloadLink: RequestDownloadLinkResponse
+}
diff --git a/plugins/talk-plugin-profile-data/server/typeDefs.js b/plugins/talk-plugin-profile-data/server/typeDefs.js
new file mode 100644
index 000000000..ccadb70b0
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/typeDefs.js
@@ -0,0 +1,7 @@
+const path = require('path');
+const fs = require('fs');
+
+module.exports = fs.readFileSync(
+  path.join(__dirname, 'typeDefs.graphql'),
+  'utf8'
+);

From 8a7d4c4fcc21f867f7071c1b401191899de9e1c5 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 9 Apr 2018 16:14:25 -0600
Subject: [PATCH 23/44] readme update

---
 plugins/talk-plugin-profile-data/README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/talk-plugin-profile-data/README.md b/plugins/talk-plugin-profile-data/README.md
index fe10a817b..17f90c666 100644
--- a/plugins/talk-plugin-profile-data/README.md
+++ b/plugins/talk-plugin-profile-data/README.md
@@ -1,8 +1,10 @@
 ---
 title: talk-plugin-profile-data
 layout: plugin
+permalink: /plugin/talk-plugin-profile-data/
 plugin:
     name: talk-plugin-profile-data
+    default: true
     provides:
         - Client
         - Server

From afa592aa78a7ab0839c0c80a112f7253243bf8ee Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 9 Apr 2018 16:34:08 -0600
Subject: [PATCH 24/44] e2e fixes

---
 test/e2e/page_objects/embedStream.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/e2e/page_objects/embedStream.js b/test/e2e/page_objects/embedStream.js
index be60fc8d0..de3a29973 100644
--- a/test/e2e/page_objects/embedStream.js
+++ b/test/e2e/page_objects/embedStream.js
@@ -28,7 +28,7 @@ module.exports = {
         return this.section.comments;
       },
       navigateToAsset: function(asset) {
-        this.api.url(`${this.api.launchUrl}/assets/title/${asset}`);
+        this.api.url(`${this.api.launchUrl}/dev/assets/title/${asset}`);
         return this;
       },
       switchToIframe: function() {
@@ -44,7 +44,7 @@ module.exports = {
     },
   ],
   url: function() {
-    return this.api.launchUrl;
+    return this.api.launchUrl + '/dev/';
   },
   elements: {
     iframe: `#${iframeId}`,

From 1ceb1b4014bc16f2cee8d44495b0bf68948b8236 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 10 Apr 2018 11:46:32 -0300
Subject: [PATCH 25/44] Save, and edit changes

---
 .../routes/Configure/components/Configure.js  | 13 +++-
 .../components/OrganizationSettings.css       | 27 +++++---
 .../components/OrganizationSettings.js        | 63 ++++++++++++++-----
 .../routes/Configure/containers/Configure.js  |  5 +-
 locales/en.yml                                |  2 +
 locales/es.yml                                |  2 +
 6 files changed, 88 insertions(+), 24 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/Configure.js b/client/coral-admin/src/routes/Configure/components/Configure.js
index 69ab4f06c..bcd48c21c 100644
--- a/client/coral-admin/src/routes/Configure/components/Configure.js
+++ b/client/coral-admin/src/routes/Configure/components/Configure.js
@@ -8,7 +8,14 @@ import SaveChangesDialog from './SaveChangesDialog';
 
 class Configure extends React.Component {
   render() {
-    const { canSave, currentUser, root, savePending, settings } = this.props;
+    const {
+      canSave,
+      currentUser,
+      root,
+      savePending,
+      settings,
+      clearPending,
+    } = this.props;
 
     if (!can(currentUser, 'UPDATE_CONFIG')) {
       return <p>{t('configure.access_message')}</p>;
@@ -17,6 +24,9 @@ class Configure extends React.Component {
     const passProps = {
       root,
       settings,
+      savePending,
+      clearPending,
+      canSave,
     };
 
     return (
@@ -84,6 +94,7 @@ Configure.propTypes = {
   children: PropTypes.node.isRequired,
   saveDialog: PropTypes.bool,
   hideSaveDialog: PropTypes.func.isRequired,
+  clearPending: PropTypes.func.isRequired,
 };
 
 export default Configure;
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index 06ada55c4..d28fced83 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -16,7 +16,7 @@
 }
 
 .detailValue {
-  padding: 6px 10px;
+  padding: 6px 0;
   border: solid 1px transparent;
   display: block;
   font-size: 1em;
@@ -24,6 +24,8 @@
 }
 
 .editable {
+  padding-left: 10px;
+  padding-right: 10px;
   border-color: grey;
 }
 
@@ -32,20 +34,31 @@
   list-style: none;
 }
 
-.editButton {
-  position: absolute;
-  right: 10px;
-  top: 10px;
+.button, .button:disabled {
+  background: white;
+  border: solid 1px grey;
 }
 
 .actionBox {
   position: absolute;
-  right: 10px;
-  top: 10px; 
+  right: 20px;
+  top: 20px;
   text-align: center;
+  width: 100px;
 }
 
 .cancelButton {
   padding: 10px;
   display: block;
+  color: #4f5c67;
+  font-weight: 500;
+  
+  &:hover {
+    cursor: pointer;
+  }
+}
+
+.changedSave {
+  background-color: #00796B;
+  color: white;
 }
\ No newline at end of file
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
index 18fe653e1..06c91926c 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
@@ -17,6 +17,12 @@ class OrganizationSettings extends React.Component {
     }));
   };
 
+  disableEditing = () => {
+    this.setState(() => ({
+      editing: false,
+    }));
+  };
+
   updateName = event => {
     const updater = { organizationName: { $set: event.target.value } };
     this.props.updatePending({ updater });
@@ -27,32 +33,56 @@ class OrganizationSettings extends React.Component {
     this.props.updatePending({ updater });
   };
 
+  cancelEditing = () => {
+    this.disableEditing();
+    this.props.clearPending();
+  };
+
+  save = async () => {
+    await this.props.savePending();
+    this.disableEditing();
+  };
+
   render() {
-    const { settings, slotPassthrough } = this.props;
+    const { settings, slotPassthrough, canSave } = this.props;
     return (
       <ConfigurePage title={t('configure.organization_information')}>
         <p>{t('configure.organization_info_copy')}</p>
         <p>{t('configure.organization_info_copy_2')}</p>
         <ConfigureCard>
           {!this.state.editing ? (
-            <Button
-              className={styles.editButton}
-              icon="settings"
-              onClick={this.toggleEditing}
-            >
-              Edit Info
-            </Button>
+            <div className={styles.actionBox}>
+              <Button
+                className={styles.button}
+                icon="settings"
+                onClick={this.toggleEditing}
+                full
+              >
+                {t('configure.edit_info')}
+              </Button>
+            </div>
           ) : (
             <div className={styles.actionBox}>
-              <Button icon="done" onClick={this.toggleEditing}>
-                Save
-              </Button>
-              <a className={styles.cancelButton}>Cancel</a>
+              {canSave ? (
+                <Button
+                  raised
+                  onClick={this.save}
+                  className={styles.changedSave}
+                  icon="check"
+                  full
+                >
+                  {t('configure.save')}
+                </Button>
+              ) : (
+                <Button className={styles.button} disabled icon="check" full>
+                  {t('configure.save')}
+                </Button>
+              )}
+              <a className={styles.cancelButton} onClick={this.cancelEditing}>
+                {t('cancel')}
+              </a>
             </div>
           )}
-
-          {console.log(this.props.slotPassthrough)}
-
           <ul className={styles.detailList}>
             <li className={styles.detailItem}>
               <label
@@ -99,10 +129,13 @@ class OrganizationSettings extends React.Component {
 }
 
 OrganizationSettings.propTypes = {
+  savePending: PropTypes.func.isRequired,
+  clearPending: PropTypes.func.isRequired,
   updatePending: PropTypes.func.isRequired,
   errors: PropTypes.object.isRequired,
   settings: PropTypes.object.isRequired,
   slotPassthrough: PropTypes.object.isRequired,
+  canSave: PropTypes.bool.isRequired,
 };
 
 export default OrganizationSettings;
diff --git a/client/coral-admin/src/routes/Configure/containers/Configure.js b/client/coral-admin/src/routes/Configure/containers/Configure.js
index 1ee521d69..7f0951154 100644
--- a/client/coral-admin/src/routes/Configure/containers/Configure.js
+++ b/client/coral-admin/src/routes/Configure/containers/Configure.js
@@ -84,18 +84,21 @@ class ConfigureContainer extends React.Component {
       return <Spinner />;
     }
 
+    const activeSection = this.props.routes[3].path;
+
     return (
       <Configure
         saveChanges={this.saveChanges}
         discardChanges={this.discardChanges}
         saveDialog={this.props.saveDialog}
-        activeSection={this.props.routes[3].path}
+        activeSection={activeSection}
         hideSaveDialog={this.props.hideSaveDialog}
         canSave={this.props.canSave}
         currentUser={this.props.currentUser}
         root={this.props.root}
         settings={this.props.mergedSettings}
         handleSectionChange={this.handleSectionChange}
+        clearPending={this.props.clearPending}
         savePending={this.savePending}
       >
         {this.props.children}
diff --git a/locales/en.yml b/locales/en.yml
index 2da3b3e4b..2f06eef5b 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -124,6 +124,7 @@ en:
     description: "As an admin, you can customize the settings for the comment stream for this story:"
     domain_list_text: "Enter the domains you would like to permit for Talk e.g. your local staging and production environments (ex. localhost:3000 staging.domain.com domain.com)."
     domain_list_title: "Permitted Domains"
+    edit_info: "Edit Info"
     edit_comment_timeframe_heading: "Edit Comment Timeframe"
     edit_comment_timeframe_text_pre: "Commenters will have"
     edit_comment_timeframe_text_post: "seconds to edit their comments."
@@ -149,6 +150,7 @@ en:
     open_stream_configuration: "This comment stream is currently open. By closing this comment stream no new comments may be submitted and all previous comments will still be displayed."
     require_email_verification: "Require Email Verification"
     require_email_verification_text: "New Users must verify their email before commenting"
+    save: Save
     save_changes: "Save Changes"
     shortcuts: Shortcuts
     sign_out: "Sign Out"
diff --git a/locales/es.yml b/locales/es.yml
index f6d587560..f68f51d0e 100644
--- a/locales/es.yml
+++ b/locales/es.yml
@@ -123,6 +123,7 @@ es:
     description: "Como Administrador/a puedes modificar la configuración de los comentarios en este artículo"
     domain_list_text: "Agrega dominios permitidos a Talk, por ejemplo tu localhost, staging y ambientes de producción (ej. localhost:3000, staging.domain.com, domain.com)."
     domain_list_title: "Dominios Permitidos"
+    edit_info: "Editar Información"
     edit_comment_timeframe_heading: "Periodo de Tiempo para Edición del Comentario"
     edit_comment_timeframe_text_pre: "Los comentaristas tendrán"
     edit_comment_timeframe_text_post: "segundos para editar sus comentarios."
@@ -148,6 +149,7 @@ es:
     open_stream_configuration: "Este hilo de comentarios está abierto. Al cerrarlo no se podrán publicar nuevos comentarios pero todos los comentarios anteriores aún serán mostrados."
     require_email_verification: "Necesita confirmación su correo"
     require_email_verification_text: "Nuevos usuarios deben confirmar sus correos antes de comentar"
+    save: Guardar
     save_changes: "Guardar Cambios"
     shortcuts: Atajos
     sign_out: "Desconectar"

From 5c2d8c4b627bd40e849664e381935ddd6ad958c1 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 10 Apr 2018 11:49:44 -0300
Subject: [PATCH 26/44] styles

---
 .../src/routes/Configure/components/OrganizationSettings.css | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index d28fced83..b804c528c 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -12,15 +12,16 @@
   font-size: 1.1em;
   font-weight: bold;
   display: block;
-  margin-bottom: 8px; 
+  margin-bottom: 6px; 
 }
 
 .detailValue {
   padding: 6px 0;
   border: solid 1px transparent;
   display: block;
-  font-size: 1em;
+  font-size: 1.1em;
   border-radius: 2px;
+  color: #424242;
 }
 
 .editable {

From 46ef214bd345b47b15fd62a2968fb4cfdd7c67ab Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 10 Apr 2018 11:55:22 -0300
Subject: [PATCH 27/44] tiny css changes

---
 .../src/routes/Configure/components/OrganizationSettings.css   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index b804c528c..7868add4e 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -12,7 +12,7 @@
   font-size: 1.1em;
   font-weight: bold;
   display: block;
-  margin-bottom: 6px; 
+  margin-bottom: 4px;
 }
 
 .detailValue {
@@ -22,6 +22,7 @@
   font-size: 1.1em;
   border-radius: 2px;
   color: #424242;
+  box-sizing: border-box;
 }
 
 .editable {

From 9e07618a262c9482002508e4f301763cc824e649 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Tue, 10 Apr 2018 13:07:40 -0300
Subject: [PATCH 28/44] Adding min-width for inputs

---
 .../src/routes/Configure/components/OrganizationSettings.css     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index 7868add4e..942307a3f 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -23,6 +23,7 @@
   border-radius: 2px;
   color: #424242;
   box-sizing: border-box;
+  min-width: 300px;
 }
 
 .editable {

From 12bb886032b91d5efba2b38982275f5d485822d2 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 13 Apr 2018 18:24:46 -0600
Subject: [PATCH 29/44] itterated on copy

---
 locales/en.yml                                |  4 +-
 .../server/emails/download.html.ejs           |  2 +-
 .../server/emails/download.txt.ejs            |  2 +-
 .../talk-plugin-profile-data/server/errors.js | 18 ++++++
 .../server/mutators.js                        | 11 +++-
 .../talk-plugin-profile-data/server/router.js |  6 +-
 .../server/views/download.ejs                 | 31 +++++----
 .../talk-plugin-profile-data/translations.yml | 20 ++++--
 public/css/admin.css                          | 63 +++++++++++++++----
 routes/api/v1/account.js                      |  2 +-
 views/account/email/confirm.ejs               | 24 +++----
 views/account/password/reset.ejs              | 45 +++++++------
 views/embed/stream.ejs                        |  2 -
 views/partials/head.ejs                       |  6 ++
 14 files changed, 158 insertions(+), 78 deletions(-)
 create mode 100644 plugins/talk-plugin-profile-data/server/errors.js

diff --git a/locales/en.yml b/locales/en.yml
index 6b2330f27..50845b96f 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -20,11 +20,13 @@ en:
   bio_offensive: "This bio is offensive"
   cancel: "Cancel"
   confirm_email:
-    click_to_confirm: "Click below to confirm your email address"
+    email_confirmation: "Email Confirmation"
+    click_to_confirm: "Click below to confirm your email address."
     confirm: "Confirm"
   password_reset:
     mail_sent: 'If you have a registered account, a password reset link was sent to that email'
     set_new_password: "Change Your Password"
+    change_password_help: "Please enter a new password to use to login. Make it secure!"
     new_password: "New Password"
     new_password_help: "Password must be at least 8 characters"
     confirm_new_password: "Confirm New Password"
diff --git a/plugins/talk-plugin-profile-data/server/emails/download.html.ejs b/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
index c6aeb8e1e..00b6ad372 100644
--- a/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
+++ b/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
@@ -1 +1 @@
-<p><%= t('email.download.download_link_ready') %> <a href="<%= BASE_URL %>account/download#<%= token %>"><%= t('email.download.download_archive') %></a></p>
+<p><%= t('email.download.download_link_ready', organizationName, now.toLocaleString()) %> <a href="<%= BASE_URL %>account/download#<%= token %>"><%= t('email.download.download_archive') %></a></p>
diff --git a/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs b/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
index 4f719bc06..138ea1088 100644
--- a/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
+++ b/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
@@ -1,3 +1,3 @@
-<%= t('email.download.download_link_ready') %>
+<%= t('email.download.download_link_ready', organizationName, now.toLocaleString()) %>
 
     <%= BASE_URL %>account/download#<%= token %>
diff --git a/plugins/talk-plugin-profile-data/server/errors.js b/plugins/talk-plugin-profile-data/server/errors.js
new file mode 100644
index 000000000..6261ebe89
--- /dev/null
+++ b/plugins/talk-plugin-profile-data/server/errors.js
@@ -0,0 +1,18 @@
+const { TalkError } = require('errors');
+
+// ErrDownloadToken is returned in the event that the download is requested
+// without a valid token.
+class ErrDownloadToken extends TalkError {
+  constructor(err) {
+    super(
+      'Token is invalid',
+      {
+        translation_key: 'DOWNLOAD_TOKEN_INVALID',
+        status: 400,
+      },
+      { err }
+    );
+  }
+}
+
+module.exports = { ErrDownloadToken };
diff --git a/plugins/talk-plugin-profile-data/server/mutators.js b/plugins/talk-plugin-profile-data/server/mutators.js
index e5d717978..5a897a2e1 100644
--- a/plugins/talk-plugin-profile-data/server/mutators.js
+++ b/plugins/talk-plugin-profile-data/server/mutators.js
@@ -4,6 +4,7 @@ const { DOWNLOAD_LINK_SUBJECT } = require('./constants');
 
 async function sendDownloadLink({
   user,
+  loaders: { Settings },
   connectors: {
     errors,
     secrets,
@@ -43,19 +44,25 @@ async function sendDownloadLink({
     { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
   );
 
+  const now = new Date();
+
+  const { organizationName } = await Settings.load('organizationName');
+
   // Send the download link via the user's attached email account.
   await Users.sendEmail(user, {
     template: 'download',
     locals: {
       token,
+      organizationName,
+      now,
     },
-    subject: I18n.t('email.download.subject'),
+    subject: I18n.t('email.download.subject', organizationName),
   });
 
   // Amend the lastAccountDownload on the user.
   await User.update(
     { id: user.id },
-    { $set: { 'metadata.lastAccountDownload': new Date() } }
+    { $set: { 'metadata.lastAccountDownload': now } }
   );
 }
 
diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js
index 5ef3b0cfc..00061c173 100644
--- a/plugins/talk-plugin-profile-data/server/router.js
+++ b/plugins/talk-plugin-profile-data/server/router.js
@@ -5,6 +5,7 @@ const { get, pick, kebabCase } = require('lodash');
 const moment = require('moment');
 const archiver = require('archiver');
 const stringify = require('csv-stringify');
+const { ErrDownloadToken } = require('./errors');
 
 async function verifyDownloadToken(
   { connectors: { services: { Users } } },
@@ -109,10 +110,7 @@ module.exports = router => {
           // Verify the token
           await verifyDownloadToken(req.context, token);
         } catch (err) {
-          // Log out the error, slurp it and send out the predefined error to the
-          // error handler.
-          console.error(err);
-          return next(new Error('invalid token'));
+          return next(new ErrDownloadToken(err));
         }
 
         res.status(204).end();
diff --git a/plugins/talk-plugin-profile-data/server/views/download.ejs b/plugins/talk-plugin-profile-data/server/views/download.ejs
index 53ee8a4e9..bc8e0aa54 100644
--- a/plugins/talk-plugin-profile-data/server/views/download.ejs
+++ b/plugins/talk-plugin-profile-data/server/views/download.ejs
@@ -1,19 +1,26 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
     <title><%= t('download_landing.download_your_account') %></title>
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-    <%- include(root + '/partials/head') %>
+    <%- include(root + '/partials/account') %>
   </head>
-  <body class="confirm-email-page">
+  <body>
     <div id="root">
-      <div class="error-console container"></div>
-      <form id="download-form" class="container" method="post" action="<%= BASE_PATH %>api/v1/account/download">
-        <legend class="legend"><%= t('download_landing.click_to_download') %></legend>
-        <button type="submit"><%= t('download_landing.confirm') %></button>
-      </form>
+      <section class="container">
+        <h1><%= t('download_landing.download_your_account') %></h1>
+        <p><%= t('download_landing.download_details') %></p>
+        <p><%= t('download_landing.all_information_included') %></p>
+        <ul class="check_list">
+          <li><%= t('download_landing.information_included.date') %></li>
+          <li><%= t('download_landing.information_included.url') %></li>
+          <li><%= t('download_landing.information_included.body') %></li>
+          <li><%= t('download_landing.information_included.asset_url') %></li>
+        </ul>
+        <div class="error-console"></div>
+        <form id="download-form" method="post" action="<%= BASE_PATH %>api/v1/account/download">
+          <button type="submit"><%= t('download_landing.confirm') %></button>
+        </form>
+      </section>
     </div>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <script type="text/javascript">
@@ -21,9 +28,9 @@
         function showError(error) {
           try {
             let err = JSON.parse(error);
-            $('.error-console').text(err.message).addClass('active');
+            $('.error-console').text(err.message).fadeIn();
           } catch (err) {
-            $('.error-console').text(error).addClass('active');
+            $('.error-console').text(error).fadeIn();
           }
         }
 
diff --git a/plugins/talk-plugin-profile-data/translations.yml b/plugins/talk-plugin-profile-data/translations.yml
index 42afe2313..6637c6958 100644
--- a/plugins/talk-plugin-profile-data/translations.yml
+++ b/plugins/talk-plugin-profile-data/translations.yml
@@ -1,10 +1,18 @@
 en:
   download_landing:
-    download_your_account: "Download Your Account"
-    click_to_download: "Click below to download your account"
-    confirm: "Download"
+    download_your_account: "Download Your Comment History"
+    download_details: "Your comment history will be downloaded into a .zip file. After your comment history is unzipped you will have a comma seperated value (or .csv) file that you can easily import into your favorite spreadsheet application."
+    all_information_included: "For each of your comments the following information is included:"
+    information_included:
+      date: "When you wrote the comment"
+      url: "The permalink URL for the comment"
+      body: "The comment text"
+      asset_url: "The URL on the article or story where the comment appears"
+    confirm: "Download My Comment History"
   email:
     download:
-      subject: "Your download link is ready" # TODO: replace
-      download_link_ready: "Your download link is now ready, visit the following to download an archive of your account:" # TODO: replace
-      download_archive: "Download Archive" # TODO: replace
+      subject: "Your comments are ready for download from {0}"
+      download_link_ready: "Click here to download your comments from {0} as of {1}:"
+      download_archive: "Download Archive"
+  error:
+    DOWNLOAD_TOKEN_INVALID: "Your download link is not valid."
diff --git a/public/css/admin.css b/public/css/admin.css
index 50e3109c5..0bad0a4c2 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -6,13 +6,15 @@ body, #root {
 }
 
 .container {
-  max-width: 300px;
+  max-width: 675px;
   margin: 50px auto;
 }
 
 #root form {
   display: none;
-  padding: 15px;
+  padding: 15px 0;
+  /* max-width: 400px;
+  margin: 0 auto; */
 }
 
 .legend {
@@ -21,6 +23,22 @@ body, #root {
   font-weight: bold;
 }
 
+section p, ul {
+  font-family: Source Sans Pro;
+  font-style: normal;
+  font-weight: normal;
+  line-height: 34px;
+  font-size: 24px;
+  letter-spacing: 0.3px;
+}
+
+h1 {
+  font-family: Source Sans Pro;
+  font-size: 48px;
+  font-weight: 600;
+  color: #000000;
+}
+
 label {
   display: block;
   margin-top: 10px;
@@ -44,28 +62,47 @@ input {
 }
 
 button[type="submit"] {
-  border-radius: 4px;
+  font-family: Source Sans Pro;
+  font-style: normal;
+  font-weight: 600;
+  line-height: normal;
+  font-size: 18px;
+  text-align: center;
+  color: white;
+
+  border-radius: 2px;
   border: none;
   display: block;
-  background-color: #333;
-  color: white;
-  text-align: center;
-  width: 100%;
-  padding: 10px;
-  margin-top: 10px;
+  background-color: #3498DB;
+  margin: 10px auto;
+  padding: 13px;
   cursor: pointer;
 }
 
 .error-console {
   display: none;
   margin-top: 10px;
-  border-radius: 4px;
+  border-radius: 2px;
   background-color: pink;
   color: red;
   border: 1px solid red;
   padding: 10px;
+  font-size: 24px;
 }
 
-.error-console.active {
-  display: block;
-}
\ No newline at end of file
+ul.check_list {
+  list-style-type: none;
+  margin: 0 0 0 0.5em;
+}
+
+ul.check_list li {
+  text-indent: -1.4em;
+}
+
+ul.check_list li:before {
+  font-family: 'Material Icons';
+  content: '\E5CA';
+  color: #000;
+	float: left;
+	width: 1.4em;
+}
diff --git a/routes/api/v1/account.js b/routes/api/v1/account.js
index 561134885..3909d5dce 100644
--- a/routes/api/v1/account.js
+++ b/routes/api/v1/account.js
@@ -37,7 +37,7 @@ const tokenCheck = (verifier, error, ...whitelistedErrors) => async (
       // Log out the error, slurp it and send out the predefined error to the
       // error handler.
       console.error(err);
-      return next(error);
+      return next(new error());
     }
 
     res.status(204).end();
diff --git a/views/account/email/confirm.ejs b/views/account/email/confirm.ejs
index 8c726b4e5..524b81ae9 100644
--- a/views/account/email/confirm.ejs
+++ b/views/account/email/confirm.ejs
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <title>Email Verification</title>
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-    <%- include ../../partials/head %>
+    <title><%= t('confirm_email.email_confirmation') %></title>
+    <%- include ../../partials/account %>
   </head>
   <body class="confirm-email-page">
     <div id="root">
-      <div class="error-console container"></div>
-      <form id="verify-email-form" class="container">
-        <legend class="legend"><%= t('confirm_email.click_to_confirm') %></legend>
-        <button type="submit"><%= t('confirm_email.confirm') %></button>
-      </form>
+      <section class="container">
+        <h1><%= t('confirm_email.email_confirmation') %></h1>
+        <p><%= t('confirm_email.click_to_confirm') %></p>
+        <div class="error-console"></div>
+        <form id="verify-email-form">
+          <button type="submit"><%= t('confirm_email.confirm') %></button>
+        </form>
+      </section>
     </div>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <script type="text/javascript">
@@ -21,9 +21,9 @@
         function showError(error) {
           try {
             let err = JSON.parse(error);
-            $('.error-console').text(err.message).addClass('active');
+            $('.error-console').text(err.message).fadeIn();
           } catch (err) {
-            $('.error-console').text(error).addClass('active');
+            $('.error-console').text(error).fadeIn();
           }
         }
 
diff --git a/views/account/password/reset.ejs b/views/account/password/reset.ejs
index c551034b3..fc8fd4d58 100644
--- a/views/account/password/reset.ejs
+++ b/views/account/password/reset.ejs
@@ -1,29 +1,28 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1">
-    <title>Password Reset</title>
-    <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
-    <link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">
-    <%- include ../../partials/head %>
+    <title><%= t('password_reset.set_new_password') %></title>
+    <%- include ../../partials/account %>
   </head>
-  <body class="password-reset-page">
+  <body>
     <div id="root">
-      <div class="error-console container"></div>
-      <form id="reset-password-form" class="container">
-        <legend class="legend"><%= t('password_reset.set_new_password') %></legend>
-        <label for="password">
-          <%= t('password_reset.new_password') %>
-          <input type="password" name="password" placeholder="<%= t('password_reset.new_password') %>" />
-          <p><small><%= t('password_reset.new_password_help') %></small></p>
-        </label>
-
-        <label for="confirm-password">
-          <%= t('password_reset.confirm_new_password') %>
-          <input type="password" name="confirm-password" placeholder="<%= t('password_reset.confirm_new_password') %>" />
-        </label>
-        <button type="submit"><%= t('password_reset.change_password') %></button>
-      </form>
+      <section class="container">
+        <h1><%= t('password_reset.set_new_password') %></h1>
+        <p><%= t('password_reset.change_password_help') %></p>
+        <div class="error-console"></div>
+        <form id="reset-password-form">
+          <label for="password">
+            <%= t('password_reset.new_password') %>
+            <input type="password" name="password" placeholder="<%= t('password_reset.new_password') %>" />
+            <p><small><%= t('password_reset.new_password_help') %></small></p>
+          </label>
+          <label for="confirm-password">
+            <%= t('password_reset.confirm_new_password') %>
+            <input type="password" name="confirm-password" placeholder="<%= t('password_reset.confirm_new_password') %>" />
+          </label>
+          <button type="submit"><%= t('password_reset.change_password') %></button>
+        </form>
+      </section>
     </div>
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
     <script>
@@ -31,9 +30,9 @@
         function showError(error) {
           try {
             let err = JSON.parse(error);
-            $('.error-console').text(err.message).addClass('active');
+            $('.error-console').text(err.message).fadeIn();
           } catch (err) {
-            $('.error-console').text(error).addClass('active');
+            $('.error-console').text(error).fadeIn();
           }
         }
 
diff --git a/views/embed/stream.ejs b/views/embed/stream.ejs
index 0ca249176..50faaf5c2 100644
--- a/views/embed/stream.ejs
+++ b/views/embed/stream.ejs
@@ -2,8 +2,6 @@
 <html>
   <head>
     <meta name="viewport" content="width=device-width, user-scalable=no">
-    <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
     <link rel="stylesheet" type="text/css" href="<%= resolve('embed/stream/default.css') %>">
     <link rel="stylesheet" type="text/css" href="<%= resolve('embed/stream/bundle.css') %>">
     <%- include ../partials/head %>
diff --git a/views/partials/head.ejs b/views/partials/head.ejs
index e6cdb97d2..e848b3909 100644
--- a/views/partials/head.ejs
+++ b/views/partials/head.ejs
@@ -13,8 +13,14 @@
 <link rel="icon" type="image/png" sizes="16x16" href="<%= STATIC_URL %>public/img/favicon-16x16.png">
 <link rel="manifest" href="<%= STATIC_URL %>public/manifest.json">
 <meta name="msapplication-TileColor" content="#ffffff">
+
+<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet">
+<link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600" rel="stylesheet">
+
 <%_ if (locals.customCssUrl) { _%>
 <link href="<%= customCssUrl %>" rel="stylesheet" type="text/css">
 <%_ } _%>
 <%- include data %>
+
 <base href="<%= BASE_URL %>"/>

From 276cb03953ec9e42c1ac8d935d64a54df6c3526b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 13 Apr 2018 18:27:40 -0600
Subject: [PATCH 30/44] fixed missing partial

---
 views/partials/account.ejs | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 views/partials/account.ejs

diff --git a/views/partials/account.ejs b/views/partials/account.ejs
new file mode 100644
index 000000000..79857baf0
--- /dev/null
+++ b/views/partials/account.ejs
@@ -0,0 +1,3 @@
+<%- include ./head %>
+<link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.indigo-pink.min.css">
+<link rel="stylesheet" href="<%= BASE_PATH %>public/css/admin.css">

From f23f962adba65be062d6f60a31bdbde422907fd6 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Mon, 16 Apr 2018 10:47:09 -0600
Subject: [PATCH 31/44] Updated error styling

---
 .../server/views/download.ejs                    |  8 +++++---
 public/css/admin.css                             | 16 ++++++++++++----
 views/account/email/confirm.ejs                  |  8 +++++---
 views/account/password/reset.ejs                 | 10 ++++++----
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/plugins/talk-plugin-profile-data/server/views/download.ejs b/plugins/talk-plugin-profile-data/server/views/download.ejs
index bc8e0aa54..260badf3a 100644
--- a/plugins/talk-plugin-profile-data/server/views/download.ejs
+++ b/plugins/talk-plugin-profile-data/server/views/download.ejs
@@ -16,7 +16,7 @@
           <li><%= t('download_landing.information_included.body') %></li>
           <li><%= t('download_landing.information_included.asset_url') %></li>
         </ul>
-        <div class="error-console"></div>
+        <div class="error-console"><span></span></div>
         <form id="download-form" method="post" action="<%= BASE_PATH %>api/v1/account/download">
           <button type="submit"><%= t('download_landing.confirm') %></button>
         </form>
@@ -28,9 +28,11 @@
         function showError(error) {
           try {
             let err = JSON.parse(error);
-            $('.error-console').text(err.message).fadeIn();
+            $('.error-console span').text(err.message);
+            $('.error-console').fadeIn();
           } catch (err) {
-            $('.error-console').text(error).fadeIn();
+            $('.error-console span').text(error);
+            $('.error-console').fadeIn();
           }
         }
 
diff --git a/public/css/admin.css b/public/css/admin.css
index 0bad0a4c2..f6891c87e 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -3,6 +3,7 @@ body, #root {
   height: 100%;
   margin: 0;
   background: #fff;
+  color: #3B4A53;
 }
 
 .container {
@@ -83,11 +84,18 @@ button[type="submit"] {
   display: none;
   margin-top: 10px;
   border-radius: 2px;
-  background-color: pink;
-  color: red;
-  border: 1px solid red;
+  background-color: rgba(242, 101, 99, 0.1);
+  border: 1px solid #F26563;
   padding: 10px;
-  font-size: 24px;
+}
+
+.error-console span:before {
+  font-family: 'Material Icons';
+  content: '\E000';
+  color: #000;
+  display: inline-block;
+  vertical-align: sub;
+	width: 1.4em;
 }
 
 ul.check_list {
diff --git a/views/account/email/confirm.ejs b/views/account/email/confirm.ejs
index 524b81ae9..47bc7773b 100644
--- a/views/account/email/confirm.ejs
+++ b/views/account/email/confirm.ejs
@@ -9,7 +9,7 @@
       <section class="container">
         <h1><%= t('confirm_email.email_confirmation') %></h1>
         <p><%= t('confirm_email.click_to_confirm') %></p>
-        <div class="error-console"></div>
+        <div class="error-console"><span></span></div>
         <form id="verify-email-form">
           <button type="submit"><%= t('confirm_email.confirm') %></button>
         </form>
@@ -21,9 +21,11 @@
         function showError(error) {
           try {
             let err = JSON.parse(error);
-            $('.error-console').text(err.message).fadeIn();
+            $('.error-console span').text(err.message);
+            $('.error-console').fadeIn();
           } catch (err) {
-            $('.error-console').text(error).fadeIn();
+            $('.error-console span').text(error);
+            $('.error-console').fadeIn();
           }
         }
 
diff --git a/views/account/password/reset.ejs b/views/account/password/reset.ejs
index fc8fd4d58..c8b106139 100644
--- a/views/account/password/reset.ejs
+++ b/views/account/password/reset.ejs
@@ -9,12 +9,12 @@
       <section class="container">
         <h1><%= t('password_reset.set_new_password') %></h1>
         <p><%= t('password_reset.change_password_help') %></p>
-        <div class="error-console"></div>
+        <div class="error-console"><span></span></div>
         <form id="reset-password-form">
           <label for="password">
             <%= t('password_reset.new_password') %>
             <input type="password" name="password" placeholder="<%= t('password_reset.new_password') %>" />
-            <p><small><%= t('password_reset.new_password_help') %></small></p>
+            <small><%= t('password_reset.new_password_help') %></small>
           </label>
           <label for="confirm-password">
             <%= t('password_reset.confirm_new_password') %>
@@ -30,9 +30,11 @@
         function showError(error) {
           try {
             let err = JSON.parse(error);
-            $('.error-console').text(err.message).fadeIn();
+            $('.error-console span').text(err.message);
+            $('.error-console').fadeIn();
           } catch (err) {
-            $('.error-console').text(error).fadeIn();
+            $('.error-console span').text(error);
+            $('.error-console').fadeIn();
           }
         }
 

From 87a97d405354d09c1171c034b6f57ff9076d736b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 17 Apr 2018 12:31:31 -0600
Subject: [PATCH 32/44] Adds Author Index for Comments

- Fixes #1529
---
 models/comment.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/models/comment.js b/models/comment.js
index 88f5e5829..de4a22826 100644
--- a/models/comment.js
+++ b/models/comment.js
@@ -163,6 +163,17 @@ CommentSchema.index(
   }
 );
 
+// Add an index that is optimized for finding a user's comments.
+CommentSchema.index(
+  {
+    author_id: 1,
+    created_at: -1,
+  },
+  {
+    background: true,
+  }
+);
+
 // Add an index that is optimized for finding flagged comments.
 CommentSchema.index(
   {

From 360dbdf02d84d94bfc31e201781acd4b72ec0910 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 17 Apr 2018 13:06:07 -0600
Subject: [PATCH 33/44] icon patch

---
 client/coral-ui/components/Icon.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/coral-ui/components/Icon.css b/client/coral-ui/components/Icon.css
index 1a118257a..72708e863 100644
--- a/client/coral-ui/components/Icon.css
+++ b/client/coral-ui/components/Icon.css
@@ -1,5 +1,5 @@
 
 .root {
-  vertical-align: middle;
+  vertical-align: sub;
   font-size: inherit;
 }

From 3ae105114818aa42bd563dc3629a95d6e1a3abf2 Mon Sep 17 00:00:00 2001
From: Clint Brown <clint.brown@fairfaxmedia.com.au>
Date: Tue, 17 Apr 2018 15:44:33 +1000
Subject: [PATCH 34/44] Add system withheld status to InactiveCommentLabel

---
 .../src/tabs/stream/components/InactiveCommentLabel.js        | 4 ++++
 locales/en.yml                                                | 1 +
 2 files changed, 5 insertions(+)

diff --git a/client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.js b/client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.js
index 3f0360099..48ea7767c 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/InactiveCommentLabel.js
@@ -18,6 +18,10 @@ const InactiveCommentLabel = ({ status, className, ...rest }) => {
       label = t('modqueue.rejected');
       icon = 'close';
       break;
+    case 'SYSTEM_WITHHELD':
+      label = t('modqueue.system_withheld');
+      icon = 'flag';
+      break;
     default:
       throw new Error(`Unknown inactive status ${status}`);
   }
diff --git a/locales/en.yml b/locales/en.yml
index 6b2330f27..0fbd7bf01 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -344,6 +344,7 @@ en:
     sort: "Sort"
     show_shortcuts: "Show Shortcuts"
     singleview: "Zen mode"
+    system_withheld: "System Withheld"
     thismenu: "Open this menu"
     jump_to_queue: "Jump to specific queue"
     thousand: k

From ca2070eada75d187bd65287ecae4fd02266a0be7 Mon Sep 17 00:00:00 2001
From: "D. Luijten" <daniel.luijten@sanoma.com>
Date: Wed, 18 Apr 2018 14:28:42 +0200
Subject: [PATCH 35/44] Added NL translation for Moment. Also, sorted locale
 imports alphabetically.

---
 client/coral-framework/services/i18n.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index e1c3ab99e..507e7f68e 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -9,6 +9,7 @@ import 'moment/locale/da';
 import 'moment/locale/de';
 import 'moment/locale/es';
 import 'moment/locale/fr';
+import 'moment/locale/nl';
 import 'moment/locale/pt-br';
 
 import { createStorage } from 'coral-framework/services/storage';
@@ -18,10 +19,10 @@ import daTA from 'timeago.js/locales/da';
 import deTA from 'timeago.js/locales/de';
 import esTA from 'timeago.js/locales/es';
 import frTA from 'timeago.js/locales/fr';
+import nl from 'timeago.js/locales/nl';
 import pt_BRTA from 'timeago.js/locales/pt_BR';
 import zh_CNTA from 'timeago.js/locales/zh_CN';
 import zh_TWTA from 'timeago.js/locales/zh_TW';
-import nl from 'timeago.js/locales/nl';
 
 import ar from '../../../locales/ar.yml';
 import en from '../../../locales/en.yml';
@@ -29,10 +30,10 @@ import da from '../../../locales/da.yml';
 import de from '../../../locales/de.yml';
 import es from '../../../locales/es.yml';
 import fr from '../../../locales/fr.yml';
+import nl_NL from '../../../locales/nl_NL.yml';
 import pt_BR from '../../../locales/pt_BR.yml';
 import zh_CN from '../../../locales/zh_CN.yml';
 import zh_TW from '../../../locales/zh_TW.yml';
-import nl_NL from '../../../locales/nl_NL.yml';
 
 const defaultLanguage = process.env.TALK_DEFAULT_LANG;
 const translations = {

From c4cbefeb81d73a37045a1a3cc6e87787173b7c2c Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Wed, 18 Apr 2018 16:02:39 -0400
Subject: [PATCH 36/44] Change to UserHistory in UserDetail.js

---
 client/coral-admin/src/components/UserDetail.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-admin/src/components/UserDetail.js b/client/coral-admin/src/components/UserDetail.js
index 7181a6f52..02b0e66f8 100644
--- a/client/coral-admin/src/components/UserDetail.js
+++ b/client/coral-admin/src/components/UserDetail.js
@@ -3,7 +3,7 @@ import cn from 'classnames';
 import PropTypes from 'prop-types';
 import capitalize from 'lodash/capitalize';
 import styles from './UserDetail.css';
-import AccountHistory from './AccountHistory';
+import UserHistory from './UserHistory';
 import { Slot } from 'coral-framework/components';
 import UserDetailCommentList from '../components/UserDetailCommentList';
 import {
@@ -334,7 +334,7 @@ class UserDetail extends React.Component {
               tabId={'history'}
               className={'talk-admin-user-detail-history-tab-pane'}
             >
-              <AccountHistory user={user} />
+              <UserHistory user={user} />
             </TabPane>
           </TabContent>
         </Drawer>

From 43fa0d2b58712569a960ddab3665410ef88feba7 Mon Sep 17 00:00:00 2001
From: Tibo Beijen <tibo.beijen@sanoma.com>
Date: Thu, 19 Apr 2018 10:43:41 +0200
Subject: [PATCH 37/44] Added translation to staff label in comment stream.

---
 .../coral-embed-stream/src/tabs/stream/components/Comment.js  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/coral-embed-stream/src/tabs/stream/components/Comment.js b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
index 5df119fbc..0983b11c4 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -574,7 +574,9 @@ export default class Comment extends React.Component {
                   'talk-stream-comment-header-tags-container'
                 )}
               >
-                {isStaff(comment.tags) ? <TagLabel>Staff</TagLabel> : null}
+                {isStaff(comment.tags) ? (
+                  <TagLabel>{t('community.staff')}</TagLabel>
+                ) : null}
 
                 <Slot
                   className={cn(

From 67405937ed15b1f0e1312a7de6a027f65c3df601 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Thu, 19 Apr 2018 10:48:48 -0600
Subject: [PATCH 38/44] adjusted download to include all comments

---
 plugins/talk-plugin-profile-data/README.md    |  3 +-
 .../talk-plugin-profile-data/server/router.js | 55 +++++++++++--------
 2 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/plugins/talk-plugin-profile-data/README.md b/plugins/talk-plugin-profile-data/README.md
index 17f90c666..1d019a79b 100644
--- a/plugins/talk-plugin-profile-data/README.md
+++ b/plugins/talk-plugin-profile-data/README.md
@@ -20,4 +20,5 @@ their profile tab in the comment stream. Once clicked, an email will be sent
 that contains a download link. Only one link can be generated every 7 days, and
 the link will be valid for 24 hours.
 
-The downloaded zip file will contain the users comments in a CSV format.
+The downloaded zip file will contain all the users comments in a CSV format
+including those that have been rejected, withheld, or still in premod.
diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js
index 00061c173..2b0628753 100644
--- a/plugins/talk-plugin-profile-data/server/router.js
+++ b/plugins/talk-plugin-profile-data/server/router.js
@@ -20,14 +20,15 @@ async function verifyDownloadToken(
 
 // loadCommentsBatch will load a batch of the comments and write them to the
 // stream.
-async function loadCommentsBatch(ctx, csv, variables = {}) {
+async function loadCommentsBatch(ctx, csv, variables) {
   let result = await ctx.graphql(
     `
-    query GetMyComments($cursor: Cursor) {
-      me {
+    query GetMyComments($userID: ID!, $cursor: Cursor) {
+      user(id: $userID) {
         comments(query: {
           limit: 100,
-          cursor: $cursor
+          cursor: $cursor,
+          statuses: null
         }) {
           hasNextPage
           endCursor
@@ -50,7 +51,7 @@ async function loadCommentsBatch(ctx, csv, variables = {}) {
     throw result.errors;
   }
 
-  for (const comment of get(result, 'data.me.comments.nodes', [])) {
+  for (const comment of get(result, 'data.user.comments.nodes', [])) {
     csv.write([
       comment.id,
       moment(comment.created_at).format('YYYY-MM-DD HH:mm:ss'),
@@ -60,12 +61,12 @@ async function loadCommentsBatch(ctx, csv, variables = {}) {
     ]);
   }
 
-  return pick(result.data.me.comments, ['hasNextPage', 'endCursor']);
+  return pick(get(result, 'data.user.comments'), ['hasNextPage', 'endCursor']);
 }
 
 // loadComments will load batches of the comments and write them to the csv
 // stream. Once the comments have finished writing, it will close the stream.
-async function loadComments(ctx, archive, latestContentDate) {
+async function loadComments(ctx, userID, archive, latestContentDate) {
   // Create all the csv writers that'll write the data to the archive.
   const csv = stringify();
 
@@ -78,12 +79,14 @@ async function loadComments(ctx, archive, latestContentDate) {
   // from the token.
   let connection = await loadCommentsBatch(ctx, csv, {
     cursor: latestContentDate,
+    userID,
   });
 
   // As long as there's more comments, keep paginating.
   while (connection.hasNextPage) {
     connection = await loadCommentsBatch(ctx, csv, {
       cursor: connection.endCursor,
+      userID,
     });
   }
 
@@ -120,7 +123,7 @@ module.exports = router => {
         return;
       }
 
-      const { connectors: { services: { Users } } } = req.context;
+      const { connectors: { graph: { Context }, errors } } = req.context;
 
       try {
         // Pull the userID and the date that the token was issued out of the
@@ -130,25 +133,31 @@ module.exports = router => {
           token
         );
 
+        // Create a system context used to get all comments for that user.
+        const ctx = Context.forSystem();
+
+        // Get the current user's username. We need it for the generated filenames.
+        const result = await ctx.graphql(
+          `query GetUser($userID: ID!) {
+            user(id: $userID) { username }
+          }`,
+          { userID }
+        );
+        if (result.errors) {
+          throw result.errors;
+        }
+
+        const user = get(result, 'data.user');
+        if (!user) {
+          throw new errors.ErrNotFound();
+        }
+
         // Unpack the date that the token was issued, and use it as a source for the
         // earliest comment we should include in the download.
         const latestContentDate = new Date(iat * 1000);
 
-        // Grab the user that we're generating the export from. We'll use it to
-        // create a new context.
-        const user = await Users.findById(userID);
-
-        // Base a new context off of the new user.
-        const ctx = req.context.masqueradeAs(user);
-
-        // Get the current user's username. We need it for the generated filenames.
-        const result = await ctx.graphql('{ me { username } }');
-        if (result.errors) {
-          throw result.errors;
-        }
-        const username = get(result, 'data.me.username');
-
         // Generate the filename of the file that the user will download.
+        const username = get(user, 'username');
         const filename = `talk-${kebabCase(username)}-${kebabCase(
           moment(latestContentDate).format('YYYY-MM-DD HH:mm:ss')
         )}.zip`;
@@ -167,7 +176,7 @@ module.exports = router => {
         archive.pipe(res);
 
         // Load the comments csv up with the user's comments.
-        await loadComments(ctx, archive, latestContentDate);
+        await loadComments(ctx, userID, archive, latestContentDate);
 
         // Mark the end of adding files, no more files can be added after this. Once
         // all the stream readers have finished writing, and have closed, the

From 84b373ed95b01e25dc237c9cb85663d7e3b28124 Mon Sep 17 00:00:00 2001
From: okbel <curciobelen@gmail.com>
Date: Thu, 19 Apr 2018 14:07:24 -0300
Subject: [PATCH 39/44] Validation Added

---
 .../components/OrganizationSettings.css       |  30 ++-
 .../components/OrganizationSettings.js        | 184 +++++++++++-------
 2 files changed, 140 insertions(+), 74 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
index 942307a3f..2468496b7 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.css
@@ -43,11 +43,7 @@
 }
 
 .actionBox {
-  position: absolute;
-  right: 20px;
-  top: 20px;
-  text-align: center;
-  width: 100px;
+  flex-grow: 0;
 }
 
 .cancelButton {
@@ -64,4 +60,28 @@
 .changedSave {
   background-color: #00796B;
   color: white;
+}
+
+.errorList {
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+
+.errorItem {
+  padding: 5px 10px;
+  margin-bottom: 20px;
+  color: #b71c1c;
+  border-radius: 2px;
+  display: inline-block;
+  background: #F9D3CE;
+}
+
+.container {
+  display: flex;
+}
+
+.content {
+  flex-grow: 1;
+  padding-right: 40px;
 }
\ No newline at end of file
diff --git a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
index 06c91926c..38f211781 100644
--- a/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/OrganizationSettings.js
@@ -7,9 +7,25 @@ import Slot from 'coral-framework/components/Slot';
 import t from 'coral-framework/services/i18n';
 import ConfigurePage from './ConfigurePage';
 import ConfigureCard from 'coral-framework/components/ConfigureCard';
+import validate from 'coral-framework/helpers/validate';
+import errorMsj from 'coral-framework/helpers/error';
 
 class OrganizationSettings extends React.Component {
-  state = { editing: false };
+  state = { editing: false, errors: [] };
+
+  addError = err => {
+    if (this.state.errors.indexOf(err) === -1) {
+      this.setState(({ errors }) => ({
+        errors: errors.concat(err),
+      }));
+    }
+  };
+
+  removeError = err => {
+    this.setState(({ errors }) => ({
+      errors: errors.filter(i => i !== err),
+    }));
+  };
 
   toggleEditing = () => {
     this.setState(({ editing }) => ({
@@ -29,8 +45,21 @@ class OrganizationSettings extends React.Component {
   };
 
   updateEmail = event => {
-    const updater = { organizationContactEmail: { $set: event.target.value } };
-    this.props.updatePending({ updater });
+    let error = null;
+    const email = event.target.value;
+
+    // Add a blocker error
+    if (!validate.email(email)) {
+      error = true;
+      this.addError('email');
+    } else {
+      this.removeError('email');
+    }
+
+    const updater = { organizationContactEmail: { $set: email } };
+    const errorUpdater = { organizationEmail: { $set: error } };
+
+    this.props.updatePending({ updater, errorUpdater });
   };
 
   cancelEditing = () => {
@@ -43,84 +72,101 @@ class OrganizationSettings extends React.Component {
     this.disableEditing();
   };
 
+  displayErrors = (errors = []) => (
+    <ul className={styles.errorList}>
+      {errors.map((errKey, i) => (
+        <li key={`${i}_${errKey}`} className={styles.errorItem}>
+          {errorMsj[errKey]}
+        </li>
+      ))}
+    </ul>
+  );
+
   render() {
     const { settings, slotPassthrough, canSave } = this.props;
+    const hasErrors = this.state.errors.length;
+
     return (
       <ConfigurePage title={t('configure.organization_information')}>
         <p>{t('configure.organization_info_copy')}</p>
         <p>{t('configure.organization_info_copy_2')}</p>
         <ConfigureCard>
-          {!this.state.editing ? (
-            <div className={styles.actionBox}>
-              <Button
-                className={styles.button}
-                icon="settings"
-                onClick={this.toggleEditing}
-                full
-              >
-                {t('configure.edit_info')}
-              </Button>
+          <div className={styles.container}>
+            <div className={styles.content}>
+              {this.displayErrors(this.state.errors)}
+              <ul className={styles.detailList}>
+                <li className={styles.detailItem}>
+                  <label
+                    className={styles.detailLabel}
+                    id={t('configure.organization_name')}
+                  >
+                    {t('configure.organization_name')}
+                  </label>
+                  <input
+                    type="text"
+                    className={cn(styles.detailValue, {
+                      [styles.editable]: this.state.editing,
+                    })}
+                    onChange={this.updateName}
+                    value={settings.organizationName}
+                    id={t('configure.organization_name')}
+                    readOnly={!this.state.editing}
+                  />
+                </li>
+                <li className={styles.detailItem}>
+                  <label
+                    className={styles.detailLabel}
+                    id={t('configure.organization_contact_email')}
+                  >
+                    {t('configure.organization_contact_email')}
+                  </label>
+                  <input
+                    type="text"
+                    className={cn(styles.detailValue, {
+                      [styles.editable]: this.state.editing,
+                    })}
+                    onChange={this.updateEmail}
+                    value={settings.organizationContactEmail}
+                    id={t('configure.organization_contact_email')}
+                    readOnly={!this.state.editing}
+                  />
+                </li>
+              </ul>
             </div>
-          ) : (
-            <div className={styles.actionBox}>
-              {canSave ? (
+            {!this.state.editing ? (
+              <div className={styles.actionBox}>
                 <Button
-                  raised
-                  onClick={this.save}
-                  className={styles.changedSave}
-                  icon="check"
+                  className={styles.button}
+                  icon="settings"
+                  onClick={this.toggleEditing}
                   full
                 >
-                  {t('configure.save')}
+                  {t('configure.edit_info')}
                 </Button>
-              ) : (
-                <Button className={styles.button} disabled icon="check" full>
-                  {t('configure.save')}
-                </Button>
-              )}
-              <a className={styles.cancelButton} onClick={this.cancelEditing}>
-                {t('cancel')}
-              </a>
-            </div>
-          )}
-          <ul className={styles.detailList}>
-            <li className={styles.detailItem}>
-              <label
-                className={styles.detailLabel}
-                id={t('configure.organization_name')}
-              >
-                {t('configure.organization_name')}
-              </label>
-              <input
-                type="text"
-                className={cn(styles.detailValue, {
-                  [styles.editable]: this.state.editing,
-                })}
-                onChange={this.updateName}
-                value={settings.organizationName}
-                id={t('configure.organization_name')}
-                readOnly={!this.state.editing}
-              />
-            </li>
-            <li className={styles.detailItem}>
-              <label
-                className={styles.detailLabel}
-                id={t('configure.organization_contact_email')}
-              >
-                {t('configure.organization_contact_email')}
-              </label>
-              <input
-                type="text"
-                className={cn(styles.detailValue, {
-                  [styles.editable]: this.state.editing,
-                })}
-                onChange={this.updateEmail}
-                value={settings.organizationContactEmail}
-                id={t('configure.organization_contact_email')}
-                readOnly={!this.state.editing}
-              />
-            </li>
-          </ul>
+              </div>
+            ) : (
+              <div className={styles.actionBox}>
+                {canSave && !hasErrors ? (
+                  <Button
+                    raised
+                    onClick={this.save}
+                    className={styles.changedSave}
+                    icon="check"
+                    full
+                  >
+                    {t('configure.save')}
+                  </Button>
+                ) : (
+                  <Button className={styles.button} disabled icon="check" full>
+                    {t('configure.save')}
+                  </Button>
+                )}
+                <a className={styles.cancelButton} onClick={this.cancelEditing}>
+                  {t('cancel')}
+                </a>
+              </div>
+            )}
+          </div>
         </ConfigureCard>
         <Slot fill="adminOrganizationSettings" passthrough={slotPassthrough} />
       </ConfigurePage>

From 3129a6615f747f2af4ceeaf78873525fe455847d Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 20 Apr 2018 09:37:20 -0600
Subject: [PATCH 40/44] added direct download mutation

---
 graph/connectors.js                           |  4 ++
 .../server/emails/download.html.ejs           |  2 +-
 .../server/emails/download.txt.ejs            |  2 +-
 .../server/mutators.js                        | 71 ++++++++++++++-----
 .../server/resolvers.js                       |  3 +
 .../talk-plugin-profile-data/server/router.js | 14 +++-
 .../server/typeDefs.graphql                   | 14 ++++
 7 files changed, 87 insertions(+), 23 deletions(-)

diff --git a/graph/connectors.js b/graph/connectors.js
index 3ba71fbfb..3ad3024ea 100644
--- a/graph/connectors.js
+++ b/graph/connectors.js
@@ -10,6 +10,9 @@ const secrets = require('../secrets');
 // Errors.
 const errors = require('../errors');
 
+// URLs.
+const url = require('../url');
+
 // Graph.
 const { getBroker } = require('./subscriptions/broker');
 const { getPubsub } = require('./subscriptions/pubsub');
@@ -58,6 +61,7 @@ const defaultConnectors = {
   errors,
   config,
   secrets,
+  url,
   models: {
     Action,
     Asset,
diff --git a/plugins/talk-plugin-profile-data/server/emails/download.html.ejs b/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
index 00b6ad372..974ea71f4 100644
--- a/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
+++ b/plugins/talk-plugin-profile-data/server/emails/download.html.ejs
@@ -1 +1 @@
-<p><%= t('email.download.download_link_ready', organizationName, now.toLocaleString()) %> <a href="<%= BASE_URL %>account/download#<%= token %>"><%= t('email.download.download_archive') %></a></p>
+<p><%= t('email.download.download_link_ready', organizationName, now.toLocaleString()) %> <a href="<%= downloadLandingURL %>"><%= t('email.download.download_archive') %></a></p>
diff --git a/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs b/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
index 138ea1088..940d62bad 100644
--- a/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
+++ b/plugins/talk-plugin-profile-data/server/emails/download.txt.ejs
@@ -1,3 +1,3 @@
 <%= t('email.download.download_link_ready', organizationName, now.toLocaleString()) %>
 
-    <%= BASE_URL %>account/download#<%= token %>
+    <%= downloadLandingURL %>
diff --git a/plugins/talk-plugin-profile-data/server/mutators.js b/plugins/talk-plugin-profile-data/server/mutators.js
index 5a897a2e1..09c9445ef 100644
--- a/plugins/talk-plugin-profile-data/server/mutators.js
+++ b/plugins/talk-plugin-profile-data/server/mutators.js
@@ -1,17 +1,41 @@
 const moment = require('moment');
 const uuid = require('uuid/v4');
 const { DOWNLOAD_LINK_SUBJECT } = require('./constants');
+const { ErrNotAuthorized, ErrMaxRateLimit } = require('errors');
+const { URL } = require('url');
+
+// generateDownloadLinks will generate a signed set of links for a given user to
+// download an archive of their data.
+async function generateDownloadLinks(ctx, userID) {
+  const { connectors: { url: { BASE_URL }, secrets } } = ctx;
+
+  // Generate a token for the download link.
+  const token = await secrets.jwt.sign(
+    { user: userID },
+    { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
+  );
+
+  // Generate the url that a user can land on.
+  const downloadLandingURL = new URL('account/download', BASE_URL);
+  downloadLandingURL.hash = token;
+
+  // Generate the url that the API calls to download the actual zip.
+  const downloadFileURL = new URL('api/v1/account/download', BASE_URL);
+  downloadFileURL.searchParams.set('token', token);
+
+  return {
+    downloadLandingURL: downloadLandingURL.href,
+    downloadFileURL: downloadFileURL.href,
+  };
+}
+
+async function sendDownloadLink(ctx) {
+  const {
+    user,
+    loaders: { Settings },
+    connectors: { services: { Users, I18n, Limit }, models: { User } },
+  } = ctx;
 
-async function sendDownloadLink({
-  user,
-  loaders: { Settings },
-  connectors: {
-    errors,
-    secrets,
-    services: { Users, I18n, Limit },
-    models: { User },
-  },
-}) {
   // downloadLinkLimiter can be used to limit downloads for the user's data to
   // once every 7 days.
   const downloadLinkLimiter = new Limit('profileDataDownloadLimiter', 1, '7d');
@@ -20,7 +44,7 @@ async function sendDownloadLink({
   // 7 days.
   const attempts = await downloadLinkLimiter.get(user.id);
   if (attempts && attempts >= 1) {
-    throw errors.ErrMaxRateLimit;
+    throw new ErrMaxRateLimit();
   }
 
   // Check if the lastAccountDownload time is within 7 days.
@@ -30,7 +54,7 @@ async function sendDownloadLink({
       .add(7, 'days')
       .isAfter(moment())
   ) {
-    throw errors.ErrMaxRateLimit;
+    throw new ErrMaxRateLimit();
   }
 
   // The account currently does not have a download link, let's record the
@@ -38,21 +62,18 @@ async function sendDownloadLink({
   // now.
   await downloadLinkLimiter.test(user.id);
 
-  // Generate a token for the download link.
-  const token = await secrets.jwt.sign(
-    { user: user.id },
-    { jwtid: uuid.v4(), expiresIn: '1d', subject: DOWNLOAD_LINK_SUBJECT }
-  );
-
   const now = new Date();
 
+  // Generate the download links.
+  const { downloadLandingURL } = await generateDownloadLinks(ctx, user.id);
+
   const { organizationName } = await Settings.load('organizationName');
 
   // Send the download link via the user's attached email account.
   await Users.sendEmail(user, {
     template: 'download',
     locals: {
-      token,
+      downloadLandingURL,
       organizationName,
       now,
     },
@@ -66,8 +87,20 @@ async function sendDownloadLink({
   );
 }
 
+// downloadUser will return the download file url that can be used to directly
+// download the archive.
+async function downloadUser(ctx, userID) {
+  const { downloadFileURL } = await generateDownloadLinks(ctx, userID);
+  return downloadFileURL;
+}
+
 module.exports = ctx => ({
   User: {
     requestDownloadLink: () => sendDownloadLink(ctx),
+    download:
+      // Only ADMIN users can execute an account download.
+      ctx.user && ctx.user.role === 'ADMIN'
+        ? userID => downloadUser(ctx, userID)
+        : () => Promise.reject(new ErrNotAuthorized()),
   },
 });
diff --git a/plugins/talk-plugin-profile-data/server/resolvers.js b/plugins/talk-plugin-profile-data/server/resolvers.js
index 691907f8c..7a261772f 100644
--- a/plugins/talk-plugin-profile-data/server/resolvers.js
+++ b/plugins/talk-plugin-profile-data/server/resolvers.js
@@ -5,6 +5,9 @@ module.exports = {
     requestDownloadLink: async (_, args, { mutators: { User } }) => {
       await User.requestDownloadLink();
     },
+    downloadUser: async (_, { id }, { mutators: { User } }) => ({
+      archiveURL: await User.download(id),
+    }),
   },
   User: {
     lastAccountDownload: (user, args, { user: currentUser }) => {
diff --git a/plugins/talk-plugin-profile-data/server/router.js b/plugins/talk-plugin-profile-data/server/router.js
index 2b0628753..2a2e0161a 100644
--- a/plugins/talk-plugin-profile-data/server/router.js
+++ b/plugins/talk-plugin-profile-data/server/router.js
@@ -101,11 +101,21 @@ module.exports = router => {
 
   // /api/v1/account/download will send back a zipped archive of the users
   // account.
-  router.post(
+  router.all(
     '/api/v1/account/download',
     express.urlencoded({ extended: false }),
     async (req, res, next) => {
-      const { token = null, check = false } = req.body;
+      let { token = null, check = false } = req.body;
+
+      if (!token) {
+        // If the token wasn't found in the body, then we should check the query
+        // to see if it was passed that way.
+        token = req.query.token;
+      }
+
+      if (!token) {
+        return res.status(400).end();
+      }
 
       if (check) {
         // This request is checking to see if the token is valid.
diff --git a/plugins/talk-plugin-profile-data/server/typeDefs.graphql b/plugins/talk-plugin-profile-data/server/typeDefs.graphql
index 0029111c3..aa3d78adc 100644
--- a/plugins/talk-plugin-profile-data/server/typeDefs.graphql
+++ b/plugins/talk-plugin-profile-data/server/typeDefs.graphql
@@ -11,9 +11,23 @@ type RequestDownloadLinkResponse implements Response {
   errors: [UserError!]
 }
 
+type DownloadUserResponse implements Response {
+
+  # archiveURL is the link that can be used within the next 1 hour to download a
+  # users archive.
+  archiveURL: String
+
+  # An array of errors relating to the mutation that occurred.
+  errors: [UserError!]
+}
+
 type RootMutation {
 
   # requestDownloadLink will request a download link be sent to the primary
   # users email address.
   requestDownloadLink: RequestDownloadLinkResponse
+
+  # downloadUser will provide an account download for the indicated User. This
+  # mutation requires the ADMIN role.
+  downloadUser(id: ID!): DownloadUserResponse
 }

From 3b657e120fa28e9e071154b4508f908614c441e1 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 20 Apr 2018 10:52:03 -0600
Subject: [PATCH 41/44] fix for logger

---
 package.json        | 2 +-
 services/logging.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 845e2b11a..c7e9a78c1 100644
--- a/package.json
+++ b/package.json
@@ -79,6 +79,7 @@
     "babel-polyfill": "^6.26.0",
     "babel-preset-es2015": "6.24.1",
     "babel-preset-react": "^6.23.0",
+    "bunyan-debug-stream": "^1.0.8",
     "bcryptjs": "^2.4.3",
     "bowser": "^1.7.2",
     "brotli-webpack-plugin": "^0.5.0",
@@ -218,7 +219,6 @@
     "babel-plugin-dynamic-import-node": "^1.1.0",
     "babel-plugin-transform-es2015-modules-commonjs": "^6.26.0",
     "browserstack-local": "^1.3.0",
-    "bunyan-debug-stream": "^1.0.8",
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "chai-datetime": "^1.5.0",
diff --git a/services/logging.js b/services/logging.js
index 7ae3654b1..850283f40 100644
--- a/services/logging.js
+++ b/services/logging.js
@@ -2,13 +2,13 @@ const { version } = require('../package.json');
 const path = require('path');
 const { createLogger: createBunyanLogger, stdSerializers } = require('bunyan');
 const { LOGGING_LEVEL, REVISION_HASH } = require('../config');
+const debug = require('bunyan-debug-stream');
 
 // Streams enables the ability for development logs to be readable to a human,
 // but will send JSON logs in production that's parsable by a system like ELK.
 const streams = (() => {
   // In development, use the debug stream printer.
   if (process.env.NODE_ENV !== 'production') {
-    const debug = require('bunyan-debug-stream');
     return [
       {
         level: LOGGING_LEVEL,

From 80f219513b497e7e2b15757cb3529afe595eb097 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Fri, 20 Apr 2018 11:39:22 -0600
Subject: [PATCH 42/44] fixed e2e

---
 test/e2e/globals.js              | 2 +-
 test/e2e/page_objects/install.js | 2 ++
 test/e2e/specs/01_install.js     | 5 +++++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/e2e/globals.js b/test/e2e/globals.js
index 371fe64c5..aeecd204e 100644
--- a/test/e2e/globals.js
+++ b/test/e2e/globals.js
@@ -27,6 +27,6 @@ module.exports = {
       body: 'This is a test comment',
     },
     organizationName: 'Coral',
-    organizationContactEmail: 'coral@coraltest.coral',
+    organizationContactEmail: 'coral@coralproject.net',
   },
 };
diff --git a/test/e2e/page_objects/install.js b/test/e2e/page_objects/install.js
index 26b024993..1f27eabd7 100644
--- a/test/e2e/page_objects/install.js
+++ b/test/e2e/page_objects/install.js
@@ -20,6 +20,8 @@ module.exports = {
       selector: '.talk-install-step-2',
       elements: {
         organizationNameInput: '.talk-install-step-2 #organizationName',
+        organizationContactEmailInput:
+          '.talk-install-step-2 #organizationContactEmail',
         saveButton: '.talk-install-step-2-save-button',
       },
     },
diff --git a/test/e2e/specs/01_install.js b/test/e2e/specs/01_install.js
index a8a88566c..75e6a60eb 100644
--- a/test/e2e/specs/01_install.js
+++ b/test/e2e/specs/01_install.js
@@ -38,7 +38,12 @@ module.exports = {
 
     step2
       .waitForElementVisible('@organizationNameInput')
+      .waitForElementVisible('@organizationContactEmailInput', 5000)
       .setValue('@organizationNameInput', testData.organizationName)
+      .setValue(
+        '@organizationContactEmailInput',
+        testData.organizationContactEmail
+      )
       .waitForElementVisible('@saveButton')
       .click('@saveButton');
   },

From c103a0c481f3b1c40aaf42c60182e6a1233067cf Mon Sep 17 00:00:00 2001
From: "D. Luijten" <daniel.luijten@sanoma.com>
Date: Mon, 23 Apr 2018 16:46:42 +0200
Subject: [PATCH 43/44] Renamed nl to nlTA. Sorted ta.register calls

---
 client/coral-framework/services/i18n.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index 507e7f68e..03a0b4712 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -19,7 +19,7 @@ import daTA from 'timeago.js/locales/da';
 import deTA from 'timeago.js/locales/de';
 import esTA from 'timeago.js/locales/es';
 import frTA from 'timeago.js/locales/fr';
-import nl from 'timeago.js/locales/nl';
+import nlTA from 'timeago.js/locales/nl';
 import pt_BRTA from 'timeago.js/locales/pt_BR';
 import zh_CNTA from 'timeago.js/locales/zh_CN';
 import zh_TWTA from 'timeago.js/locales/zh_TW';
@@ -113,10 +113,10 @@ export function setupTranslations() {
   ta.register('da', daTA);
   ta.register('de', deTA);
   ta.register('fr', frTA);
+  ta.register('nl_NL', nlTA);
   ta.register('pt_BR', pt_BRTA);
   ta.register('zh_CN', zh_CNTA);
   ta.register('zh_TW', zh_TWTA);
-  ta.register('nl_NL', nl);
 
   timeagoInstance = ta();
 }

From c936a6ff2cb0bf39b9aba1ddfed2f22857360853 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Mon, 23 Apr 2018 10:59:23 -0400
Subject: [PATCH 44/44] Fix typo

---
 plugins/talk-plugin-profile-data/translations.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/talk-plugin-profile-data/translations.yml b/plugins/talk-plugin-profile-data/translations.yml
index 6637c6958..d1059d470 100644
--- a/plugins/talk-plugin-profile-data/translations.yml
+++ b/plugins/talk-plugin-profile-data/translations.yml
@@ -1,7 +1,7 @@
 en:
   download_landing:
     download_your_account: "Download Your Comment History"
-    download_details: "Your comment history will be downloaded into a .zip file. After your comment history is unzipped you will have a comma seperated value (or .csv) file that you can easily import into your favorite spreadsheet application."
+    download_details: "Your comment history will be downloaded into a .zip file. After your comment history is unzipped you will have a comma separated value (or .csv) file that you can easily import into your favorite spreadsheet application."
     all_information_included: "For each of your comments the following information is included:"
     information_included:
       date: "When you wrote the comment"