fix(authentication): consistent throw if token not found

SpoonX · May 27, 2016 · 41454e3 · 41454e3
1 parent 877fa50
commit 41454e3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/src/authentication.js b/src/authentication.js
@@ -186,8 +186,12 @@ export class Authentication {
     }
 
     if (typeof responseTokenProp === 'object') {
-      const tokenRootData = tokenRoot && tokenRoot.split('.').reduce(function(o, x) { return o[x]; }, responseTokenProp);
-      return tokenRootData ? tokenRootData[tokenName] : responseTokenProp[tokenName];
+      const tokenRootData = tokenRoot && tokenRoot.split('.').reduce((o, x) => o[x], responseTokenProp);
+      const token = tokenRootData ? tokenRootData[tokenName] : responseTokenProp[tokenName];
+
+      if (!token) throw new Error('Token not found in response');
+
+      return token;
     }
 
     const token = response[tokenName] === undefined ? null : response[tokenName];

diff --git a/test/authentication.spec.js b/test/authentication.spec.js
@@ -306,6 +306,15 @@ describe('Authentication', () => {
       )).toBe('some');
     });
 
+    it('Should throw if token not found in nested', () => {
+      const fail = () => authentication.getTokenFromResponse(
+        {tokenProp: {wrongTokenName: 'some'}},
+        'tokenProp',
+        'tokenName'
+      );
+      expect(fail).toThrow();
+    });
+
     it('Should return token if response has a string in tokenName in tokenRoot of tokenProp', () => {
       expect(authentication.getTokenFromResponse(
         {tokenProp: {tokenRoot1: {tokenRoot2: {tokenName: 'some'}}}},