From 00eff653cba9c37820155ec8268bb4cfa809fed2 Mon Sep 17 00:00:00 2001
From: Kim Gardner <kgardnr@gmail.com>
Date: Tue, 30 Jan 2018 12:21:10 -0500
Subject: [PATCH 1/5] Update version to 4.1.0 and update LICENSE

---
 LICENSE      | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index e0a687532..5beee04b4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright 2017 Mozilla Foundation
+Copyright 2018 Mozilla Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/package.json b/package.json
index b3afdc9b6..6a3b1b447 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "talk",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "A better commenting experience from Mozilla, The New York Times, and the Washington Post. https://coralproject.net",
   "main": "app.js",
   "private": true,

From ec54376a53918879e2a78126ed8b76ecbefc1c62 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 30 Jan 2018 11:00:48 -0700
Subject: [PATCH 2/5] blocked user actions in username change process

---
 .../src/components/CommentLabels.js           |  3 ++-
 .../src/routes/Community/components/People.js | 14 +++++++----
 .../coral-embed-stream/src/graphql/index.js   |  3 ++-
 .../src/tabs/stream/components/Comment.js     |  5 ++--
 client/coral-framework/constants/roles.js     |  4 ++++
 .../constants/usernameStatus.js               | 22 +++++++++++++++++
 client/coral-framework/services/perms.js      | 24 ++++++++++++-------
 7 files changed, 58 insertions(+), 17 deletions(-)
 create mode 100644 client/coral-framework/constants/roles.js
 create mode 100644 client/coral-framework/constants/usernameStatus.js

diff --git a/client/coral-admin/src/components/CommentLabels.js b/client/coral-admin/src/components/CommentLabels.js
index e50d53632..8eac152bd 100644
--- a/client/coral-admin/src/components/CommentLabels.js
+++ b/client/coral-admin/src/components/CommentLabels.js
@@ -5,8 +5,9 @@ import Slot from 'coral-framework/components/Slot';
 import FlagLabel from 'coral-ui/components/FlagLabel';
 import cn from 'classnames';
 import styles from './CommentLabels.css';
+import { ADMIN, MODERATOR, STAFF } from 'coral-framework/constants/roles';
 
