Merge 19bc25c into 712b3f8

rapid7 · Feb 7, 2019 · 6c445a5 · 6c445a5
2 parents 712b3f8 + 19bc25c
commit 6c445a5
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/api/routes/configure.js b/api/routes/configure.js
@@ -34,6 +34,9 @@ module.exports = (app, auth) => {
       Storage.set('metadataUrls', storedMetadataUrls);
     }
 
+    let defaultMetadataName = app.get('profileName')
+      || '';
+
     // We populate the value of the metadata url field on the following (in order of precedence):
     //   1. Use the current session's metadata url (may have been rejected).
     //   2. Use the latest validated metadata url.
@@ -48,10 +51,14 @@ module.exports = (app, auth) => {
     if (!defaultMetadataUrl) {
       if (storedMetadataUrls.length > 0 && storedMetadataUrls[0].hasOwnProperty('url')) {
         defaultMetadataUrl = storedMetadataUrls[0].url;
+        if (storedMetadataUrls[0].hasOwnProperty('name')) {
+          defaultMetadataName = storedMetadataUrls[0].name;
+        }
       }
     }
 
     res.json(Object.assign({}, ResponseObj, {
+      defaultMetadataName,
       defaultMetadataUrl,
       error: Storage.get('metadataUrlError'),
       metadataUrlValid: Storage.get('metadataUrlValid'),
@@ -110,9 +117,13 @@ module.exports = (app, auth) => {
     }
 
     app.set('metadataUrl', metadataUrl);
+    app.set('profileName', profileName);
 
     const origin = req.body.origin;
-    const metaDataResponseObj = Object.assign({}, ResponseObj, {defaultMetadataUrl: metadataUrl});
+    const metaDataResponseObj = Object.assign({}, ResponseObj, {
+      defaultMetadataName: profileName,
+      defaultMetadataUrl: metadataUrl,
+    });
 
     const xmlReq = https.get(metadataUrl, (xmlRes) => {
       let xml = '';

diff --git a/src/containers/components/ComponentWithError.js b/src/containers/components/ComponentWithError.js
@@ -36,6 +36,7 @@ export const ComponentWithError = (WrappedComponent) => {
           {...this.props}
           {...this.state}
           errorMessage={this.errorMessage}
+          nameGroupClass={'form-group'}
           urlGroupClass={getErrorClass(this.hasError())}
         />
       );

diff --git a/src/containers/configure/ConfigureMetadata.js b/src/containers/configure/ConfigureMetadata.js
@@ -8,20 +8,24 @@ import {ComponentWithError} from '../components/ComponentWithError';
 
 class ConfigureMetadataComponent extends Component {
   static propTypes = {
+    defaultMetadataName: PropTypes.string,
     defaultMetadataUrl: PropTypes.string.isRequired,
     errorMessage: PropTypes.string,
+    nameGroupClass: PropTypes.string,
     redirect: PropTypes.string,
     submitConfigure: PropTypes.func.isRequired,
     urlGroupClass: PropTypes.string,
   };
 
   state = {
     metadataUrl: '',
+    profileName: '',
   };
 
   componentDidMount() {
     this.setState({
       metadataUrl: this.props.defaultMetadataUrl,
+      profileName: this.props.defaultMetadataName,
     });
   }
 
@@ -39,9 +43,10 @@ class ConfigureMetadataComponent extends Component {
 
   handleSubmit = (event) => {
     event.preventDefault();
-    const {metadataUrl} = this.state;
+    const {metadataUrl, profileName} = this.state;
     const payload = {
       metadataUrl,
+      profileName,
     };
 
     this.props.submitConfigure(payload);
@@ -68,6 +73,18 @@ class ConfigureMetadataComponent extends Component {
             value={this.state.metadataUrl}
           />
         </div>
+        <div className={this.props.nameGroupClass}>
+          <label htmlFor="profileName">Account Alias</label>
+          <input
+            className="form-control"
+            id="profileName"
+            name="profileName"
+            onChange={this.handleInputChange}
+            onKeyDown={this.handleKeyDown}
+            pattern=".+"
+            type="string"
+          />
+        </div>
         <Button
           color="primary"
           onClick={this.handleSubmit}