Merge commit 'a1b41ab439965ee309d80ea35f1fa3e004bebdf4' into HEAD

Author: Jenkins Continuous Integration Server

app/account/account.routes.js

@@ -17,6 +17,7 @@ import angular from 'angular'
         }
       },
       'login': {
+        parent: 'auth',
         url: '/login/?next&code&state&status&userJWTToken&utm_source&utm_medium&utm_campaign',
         views: {
           'header@': {},
@@ -36,8 +37,38 @@ import angular from 'angular'
           }
         ]
 
+      },
+      'register': {
+        url: '/register/?next&utm_source&utm_medium&utm_campaign',
+        parent: 'auth',
+        views: {
+          'header@': {},
+          'container@': {},
+          'footer@': {}
+        },
+        data: {
+          title: 'Join',
+          authRequired: false
+        },
+        onEnter: ['$state', '$window', '$stateParams', 'logger',
+          function($state, $window,  $stateParams, logger) {
+            var next = $state.href('dashboard', {}, {absolute: true})
+            if ($stateParams.next) {
+              next = decodeURIComponent($stateParams.next)
+            }
+            var queryStr = '?retUrl=' + encodeURIComponent(next)
+            for(var param in $stateParams) {
+              if ($stateParams[param]) {
+                queryStr += ('&' + param + '=' + encodeURIComponent($stateParams[param]))
+              }
+            }
+            $window.location = CONSTANTS.ACCOUNTS_APP_URL + '/registration' + queryStr
+          }
+        ]
+
       },
       logout: {
+        parent: 'auth',
         url: '/logout/',
         views: {
           'header@': {},

app/topcoder.routes.js

@@ -28,7 +28,7 @@ import moment from 'moment'
       if (path.indexOf('?') > -1) {
         return path.replace('?', '/?')
       }
-      return path + '/'
+      $location.replace().path(path + '/')
     })
 
     var states = {

webpack.config.js

@@ -16,9 +16,14 @@ if (CI === 'master') {
   process.env.NODE_ENV = 'development'
 }
 
-
-process.env.CONNECTOR_URL = `https://accounts.${process.env.DOMAIN}/connector.html`
-process.env.ACCOUNTS_APP_URL = `https://accounts.${process.env.DOMAIN}/tc`
+var accountsAppURL = null
+if (process.env.ACCOUNTS_APP_URL) {
+  accountsAppURL = process.env.ACCOUNTS_APP_URL
+}
+var accountsConnectorURL = null
+if (process.env.ACCOUNTS_APP_CONNECTOR_URL) {
+  accountsConnectorURL = process.env.ACCOUNTS_APP_CONNECTOR_URL
+}
 
 const config = require('appirio-tech-webpack-config')({
   dirname: __dirname,
@@ -34,4 +39,11 @@ const config = require('appirio-tech-webpack-config')({
 
 if (CI) config.output.publicPath = process.env.ASSET_PREFIX
 
+if (accountsAppURL) {
+  process.env.ACCOUNTS_APP_URL = accountsAppURL
+}
+if (accountsConnectorURL) {
+  process.env.ACCOUNTS_APP_CONNECTOR_URL = accountsConnectorURL
+}
+
 module.exports = config