Merge pull request #97 from readmeio/bug/fix-manual-oauth-api-key

Fix issue where api key couldnt be set manually for oauth
readmeio · Feb 6, 2018 · 052df6e · 052df6e
2 parents 4010334 + aafe44a
commit 052df6e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/api-explorer/__tests__/SecurityInput.test.jsx b/packages/api-explorer/__tests__/SecurityInput.test.jsx
@@ -60,6 +60,12 @@ describe('oauth2', () => {
     securityInput.find('input[type="text"]').simulate('change');
 
     expect(onChange.mock.calls[0][0]).toEqual({ 'test-auth': '1234' });
+
+    expect(securityInput.find('input[type="text"]').instance().value).toEqual('1234');
+
+    securityInput.find('input[type="text"]').instance().value += '56';
+    securityInput.find('input[type="text"]').simulate('change');
+    expect(onChange.mock.calls[1][0]).toEqual({ 'test-auth': '123456' });
   });
 });
 

diff --git a/packages/api-explorer/__tests__/index.test.jsx b/packages/api-explorer/__tests__/index.test.jsx
@@ -160,9 +160,9 @@ describe('apiKey', () => {
     expect(explorer.state('apiKey')).toBe(apiKey);
   });
 
-  it('should default to empty string', () => {
+  it('should default to undefined', () => {
     const explorer = shallow(<ApiExplorer {...props} />);
 
-    expect(explorer.state('apiKey')).toBe('');
+    expect(explorer.state('apiKey')).toBe(undefined);
   });
 });
diff --git a/packages/api-explorer/src/index.jsx b/packages/api-explorer/src/index.jsx
@@ -11,7 +11,7 @@ class ApiExplorer extends React.Component {
       const userData = Cookie.getJSON('user_data');
       return userData.keys.api_key;
     } catch (e) {
-      return '';
+      return undefined;
     }
   }
 

diff --git a/packages/api-explorer/src/security-input-types/Oauth2.jsx b/packages/api-explorer/src/security-input-types/Oauth2.jsx
@@ -62,7 +62,7 @@ Oauth2.propTypes = {
 };
 
 Oauth2.defaultProps = {
-  apiKey: '',
+  apiKey: undefined,
   authInputRef: () => {},
 };