Add ui_locales to login

client/actions/auth.js

@@ -16,13 +16,14 @@ const webAuth = new auth0.WebAuth({ // eslint-disable-line no-undef
   }
 });
 
-export function login(returnUrl) {
+export function login(returnUrl, uiLocales) {
   sessionStorage.setItem('delegated-admin:returnTo', returnUrl);
 
   webAuth.authorize({
     responseType: 'id_token',
     redirectUri: `${window.config.BASE_URL}/login`,
-    scope: 'openid roles'
+    scope: 'openid roles',
+    ui_locales: uiLocales
   });
 
   return {
@@ -164,7 +165,13 @@ function getLanguageDictionary(response, onSuccess) {
     if (_.isObject(settings.languageDictionary)) {
       promise = Promise.resolve({ data: settings.languageDictionary });
     } else if (_.isString(settings.languageDictionary) && settings.languageDictionary.startsWith('http')) {
-      promise = axios.get(settings.languageDictionary, { headers: {}, responseType: 'json' });
+      // Setting Authorization to None because we don't want to ship the token to some undeclared endpoint,
+      // especially if not enforcing https
+      promise = axios.get(settings.languageDictionary, { headers: { 'Authorization': 'None' }, responseType: 'json' })
+        .then((response) => {
+          if (response.data) return response;
+          return Promise.reject(new Error(`Language Dictionary endpoint: ${settings.languageDictionary} returned no data`));
+        });
     } // ignore else, bad languageDictionary
   }
 

client/app.jsx

@@ -8,7 +8,7 @@ import { Provider } from 'react-redux';
 
 import { useRouterHistory } from 'react-router';
 import { createHistory } from 'history';
-import { push, routerMiddleware, syncHistoryWithStore } from 'react-router-redux';
+import { routerMiddleware, syncHistoryWithStore } from 'react-router-redux';
 
 import { loadCredentials } from './actions/auth';
 import routes from './routes';

client/components/Users/UsersTable.jsx

@@ -67,7 +67,15 @@ export default class UsersTable extends Component {
     ];
 
     const connectionField = _.find(userFields, { property: 'connection' });
-    if (connectionField && (_.isFunction(connectionField.display) || (_.isBoolean(connectionField.display) && connectionField.display === true))) {
+    if (!connectionField) {
+      defaultListFields.push({
+        listOrder: 4,
+        listSize: '25%',
+        property: 'identities',
+        label: 'Connection',
+        display: (user, value) => value[0].connection
+      });
+    } else if (_.isFunction(connectionField.display) || (_.isBoolean(connectionField.display) && connectionField.display === true)) {
       defaultListFields.push({
         listOrder: 4,
         listSize: '25%',

client/containers/App.jsx

@@ -39,7 +39,8 @@ class App extends Component {
   };
 
   render() {
-    const { settingsLoading, languageDictionary } = this.props;
+    const { settingsLoading } = this.props;
+    const languageDictionary = this.props.languageDictionary && this.props.languageDictionary.toJS() || {};
     if (settingsLoading) {
       return <LoadingPanel show={settingsLoading} />;
     }
@@ -80,7 +81,7 @@ function select(state) {
     accessLevel: state.accessLevel.get('record'),
     settings: state.settings.get('record'),
     settingsLoading: state.settings.get('loading'),
-    languageDictionary: state.languageDictionary.get('record').toJS()
+    languageDictionary: state.languageDictionary.get('record')
   };
 }
 

client/containers/Login.jsx

@@ -19,12 +19,12 @@ class LoginContainer extends Component {
     if (this.props.auth.isAuthenticated) {
       this.props.push(this.props.auth.returnTo || '/users');
     } else if (!this.props.auth.isAuthenticating && !this.props.auth.error) {
-      this.props.login(this.props.location.query.returnUrl);
+      this.props.login(this.props.location.query.returnUrl, this.props.location.query.ui_locales);
     }
   }
 
   login() {
-    this.props.login(this.props.location.query.returnUrl);
+    this.props.login(this.props.location.query.returnUrl, this.props.location.query.ui_locales);
   }
 
   render() {

client/containers/RequireAuthentication.jsx

@@ -1,4 +1,5 @@
-import React, { PropTypes } from 'react';
+import React from 'react';
+import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import { push } from 'react-router-redux';
 
@@ -8,7 +9,7 @@ export default function RequireAuthentication(InnerComponent) {
       push: PropTypes.func.isRequired,
       auth: PropTypes.object.isRequired,
       location: PropTypes.object.isRequired
-    }
+    };
 
     componentWillMount() {
       this.requireAuthentication();
@@ -23,7 +24,7 @@ export default function RequireAuthentication(InnerComponent) {
         if (!this.props.location) {
           this.props.push('/login');
         } else {
-          this.props.push(`/login?returnUrl=${this.props.location.pathname}`);
+          this.props.push(`/login?returnUrl=${this.props.location.pathname}${this.props.location.search ? this.props.location.search : ''}`);
         }
       }
     }
@@ -37,5 +38,5 @@ export default function RequireAuthentication(InnerComponent) {
     }
   }
 
-  return connect((state) => ({ auth: state.auth.toJS() }), { push })(RequireAuthenticationContainer);
+  return connect((state) => ({ auth: state.auth.toJS() }))(RequireAuthenticationContainer);
 }

client/reducers/languageDictionary.js

@@ -5,13 +5,14 @@ import createReducer from '../utils/createReducer';
 const initialState = {
   loading: false,
   error: null,
-  record: {}
+  record: { }
 };
 
 export const languageDictionary = createReducer(fromJS(initialState), { // eslint-disable-line
 // import/prefer-default-export
   [constants.FETCH_LANGUAGE_DICTIONARY_PENDING]: (state) =>
     state.merge({
+      ...initialState,
       loading: true,
       error: null
     }),