Merge pull request #47 from mojaloop/feature/MBXSDK-9

Add OAuth2.0 periodic token refresh functionality
mojaloop · Sep 12, 2019 · 799061e · 799061e
2 parents bf461e6 + d908361
commit 799061e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 7 deletions.
diff --git a/src/config.js b/src/config.js
@@ -50,7 +50,10 @@ let DEFAULTS = {
         host: 'localhost',
         port: 6379
     },
-    enableTestFeatures: false
+    enableTestFeatures: false,
+    wso2Auth: {
+        refreshSeconds: 3600,
+    }
 };
 
 let config = {};
@@ -149,7 +152,11 @@ const setConfig = async cfg => {
 
     config.enableTestFeatures = cfg.ENABLE_TEST_FEATURES.toLowerCase() === 'true' ? true : false;
 
-    config.wso2BearerToken = cfg.WS02_BEARER_TOKEN;
+    config.wso2Auth.staticToken = cfg.WS02_BEARER_TOKEN;
+    config.wso2Auth.tokenEndpoint = cfg.OAUTH_TOKEN_ENDPOINT;
+    config.wso2Auth.clientKey = cfg.OAUTH_CLIENT_KEY;
+    config.wso2Auth.clientSecret = cfg.OAUTH_CLIENT_SECRET;
+    config.wso2Auth.refreshSeconds = cfg.OAUTH_REFRESH_SECONDS;
 };
 
 const getConfig = () => {

diff --git a/src/lib/model/inboundModel.js b/src/lib/model/inboundModel.js
@@ -39,7 +39,7 @@ class InboundTransfersModel {
             tls: config.tls,
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
-            wso2BearerToken: config.wso2BearerToken
+            wso2Auth: config.wso2Auth
         });
 
         this.backendRequests = new BackendRequests({

diff --git a/src/lib/model/outboundModel.js b/src/lib/model/outboundModel.js
@@ -45,7 +45,7 @@ class OutboundTransfersModel {
             tls: config.tls,
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
-            wso2BearerToken: config.wso2BearerToken
+            wso2Auth: config.wso2Auth
         });
 
         this.ilp = new Ilp({

diff --git a/src/local.env b/src/local.env
@@ -62,3 +62,9 @@ ENABLE_TEST_FEATURES=false
 
 # WS02 Bearer Token specific to golden-fsp instance and environment
 WS02_BEARER_TOKEN=7718fa9b-be13-3fe7-87f0-a12cf1628168
+
+# OAuth2 data used to obtain WSO2 bearer token
+OAUTH_TOKEN_ENDPOINT=
+OAUTH_CLIENT_KEY
+OAUTH_CLIENT_SECRET
+OAUTH_REFRESH_SECONDS=3600
diff --git a/src/package.json b/src/package.json
@@ -23,7 +23,7 @@
     "@internal/randomphrase": "file:lib/randomphrase",
     "@internal/router": "file:lib/router",
     "@internal/validate": "file:lib/validate",
-    "@mojaloop/sdk-standard-components": "^7.4.0",
+    "@mojaloop/sdk-standard-components": "^7.5.1",
     "co-body": "^6.0.0",
     "dotenv": "^6.2.0",
     "koa": "^2.6.2",

diff --git a/src/test/unit/config.test.js b/src/test/unit/config.test.js
@@ -46,7 +46,10 @@ describe('config', () => {
                 host: 'localhost',
                 port: 6379
             },
-            enableTestFeatures: false
+            enableTestFeatures: false,
+            wso2Auth: {
+                refreshSeconds: 3600,
+            },
         };
     });
 
@@ -132,7 +135,7 @@ describe('config', () => {
                     expect(retrievedConfig.cacheConfig.host).toBe(process.env.CACHE_HOST);
                     expect(retrievedConfig.cacheConfig.port).toBe(process.env.CACHE_PORT);
                     expect(retrievedConfig.enableTestFeatures).toBe(process.env.ENABLE_TEST_FEATURES === 'true');
-                    expect(retrievedConfig.wso2BearerToken).toBe(process.env.WS02_BEARER_TOKEN);
+                    expect(retrievedConfig.wso2Auth.staticToken).toBe(process.env.WS02_BEARER_TOKEN);
                     expect(retrievedConfig.jwsVerificationKeysDirectory).toBe(process.env.JWS_VERIFICATION_KEYS_DIRECTORY);
                     expect(Buffer.isBuffer(retrievedConfig.jwsSigningKey)).toBe(true);
                     expect(typeof(retrievedConfig.jwsVerificationKeys)).toBe('object');