Merge branch 'develop'

Author: birdofpreyru

Dockerfile

@@ -17,7 +17,7 @@ ENV SEGMENT_IO_API_KEY=$SEGMENT_IO_API_KEY
 
 RUN npm install
 RUN npm test
-RUN if [ "$NODE_CONFIG_ENV" = "production" ] ; then npm run build ; else npm run build:dev ; fi
+RUN npm run build
 
 EXPOSE 3000
 CMD ["npm", "start"]

config/webpack/default.js

@@ -2,8 +2,10 @@
  * Right place for any custom Webpack config, common for all environments.
  */
 
-let publicPath = process.env.CDN_URL || '/api/cdn/public';
-publicPath += '/static-assets';
+// let publicPath = process.env.CDN_URL || '/api/cdn/public';
+// publicPath += '/static-assets';
+
+const publicPath = '';
 
 module.exports = {
   externals: {

config/webpack/production.js

@@ -6,9 +6,13 @@ const webpackMerge = require('webpack-merge');
 
 const customDefaultConfig = require('./default');
 
+/*
 let publicPath = process.env.CDN_URL;
 if (publicPath) publicPath += '/static-assets';
 else publicPath = '/api/cdn/public/static-assets';
+*/
+
+const publicPath = '';
 
 const standardProductionConfig = standardConfigFactory({
   context: path.resolve(__dirname, '../..'),

package-lock.json

@@ -7,14 +7,14 @@
     "build": "npm run clean && ./node_modules/.bin/webpack --env=production --progress --profile --colors --display-optimization-bailout",
     "build:dev": "npm run clean && ./node_modules/.bin/webpack --env=development --progress --profile --colors --display-optimization-bailout",
     "clean": "./node_modules/.bin/rimraf build",
-    "dev": "cross-env BABEL_ENV=development node ./bin/www",
+    "dev": "cross-env BABEL_ENV=development NODE_ENV=development node ./bin/www",
     "fix:js": "./node_modules/.bin/eslint --fix --ext .js,.jsx .",
     "fix:styles": "./node_modules/.bin/stylelint **/*.scss --syntax scss --fix",
     "jest": "cross-env BABEL_ENV=test ./node_modules/.bin/jest --no-cache --maxWorkers=4 --config config/jest/default.js",
     "lint": "npm run lint:js && npm run lint:scss",
     "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
     "lint:scss": "./node_modules/.bin/stylelint **/*.scss --syntax scss",
-    "start": "cross-env BABEL_ENV=production node ./bin/www",
+    "start": "cross-env BABEL_ENV=production NODE_ENV=production node ./bin/www",
     "test": "npm run lint && npm run jest"
   },
   "repository": {

package.json

@@ -67,6 +67,7 @@ function handleProjectDetailsLoading(props) {
 class EditorContainer extends React.Component {
   componentDidMount() {
     const {
+      authenticating,
       challenge,
       getChallenge,
       loadingProjectsForUsername,
@@ -79,7 +80,7 @@ class EditorContainer extends React.Component {
       tokenV3,
       username,
     } = this.props;
-    if (!tokenV3) return goToLogin('payments-tool');
+    if (!authenticating && !tokenV3) return goToLogin('payments-tool');
     if (username && username !== loadingProjectsForUsername) {
       loadProjects(tokenV3);
     }
@@ -96,6 +97,7 @@ class EditorContainer extends React.Component {
 
   componentWillReceiveProps(nextProps) {
     const {
+      authenticating,
       challenge,
       loadingProjectsForUsername,
       loadProjects,
@@ -114,7 +116,7 @@ class EditorContainer extends React.Component {
       tokenV3,
       username,
     } = nextProps;
-    if (!tokenV3) return goToLogin('payments-tool');
+    if (!authenticating && !tokenV3) return goToLogin('payments-tool');
     const {
       projects: oldProjects,
       username: oldUsername,
@@ -308,6 +310,7 @@ EditorContainer.defaultProps = {
 };
 
 EditorContainer.propTypes = {
+  authenticating: PT.bool.isRequired,
   challenge: PT.shape(),
   getChallenge: PT.func.isRequired,
   loadingProjectDetailsForId: PT.number.isRequired,
@@ -362,6 +365,7 @@ function mapStateToProps(state, ownProps) {
   }
 
   return {
+    authenticating: auth.authenticating,
     challenge,
     loadingProjectDetailsForId: direct.loadingProjectDetailsForId,
     loadingProjectsForUsername: direct.loadingProjectsForUsername,

src/shared/containers/.tmp

@@ -20,12 +20,13 @@ function selectProjectAndLoadMemberTasks(projectId, props) {
 class ListingContainer extends React.Component {
   componentDidMount() {
     const {
+      authenticating,
       loadingProjectsForUsername,
       loadProjects,
       tokenV3,
       username,
     } = this.props;
-    if (!tokenV3) return goToLogin('payments-tool');
+    if (!authenticating && !tokenV3) return goToLogin('payments-tool');
     if (username && username !== loadingProjectsForUsername) {
       loadProjects(tokenV3);
     }
@@ -34,14 +35,15 @@ class ListingContainer extends React.Component {
 
   componentWillReceiveProps(nextProps) {
     const {
+      authenticating,
       loadingProjectsForUsername,
       loadProjects,
       projects,
       selectedProjectId,
       tokenV3,
       username,
     } = nextProps;
-    if (!tokenV3) return goToLogin('payments-tool');
+    if (!authenticating && !tokenV3) return goToLogin('payments-tool');
     if (username !== this.props.username && username
     && username !== loadingProjectsForUsername) {
       loadProjects(tokenV3);
@@ -80,6 +82,7 @@ class ListingContainer extends React.Component {
 }
 
 ListingContainer.propTypes = {
+  authenticating: PT.bool.isRequired,
   loadingMemberTasks: PT.bool.isRequired,
   loadProjects: PT.func.isRequired,
   loadingProjectsForUsername: PT.string.isRequired,
@@ -100,6 +103,7 @@ function mapStateToProps(state) {
   const { auth, direct, memberTasks } = state;
   const page = state.page.sandbox.payments.listing;
   return {
+    authenticating: auth.authenticating,
     loadingMemberTasks: Boolean(memberTasks.loadingUuid),
     loadingProjectsForUsername: direct.loadingProjectsForUsername,
     memberTasks: memberTasks.tasks,