-const staffRoles = ['ADMIN', 'STAFF', 'MODERATOR'];
+const staffRoles = [ADMIN, MODERATOR, STAFF];
 
 function isUserFlagged(actions) {
   return actions.some(
diff --git a/client/coral-admin/src/routes/Community/components/People.js b/client/coral-admin/src/routes/Community/components/People.js
index 0328d148b..1f5e4bab8 100644
--- a/client/coral-admin/src/routes/Community/components/People.js
+++ b/client/coral-admin/src/routes/Community/components/People.js
@@ -10,6 +10,12 @@ import ActionsMenu from 'coral-admin/src/components/ActionsMenu';
 import ActionsMenuItem from 'coral-admin/src/components/ActionsMenuItem';
 import { isSuspended, isBanned } from 'coral-framework/utils/user';
 import moment from 'moment';
+import {
+  ADMIN,
+  COMMENTER,
+  MODERATOR,
+  STAFF,
+} from 'coral-framework/constants/roles';
 
 const headers = [
   {
@@ -200,19 +206,19 @@ class People extends React.Component {
                             onChange={role => setUserRole(user.id, role)}
                           >
                             <Option
-                              value={'COMMENTER'}
+                              value={COMMENTER}
                               label={t('community.commenter')}
                             />
                             <Option
-                              value={'STAFF'}
+                              value={STAFF}
                               label={t('community.staff')}
                             />
                             <Option
-                              value={'MODERATOR'}
+                              value={MODERATOR}
                               label={t('community.moderator')}
                             />
                             <Option
-                              value={'ADMIN'}
+                              value={ADMIN}
                               label={t('community.admin')}
                             />
                           </Dropdown>
diff --git a/client/coral-embed-stream/src/graphql/index.js b/client/coral-embed-stream/src/graphql/index.js
index 279a1dcf6..1c2e8f4e9 100644
--- a/client/coral-embed-stream/src/graphql/index.js
+++ b/client/coral-embed-stream/src/graphql/index.js
@@ -6,6 +6,7 @@ import {
   removeCommentFromEmbedQuery,
 } from './utils';
 import { mapLeaves } from 'coral-framework/utils';
+import { ADMIN, MODERATOR } from 'coral-framework/constants/roles';
 
 export default {
   fragments: {
@@ -198,7 +199,7 @@ export default {
           { mutationResult: { data: { createComment: { comment } } } }
         ) => {
           if (
-            (!['ADMIN', 'MODERATOR'].includes(prev.me.role) &&
+            (![ADMIN, MODERATOR].includes(prev.me.role) &&
               prev.asset.settings.moderation === 'PRE') ||
             comment.status === 'PREMOD' ||
             comment.status === 'REJECTED' ||
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 cd0fab9e9..b121a7750 100644
--- a/client/coral-embed-stream/src/tabs/stream/components/Comment.js
+++ b/client/coral-embed-stream/src/tabs/stream/components/Comment.js
@@ -30,8 +30,9 @@ import {
 import t from 'coral-framework/services/i18n';
 import CommentContainer from '../containers/Comment';
 import { CommentAuthorName } from 'coral-framework/components';
+import { STAFF } from 'coral-framework/constants/roles';
 
-const isStaff = tags => !tags.every(t => t.tag.name !== 'STAFF');
+const isStaff = tags => !tags.every(t => t.tag.name !== STAFF);
 const hasTag = (tags, lookupTag) =>
   !!tags.filter(t => t.tag.name === lookupTag).length;
 const hasComment = (nodes, id) => nodes.some(node => node.id === id);
@@ -416,7 +417,7 @@ export default class Comment extends React.Component {
      * classnames is an array of objects with key as classnames and value as conditions
      * i.e:
      * {
-     *  'myClassName': { tags: ['STAFF']}
+     *  'myClassName': { tags: [STAFF]}
      * }
      *
      * This will add myClassName to comments tagged with STAFF TAG.
diff --git a/client/coral-framework/constants/roles.js b/client/coral-framework/constants/roles.js
new file mode 100644
index 000000000..3df0f41bb
--- /dev/null
+++ b/client/coral-framework/constants/roles.js
@@ -0,0 +1,4 @@
+export const ADMIN = 'ADMIN';
+export const COMMENTER = 'COMMENTER';
+export const MODERATOR = 'MODERATOR';
+export const STAFF = 'STAFF';
diff --git a/client/coral-framework/constants/usernameStatus.js b/client/coral-framework/constants/usernameStatus.js
new file mode 100644
index 000000000..75f3a2d5b
--- /dev/null
+++ b/client/coral-framework/constants/usernameStatus.js
@@ -0,0 +1,22 @@
+// UNSET is used when the username can be changed, and does not necessarily
+// require moderator action to become active. This can be used when the user
+// signs up with a social login and has the option of setting their own
+// username.
+export const UNSET = 'UNSET';
+
+// SET is used when the username has been set for the first time, but cannot
+// change without the username being rejected by a moderator and that moderator
+// agreeing that the username should be allowed to change.
+export const SET = 'SET';
+
+// APPROVED is used when the username was changed, and subsequently approved by
+// said moderator.
+export const APPROVED = 'APPROVED';
+
+// REJECTED is used when the username was changed, and subsequently rejected by
+// said moderator.
+export const REJECTED = 'REJECTED';
+
+// CHANGED is used after a user has changed their username after it was
+// rejected.
+export const CHANGED = 'CHANGED';
diff --git a/client/coral-framework/services/perms.js b/client/coral-framework/services/perms.js
index da833de14..9d588c5e2 100644
--- a/client/coral-framework/services/perms.js
+++ b/client/coral-framework/services/perms.js
@@ -1,4 +1,7 @@
 import get from 'lodash/get';
+import includes from 'lodash/includes';
+import { ADMIN, MODERATOR, STAFF } from '../constants/roles';
+import { UNSET, REJECTED, CHANGED } from '../constants/usernameStatus';
 
 // =========================================================================
 // BASIC PERMISSIONS
@@ -6,15 +9,18 @@ import get from 'lodash/get';
 
 const basicPerms = {
   INTERACT_WITH_COMMUNITY: user => {
+    const usernameChangeInProgress = includes(
+      [UNSET, REJECTED, CHANGED],
+      get(user, 'status.username.status')
+    );
     const banned = get(user, 'status.banned.status');
     const suspensionUntil = get(user, 'status.suspension.until');
     const suspended = suspensionUntil && new Date(suspensionUntil) > new Date();
 
-    return !banned && !suspended;
+    return !usernameChangeInProgress && !banned && !suspended;
   },
   EDIT_NAME: user => {
-    const usernameStatus = user.status.username.status;
-    return usernameStatus === 'UNSET' || usernameStatus === 'REJECTED';
+    return includes([UNSET, REJECTED], get(user, 'status.username.status'));
   },
 };
 
@@ -23,18 +29,18 @@ const basicPerms = {
 // =========================================================================
 
 const basicRoles = {
-  HAS_STAFF_TAG: ['ADMIN', 'MODERATOR', 'STAFF'],
+  HAS_STAFF_TAG: [ADMIN, MODERATOR, STAFF],
 };
 
 const queryRoles = {
-  UPDATE_CONFIG: ['ADMIN'],
-  ACCESS_ADMIN: ['ADMIN', 'MODERATOR'],
-  VIEW_USER_EMAILS: ['ADMIN'],
+  UPDATE_CONFIG: [ADMIN],
+  ACCESS_ADMIN: [ADMIN, MODERATOR],
+  VIEW_USER_EMAILS: [ADMIN],
 };
 
 const mutationRoles = {
-  CHANGE_ROLES: ['ADMIN'],
-  MODERATE_COMMENTS: ['ADMIN', 'MODERATOR'],
+  CHANGE_ROLES: [ADMIN],
+  MODERATE_COMMENTS: [ADMIN, MODERATOR],
 };
 
 const roles = { ...basicRoles, ...queryRoles, ...mutationRoles };

From 26bd01cbda0277d09b0eecb6193d7197901814ac Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Tue, 30 Jan 2018 15:29:36 -0700
Subject: [PATCH 3/5] updated docs for 4.1 release

---
 docs/_data/nav.yaml               |  2 ++
 docs/_docs/06-01-migrating-4-1.md | 35 +++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 docs/_docs/06-01-migrating-4-1.md

diff --git a/docs/_data/nav.yaml b/docs/_data/nav.yaml
index c765b0fb7..58e418c14 100644
--- a/docs/_data/nav.yaml
+++ b/docs/_data/nav.yaml
@@ -45,3 +45,5 @@ items:
     children:
       - title: Migrating to v4.0.0
         url: /migration/4/
+      - title: Migrating to v4.1.0
+        url: /migration/4.1/
diff --git a/docs/_docs/06-01-migrating-4-1.md b/docs/_docs/06-01-migrating-4-1.md
new file mode 100644
index 000000000..15caa7a29
--- /dev/null
+++ b/docs/_docs/06-01-migrating-4-1.md
@@ -0,0 +1,35 @@
+---
+title: Migrating to v4.1.0
+permalink: /migration/4.1/
+---
+
+## Database Migrations
+
+We have unified the database verifications that were introduced in 3.x.x into
+the migration system. This unification unfortunately required a database
+migration bump.
+
+### Source
+
+When running via source, you can run the following to start the migration
+process:
+
+```bash
+./bin/cli migration run
+```
+This will prompt you to perform a database backup before starting the migration
+process. Data loss is entirely possible otherwise.
+{: .code-aside}
+
+### Docker Compose
+
+If you are running Talk with docker-compose, you can use the following command
+to perform the migration:
+
+```bash
+docker-compose run --rm talk cli migration run
+```
+This will prompt you to perform a database backup before starting the migration
+process. Data loss is entirely possible otherwise.
+{: .code-aside}
+

From 062ce58cf8aba38281a38be24c13ec034e1359f1 Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 31 Jan 2018 10:57:01 -0700
Subject: [PATCH 4/5] ensure dynamic imports use proper path/url

---
 client/coral-framework/constants/config.js   | 11 ++++++++
 client/coral-framework/helpers/publicPath.js | 13 +++++++++
 client/coral-framework/services/bootstrap.js | 28 +++-----------------
 webpack.config.js                            | 14 +++++++---
 4 files changed, 37 insertions(+), 29 deletions(-)
 create mode 100644 client/coral-framework/constants/config.js
 create mode 100644 client/coral-framework/helpers/publicPath.js

diff --git a/client/coral-framework/constants/config.js b/client/coral-framework/constants/config.js
new file mode 100644
index 000000000..5ffc59ee2
--- /dev/null
+++ b/client/coral-framework/constants/config.js
@@ -0,0 +1,11 @@
+// This is always loaded in the body of the page, meaning that the dom element
+// for this data blob is always loaded when we render this piece.
+const CONFIG_ELEMENT = document.querySelector('#data');
+
+// Parse the configuration from that element if it exists, otherwise, an empty
+// object.
+const CONFIG = CONFIG_ELEMENT ? JSON.parse(CONFIG_ELEMENT.textContent) : {};
+
+// Export the expected fields.
+export const LIVE_URI = CONFIG.LIVE_URI;
+export const STATIC_URL = CONFIG.STATIC_URL;
diff --git a/client/coral-framework/helpers/publicPath.js b/client/coral-framework/helpers/publicPath.js
new file mode 100644
index 000000000..d67166de9
--- /dev/null
+++ b/client/coral-framework/helpers/publicPath.js
@@ -0,0 +1,13 @@
+/* global __webpack_public_path__ */ // eslint-disable-line no-unused-vars
+
+import { STATIC_URL } from 'coral-framework/constants/config';
+
+// Update the static url for the imported public path so dynamically imported
+// chunks will use the correct path as defined by the process.env.STATIC_URL
+// that is provided dynamically from the template. This is a better solution to
+// embedding the environment variables as changes won't require recompilation.
+//
+// The __webpack_public_path__ can be referenced:
+// https://webpack.js.org/configuration/output/#output-publicpath
+//
+__webpack_public_path__ = STATIC_URL + 'static/';
diff --git a/client/coral-framework/services/bootstrap.js b/client/coral-framework/services/bootstrap.js
index b1014f2db..b56872985 100644
--- a/client/coral-framework/services/bootstrap.js
+++ b/client/coral-framework/services/bootstrap.js
@@ -1,3 +1,4 @@
+import { LIVE_URI } from 'coral-framework/constants/config';
 import { createStore } from './store';
 import { createClient, apolloErrorReporter } from './client';
 import pym from './pym';
@@ -22,27 +23,6 @@ import { createHistory } from 'coral-framework/services/history';
 import { createIntrospection } from 'coral-framework/services/introspection';
 import introspectionData from 'coral-framework/graphql/introspection.json';
 
-/**
- * getStaticConfiguration will return a singleton of the static configuration
- * object provided via a JSON DOM element.
- */
-const getStaticConfiguration = (() => {
-  let staticConfiguration = null;
-  return () => {
-    if (staticConfiguration != null) {
-      return staticConfiguration;
-    }
-
-    const configElement = document.querySelector('#data');
-
-    staticConfiguration = JSON.parse(
-      configElement ? configElement.textContent : '{}'
-    );
-
-    return staticConfiguration;
-  };
-})();
-
 /**
  * getAuthToken returns the active auth token or null
  *   Note: this method does not have access to the cookie based token used by
@@ -103,10 +83,8 @@ export async function createContext({
     token,
   });
 
-  // Try to get an overrided liveUri from the static config, if none is found,
-  // build it.
-  let { LIVE_URI: liveUri } = getStaticConfiguration();
-  if (liveUri == null) {
+  let liveUri = null;
+  if (LIVE_URI == null) {
     // The protocol must match the origin protocol, secure/insecure.
     const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
 
diff --git a/webpack.config.js b/webpack.config.js
index 3367727f5..6a018caba 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -54,7 +54,7 @@ const config = {
   target: 'web',
   output: {
     path: path.join(__dirname, 'dist'),
-    publicPath: '/static/',
+    publicPath: '',
     filename: '[name].js',
     chunkFilename: '[name].chunk.js',
   },
@@ -249,13 +249,19 @@ const applyConfig = (entries, root = {}) =>
     config,
     {
       entry: entries.reduce(
-        (entry, { name, path, disablePolyfill = false }) => {
+        (entry, { name, path: modulePath, disablePolyfill = false }) => {
+          const entries = [
+            path.join(__dirname, 'client/coral-framework/helpers/publicPath'),
+          ];
           if (disablePolyfill) {
-            entry[name] = path;
+            entries.push(modulePath);
           } else {
-            entry[name] = ['babel-polyfill', path];
+            entries.unshift('babel-polyfill');
+            entries.push(modulePath);
           }
 
+          entry[name] = entries;
+
           return entry;
         },
         {}

From c4cddefcffa9c8aa10c7cfaf572034573df0b57b Mon Sep 17 00:00:00 2001
From: Wyatt Johnson <wyattjoh@gmail.com>
Date: Wed, 31 Jan 2018 11:25:43 -0700
Subject: [PATCH 5/5] abstracted config to service

---
 client/coral-framework/constants/config.js     | 11 -----------
 client/coral-framework/helpers/publicPath.js   |  5 ++++-
 client/coral-framework/services/bootstrap.js   |  6 +++---
 .../services/staticConfiguration.js            | 18 ++++++++++++++++++
 4 files changed, 25 insertions(+), 15 deletions(-)
 delete mode 100644 client/coral-framework/constants/config.js
 create mode 100644 client/coral-framework/services/staticConfiguration.js

diff --git a/client/coral-framework/constants/config.js b/client/coral-framework/constants/config.js
deleted file mode 100644
index 5ffc59ee2..000000000
--- a/client/coral-framework/constants/config.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// This is always loaded in the body of the page, meaning that the dom element
-// for this data blob is always loaded when we render this piece.
-const CONFIG_ELEMENT = document.querySelector('#data');
-
-// Parse the configuration from that element if it exists, otherwise, an empty
-// object.
-const CONFIG = CONFIG_ELEMENT ? JSON.parse(CONFIG_ELEMENT.textContent) : {};
-
-// Export the expected fields.
-export const LIVE_URI = CONFIG.LIVE_URI;
-export const STATIC_URL = CONFIG.STATIC_URL;
diff --git a/client/coral-framework/helpers/publicPath.js b/client/coral-framework/helpers/publicPath.js
index d67166de9..57b6b7d15 100644
--- a/client/coral-framework/helpers/publicPath.js
+++ b/client/coral-framework/helpers/publicPath.js
@@ -1,6 +1,9 @@
 /* global __webpack_public_path__ */ // eslint-disable-line no-unused-vars
 
-import { STATIC_URL } from 'coral-framework/constants/config';
+import { getStaticConfiguration } from 'coral-framework/services/staticConfiguration';
+
+// Load the static url from the static configuration.
+const { STATIC_URL } = getStaticConfiguration();
 
 // Update the static url for the imported public path so dynamically imported
 // chunks will use the correct path as defined by the process.env.STATIC_URL
diff --git a/client/coral-framework/services/bootstrap.js b/client/coral-framework/services/bootstrap.js
index b56872985..66da3ff29 100644
--- a/client/coral-framework/services/bootstrap.js
+++ b/client/coral-framework/services/bootstrap.js
@@ -1,4 +1,4 @@
-import { LIVE_URI } from 'coral-framework/constants/config';
+import { getStaticConfiguration } from 'coral-framework/services/staticConfiguration';
 import { createStore } from './store';
 import { createClient, apolloErrorReporter } from './client';
 import pym from './pym';
@@ -83,8 +83,8 @@ export async function createContext({
     token,
   });
 
-  let liveUri = null;
-  if (LIVE_URI == null) {
+  let { LIVE_URI: liveUri } = getStaticConfiguration();
+  if (liveUri == null) {
     // The protocol must match the origin protocol, secure/insecure.
     const protocol = location.protocol === 'https:' ? 'wss' : 'ws';
 
diff --git a/client/coral-framework/services/staticConfiguration.js b/client/coral-framework/services/staticConfiguration.js
new file mode 100644
index 000000000..25eb606c7
--- /dev/null
+++ b/client/coral-framework/services/staticConfiguration.js
@@ -0,0 +1,18 @@
+/**
+ * getStaticConfiguration will return a singleton of the static configuration
+ * object provided via a JSON DOM element.
+ */
+let staticConfiguration = null;
+export const getStaticConfiguration = () => {
+  if (staticConfiguration != null) {
+    return staticConfiguration;
+  }
+
+  const configElement = document.querySelector('#data');
+
+  staticConfiguration = JSON.parse(
+    configElement ? configElement.textContent : '{}'
+  );
+
+  return staticConfiguration;
+};