Catch errors while building authorization url (#43)

Resolves: OKTA-99859
okta · Sep 26, 2016 · 1dc62f8 · 1dc62f8
1 parent a4147b3
commit 1dc62f8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/lib/token.js b/lib/token.js
@@ -477,7 +477,12 @@ function getToken(sdk, oauthOptions, options) {
   }
 
   // Use the query params to build the authorize url
-  var requestUrl = buildAuthorizeUrl(sdk, oauthParams);
+  var requestUrl;
+  try {
+    requestUrl = buildAuthorizeUrl(sdk, oauthParams);
+  } catch (e) {
+    return Q.reject(e);
+  }
 
   // Determine the flow type
   var flowType;

diff --git a/test/spec/oauth.js b/test/spec/oauth.js
@@ -232,7 +232,7 @@ define(function(require) {
       });
 
       describe('errors', function() {
-        oauthUtil.itErrorsCorrectly('throws an error when openid scope isn\'t specified',
+        oauthUtil.itpErrorsCorrectly('throws an error when openid scope isn\'t specified',
           {
             authorizeArgs: {
               clientId: 'NPSfOkH5eZrTy8PMDlvx',
@@ -251,7 +251,7 @@ define(function(require) {
             errorCauses: []
           }
         );
-        oauthUtil.itErrorsCorrectly('throws an error when clientId isn\'t specified',
+        oauthUtil.itpErrorsCorrectly('throws an error when clientId isn\'t specified',
           {
             authorizeArgs: {
               redirectUri: 'https://auth-js-test.okta.com/redirect',

diff --git a/test/spec/token.js b/test/spec/token.js
@@ -293,7 +293,7 @@ define(function(require) {
       });
     });
 
-    oauthUtil.itErrorsCorrectly('throws an error if multiple responseTypes are sent as a string',
+    oauthUtil.itpErrorsCorrectly('throws an error if multiple responseTypes are sent as a string',
       {
         oktaAuthArgs: {
           url: 'https://auth-js-test.okta.com',

diff --git a/test/util/oauthUtil.js b/test/util/oauthUtil.js
@@ -289,19 +289,6 @@ define(function(require) {
       });
   };
 
-  oauthUtil.itErrorsCorrectly = function(title, options, error) {
-    it(title, function () {
-      var thrown = false;
-      try {
-        oauthUtil.setupFrame(options);
-      } catch (e) {
-        util.expectErrorToEqual(e, error);
-        thrown = true;
-      }
-      expect(thrown).toEqual(true);
-    });
-  };
-
   oauthUtil.itpErrorsCorrectly = function(title, options, error) {
     it(title, function (done) {
       options.willFail = true;