Merge pull request #74 from edx/aj/config

adding discovery to config

Author: Albert (AJ) St. Aubin

.env.development

@@ -3,6 +3,7 @@ ACCESS_TOKEN_COOKIE_NAME=edx-jwt-cookie-header-payload
 BASE_URL=localhost:8080
 CREDENTIALS_BASE_URL=http://localhost:18150
 CSRF_TOKEN_API_PATH=/csrf/api/v1/token
+DISCOVERY_BASE_URL=http://localhost:18381
 ECOMMERCE_BASE_URL=http://localhost:18130
 LANGUAGE_PREFERENCE_COOKIE_NAME=openedx-language-preference
 LMS_BASE_URL=http://localhost:18000

.env.test

@@ -3,6 +3,7 @@ ACCESS_TOKEN_COOKIE_NAME=edx-jwt-cookie-header-payload
 BASE_URL=localhost:8080
 CREDENTIALS_BASE_URL=http://localhost:18150
 CSRF_TOKEN_API_PATH=/csrf/api/v1/token
+DISCOVERY_BASE_URL=http://localhost:18381
 ECOMMERCE_BASE_URL=http://localhost:18130
 LANGUAGE_PREFERENCE_COOKIE_NAME=openedx-language-preference
 LMS_BASE_URL=http://localhost:18000

example/index.jsx

@@ -15,9 +15,13 @@ subscribe(APP_READY, () => {
   ReactDOM.render(
     <AppProvider>
       <Route exact path="/" component={ExamplePage} />
-      <Route exact path="/error_example" component={ () =>
-        <ErrorPage message="Test error message"/>
-      }/>
+      <Route
+        exact
+        path="/error_example"
+        component={() =>
+          <ErrorPage message="Test error message" />
+        }
+      />
       <AuthenticatedPageRoute exact path="/authenticated" component={AuthenticatedPage} />
     </AppProvider>,
     document.getElementById('root'),

src/config.js

@@ -37,6 +37,7 @@ let config = {
   BASE_URL: process.env.BASE_URL,
   CREDENTIALS_BASE_URL: process.env.CREDENTIALS_BASE_URL,
   CSRF_TOKEN_API_PATH: process.env.CSRF_TOKEN_API_PATH,
+  DISCOVERY_BASE_URL: process.env.DISCOVERY_BASE_URL,
   ECOMMERCE_BASE_URL: process.env.ECOMMERCE_BASE_URL,
   ENVIRONMENT,
   LANGUAGE_PREFERENCE_COOKIE_NAME: process.env.LANGUAGE_PREFERENCE_COOKIE_NAME,
@@ -153,6 +154,7 @@ export function ensureConfig(keys, requester = 'unspecified application code') {
  * @property {string} BASE_URL The URL of the current application.
  * @property {string} CREDENTIALS_BASE_URL
  * @property {string} CSRF_TOKEN_API_PATH
+ * @property {string} DISCOVERY_BASE_URL
  * @property {string} ECOMMERCE_BASE_URL
  * @property {string} ENVIRONMENT This is one of: development, production, or test.
  * @property {string} LANGUAGE_PREFERENCE_COOKIE_NAME

src/react/ErrorPage.jsx

@@ -1,9 +1,8 @@
 import React, { Component } from 'react';
+import PropTypes from 'prop-types';
 import { Button } from '@edx/paragon';
 
 import { FormattedMessage } from '../i18n';
-import PropTypes from "prop-types";
-import AppProvider from "./AppProvider";
 
 /**
  * An error page that displays a generic message for unexpected errors.  Also contains a "Try
@@ -58,7 +57,7 @@ class ErrorPage extends Component {
 }
 
 ErrorPage.propTypes = {
-  message: PropTypes.string
+  message: PropTypes.string,
 };
 
 ErrorPage.defaultProps = {

src/setupTest.js

@@ -12,6 +12,7 @@ process.env.ACCESS_TOKEN_COOKIE_NAME = 'edx-jwt-cookie-header-payload';
 process.env.BASE_URL = 'localhost:8080';
 process.env.CREDENTIALS_BASE_URL = 'http://localhost:18150';
 process.env.CSRF_TOKEN_API_PATH = '/csrf/api/v1/token';
+process.env.DISCOVERY_BASE_URL = 'http://localhost:18381';
 process.env.ECOMMERCE_BASE_URL = 'http://localhost:18130';
 process.env.LANGUAGE_PREFERENCE_COOKIE_NAME = 'openedx-language-preference';
 process.env.LMS_BASE_URL = 'http://localhost:18000';