allow overriding default config

Author: lionelB

src/providers/oauth-provider.js

@@ -26,7 +26,7 @@ var requiredKeys = [
  */
 
 function OAuthProvider() {
-  var config;
+  var defaultConfig;
 
   /**
    * Configure.
@@ -36,7 +36,7 @@ function OAuthProvider() {
 
   this.configure = function(params) {
     // Can only be configured once.
-    if (config) {
+    if (defaultConfig) {
       throw new Error('Already configured.');
     }
 
@@ -46,31 +46,30 @@ function OAuthProvider() {
     }
 
     // Extend default configuration.
-    config = angular.extend({}, defaults, params);
+    defaultConfig = angular.extend({}, defaults, params);
 
     // Check if all required keys are set.
     angular.forEach(requiredKeys, (key) => {
-      if (!config[key]) {
+      if (!defaultConfig[key]) {
         throw new Error(`Missing parameter: ${key}.`);
       }
     });
 
     // Remove `baseUrl` trailing slash.
-    if('/' === config.baseUrl.substr(-1)) {
-      config.baseUrl = config.baseUrl.slice(0, -1);
+    if('/' === defaultConfig.baseUrl.substr(-1)) {
+      defaultConfig.baseUrl = defaultConfig.baseUrl.slice(0, -1);
     }
 
     // Add `grantPath` facing slash.
-    if('/' !== config.grantPath[0]) {
-      config.grantPath = `/${config.grantPath}`;
+    if('/' !== defaultConfig.grantPath[0]) {
+      defaultConfig.grantPath = `/${defaultConfig.grantPath}`;
     }
 
     // Add `revokePath` facing slash.
-    if('/' !== config.revokePath[0]) {
-      config.revokePath = `/${config.revokePath}`;
+    if('/' !== defaultConfig.revokePath[0]) {
+      defaultConfig.revokePath = `/${defaultConfig.revokePath}`;
     }
-
-    return config;
+    return defaultConfig;
   };
 
   /**
@@ -85,7 +84,7 @@ function OAuthProvider() {
        */
 
       constructor() {
-        if (!config) {
+        if (!defaultConfig) {
           throw new Error('`OAuthProvider` must be configured first.');
         }
       }
@@ -110,7 +109,10 @@ function OAuthProvider() {
        * @return {promise} A response promise.
        */
 
-      getAccessToken(data, options) {
+      getAccessToken(data, options, config) {
+        //Override default Oauth config
+        config = angular.extend({}, defaultConfig, config);
+
         data = angular.extend({
           client_id: config.clientId,
           grant_type: 'password'
@@ -145,7 +147,10 @@ function OAuthProvider() {
        * @return {promise} A response promise.
        */
 
-      getRefreshToken(data, options) {
+      getRefreshToken(data, options, config) {
+        //Override default Oauth config
+        config = angular.extend({}, defaultConfig, config);
+
         data = angular.extend({
           client_id: config.clientId,
           grant_type: 'refresh_token',
@@ -181,7 +186,10 @@ function OAuthProvider() {
        * @return {promise} A response promise.
        */
 
-      revokeToken(data, options) {
+      revokeToken(data, options, config) {
+        //Override default Oauth config
+        config = angular.extend(defaultConfig, config);
+
         var refreshToken = OAuthToken.getRefreshToken();
 
         data = angular.extend({

test/unit/providers/oauth-provider.spec.js

@@ -216,6 +216,26 @@ describe('OAuthProvider', function() {
         $httpBackend.verifyNoOutstandingExpectation();
         $httpBackend.verifyNoOutstandingRequest();
       }));
+
+      it('should allow to override oauth server config', inject(function($httpBackend, OAuth, OAuthToken) {
+        var config = {
+          baseUrl: 'https://new.website.com',
+          grantPath: '/oauth2/token',
+        };
+
+        $httpBackend.expectPOST(config.baseUrl + config.grantPath, data)
+          .respond({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
+
+        OAuth.getAccessToken({
+          username: 'foo',
+          password: 'bar'
+        }, {}, config);
+
+        $httpBackend.flush();
+
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+      }));
     });
 
     describe('refreshToken()', function() {
@@ -293,15 +313,32 @@ describe('OAuthProvider', function() {
             expires_in: 3600,
             refresh_token: 'biz'
           });
-        }).catch(function() {
-          should.fail();
         });
 
         $httpBackend.flush();
 
         $httpBackend.verifyNoOutstandingExpectation();
         $httpBackend.verifyNoOutstandingRequest();
       }));
+
+      it('should allow to override oauth server config', inject(function($httpBackend, OAuth, OAuthToken) {
+        var config = {
+          baseUrl: 'https://new.website.com',
+          grantPath: '/oauth2/token/new',
+        };
+
+        OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
+
+        $httpBackend.expectPOST(config.baseUrl + config.grantPath, queryString.stringify(data))
+          .respond({ token_type: 'bearer', access_token: 'qux', expires_in: 3600, refresh_token: 'biz' });
+
+        OAuth.getRefreshToken(data, {}, config);
+
+        $httpBackend.flush();
+
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+      }));
     });
 
     describe('revokeToken()', function () {
@@ -388,6 +425,32 @@ describe('OAuthProvider', function() {
         $httpBackend.verifyNoOutstandingExpectation();
         $httpBackend.verifyNoOutstandingRequest();
       }));
+
+      it('should allow to override oauth server config', inject(function($httpBackend, OAuth, OAuthToken) {
+        var data = queryString.stringify({
+          client_id: defaults.clientId,
+          token: 'bar',
+          token_type_hint: 'refresh_token',
+          client_secret: defaults.clientSecret
+        });
+
+        var config = {
+          baseUrl: 'https://new.website.com',
+          revokePath: '/oauth2/revoke/new',
+        };
+
+        OAuthToken.setToken({ token_type: 'bearer', access_token: 'foo', expires_in: 3600, refresh_token: 'bar' });
+
+        $httpBackend.expectPOST(config.baseUrl + config.revokePath, data)
+          .respond(200);
+
+        OAuth.revokeToken(data, {}, config);
+
+        $httpBackend.flush();
+
+        $httpBackend.verifyNoOutstandingExpectation();
+        $httpBackend.verifyNoOutstandingRequest();
+      }));
     });
   });
 });