Merge branch 'master' into docs

graph/context.js

@@ -42,6 +42,32 @@ const decorateContextPlugins = (context, contextPlugins) => {
   );
 };
 
+/**
+ * Some pieces of the Context are quite complex to setup, using multiple merges
+ * and other lodash functions. This proxies that access such that it is only
+ * loaded if it is used. Helpful for a query that only uses a loader, and not a
+ * mutator.
+ *
+ * @param {Object} ctx the graph proxy
+ * @param {Function} loader the loadable component that should be proxied
+ */
+const createLazyContextLoader = (ctx, loader) =>
+  new Proxy(
+    { loaded: false, data: null },
+    {
+      get: (obj, prop) => {
+        if (obj.loaded) {
+          return obj.data[prop];
+        }
+
+        obj.data = loader(ctx);
+        obj.loaded = true;
+
+        return obj.data[prop];
+      },
+    }
+  );
+
 /**
  * Stores the request context.
  */
@@ -61,16 +87,18 @@ class Context {
     this.connectors = connectors;
 
     // Create the loaders.
-    this.loaders = loaders(this);
+    this.loaders = createLazyContextLoader(this, loaders);
 
     // Create the mutators.
-    this.mutators = mutators(this);
+    this.mutators = createLazyContextLoader(this, mutators);
 
     // Decorate the plugin context.
-    this.plugins = decorateContextPlugins(this, contextPlugins);
+    this.plugins = createLazyContextLoader(this, () =>
+      decorateContextPlugins(this, contextPlugins)
+    );
 
     // Bind the publish/subscribe to the context.
-    this.pubsub = getBroker();
+    this.pubsub = createLazyContextLoader(this, () => getBroker());
 
     // Bind the parent context.
     this.parent = ctx;

middleware/staticTemplate.js

@@ -13,6 +13,25 @@ const {
 
 const { RECAPTCHA_PUBLIC, WEBSOCKET_LIVE_URI } = require('../config');
 
+// Grab TALK_CLIENT_* environment variables.
+const TALK_CLIENT = /^TALK_CLIENT_/i;
+
+// TALK_CLIENT_ENV is all the environment keys that are loaded at runtime.
+const TALK_CLIENT_ENV = Object.keys(process.env)
+  .filter(key => TALK_CLIENT.test(key))
+  .reduce(
+    (env, key) => {
+      env[key] = process.env[key];
+      return env;
+    },
+    {
+      TALK_RECAPTCHA_PUBLIC: RECAPTCHA_PUBLIC,
+      LIVE_URI: WEBSOCKET_LIVE_URI,
+      STATIC_URL,
+      STATIC_ORIGIN,
+    }
+  );
+
 // TEMPLATE_LOCALS stores the static data that is provided as a `text/json` on
 // to the client from the template.
 const TEMPLATE_LOCALS = {
@@ -20,12 +39,8 @@ const TEMPLATE_LOCALS = {
   BASE_PATH,
   MOUNT_PATH,
   STATIC_URL,
-  data: {
-    TALK_RECAPTCHA_PUBLIC: RECAPTCHA_PUBLIC,
-    LIVE_URI: WEBSOCKET_LIVE_URI,
-    STATIC_URL,
-    STATIC_ORIGIN,
-  },
+  TALK_CLIENT_ENV,
+  data: TALK_CLIENT_ENV,
 };
 
 // attachStaticLocals will attach the locals to the response only.

plugin-api/beta/client/selectors/index.js

@@ -1 +1,2 @@
 export const pluginsConfigSelector = state => state.config.plugins_config;
+export const staticConfigSelector = state => state.config.static;

plugins/talk-plugin-google-auth/README.md

@@ -11,7 +11,7 @@ plugin:
         - Client
 ---
 
-Enables sign-in via Facebook via the server side passport middleware.
+Enables sign-in via Google+ via the server side passport middleware.
 
 You will need to enable the Google+ API in the dashboard and create credentials
 for a new OAuth client ID web application. The authorized JavaScript origin
@@ -26,4 +26,4 @@ Configuration:
   the [Google API Console](https://console.developers.google.com/apis/).
 - `TALK_GOOGLE_CLIENT_SECRET` (**required**) - The Google OAuth2 client ID for
   your Google login web app. You can learn more about getting a Google Client
-  ID at the [Google API Console](https://console.developers.google.com/apis/).
+  ID at the [Google API Console](https://console.developers.google.com/apis/).

plugins/talk-plugin-notifications/README.md

@@ -16,6 +16,7 @@ anything. You need to enable one of the `talk-plugin-notifications-category-*` p
 Configuration:
 
 - `DISABLE_REQUIRE_EMAIL_VERIFICATIONS` - When `TRUE`, it will disable the verification email check before sending notifications for those emails. **Note that organizations implementing a custom authentication system _must_ disable this feature, as they don't use our integrated auth**. (Default `FALSE`).
+- `TALK_CLIENT_FORCE_NOTIFICATION_SETTINGS` - When `TRUE`, the settings pane for notifications will show always, even if the user does not have a `local` profile. (Default `FALSE`).
 
 You can enable other notification options by adding more
 `talk-plugin-notification-*` plugins!

plugins/talk-plugin-notifications/client/containers/Settings.js

@@ -9,6 +9,8 @@ import {
 } from 'plugin-api/beta/client/hocs';
 import { getSlotFragmentSpreads } from 'plugin-api/beta/client/utils';
 import { withUpdateNotificationSettings } from '../mutations';
+import { connect } from 'plugin-api/beta/client/hocs';
+import { staticConfigSelector } from 'plugin-api/beta/client/selectors';
 
 const slots = ['notificationSettings'];
 
@@ -42,8 +44,11 @@ class SettingsContainer extends React.Component {
   };
 
   getNeedEmailVerification() {
-    return !this.props.root.me.profiles.some(
-      profile => profile.provider === 'local' && profile.confirmedAt
+    return (
+      this.props.root.settings.notificationsRequireConfirmation &&
+      !this.props.root.me.profiles.some(
+        profile => profile.provider === 'local' && profile.confirmedAt
+      )
     );
   }
 
@@ -94,11 +99,22 @@ const enhance = compose(
             }
           }
         }
+        settings {
+          notificationsRequireConfirmation
+        }
       }
     `,
   }),
+  // Grab the static configuration from the redux store.
+  connect(state => ({
+    static: staticConfigSelector(state),
+  })),
   excludeIf(
     props =>
+      // If the environment variable for TALK_CLIENT_FORCE_NOTIFICATION_SETTINGS
+      // is `TRUE`, then always show it.
+      props.static.TALK_CLIENT_FORCE_NOTIFICATION_SETTINGS !== 'TRUE' &&
+      // Only show the settings pane if we have a local profile otherwise.
       !props.root.me.profiles.some(profile => profile.provider === 'local')
   ),
   withUpdateNotificationSettings,

routes/api/v1/account.js

@@ -80,7 +80,7 @@ router.post('/password/reset', async (req, res, next) => {
           token,
         },
         subject: 'Password Reset',
-        to: email,
+        email,
       });
     }
 

services/logging.js

@@ -1,18 +1,18 @@
 const { version } = require('../package.json');
 const Logger = require('bunyan');
 const { LOGGING_LEVEL, REVISION_HASH } = require('../config');
+const logger = new Logger({
+  src: true,
+  name: 'talk',
+  version,
+  revision: REVISION_HASH,
+  level: LOGGING_LEVEL,
+  serializers: Logger.stdSerializers,
+});
 
 // Create the logging instance that all logger's are branched from.
 function createLogger(name, traceID) {
-  return new Logger({
-    src: true,
-    name,
-    traceID,
-    version,
-    revision: REVISION_HASH,
-    level: LOGGING_LEVEL,
-    serializers: Logger.stdSerializers,
-  });
+  return logger.child({ origin: name, traceID });
 }
 
-module.exports = { createLogger };
+module.exports = { logger, createLogger };

yarn.lock

@@ -8229,10 +8229,6 @@ pbkdf2@^3.0.3:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-pell@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/pell/-/pell-1.0.1.tgz#8f1e97165001024e5f371e0ce0b329457c847b5d"
-
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"