Support http methods

.gitignore

@@ -14,4 +14,5 @@ sample/node_modules
 sample/.env
 oauth-jsclient.iml
 package-lock.json
+yarn.lock
 src/logs/*

README.md

@@ -271,15 +271,21 @@ var oauthClient = new OAuthClient({
     token: authToken
 });
 
+The authToken parameters are as follows:
+```
+{
+    token_type: '<String>',
+    access_token: '<String>',
+    expires_in: '<Int> Seconds',
+    refresh_token: '<String>',
+    x_refresh_token_expires_in: '<Int>  Seconds',
+    id_token: "(Optional Default = '') <String>",
+    createdAt: '(Optional Default = Date.now()) <Milliseconds> from the unix epoch'
+}
 ```
-**Note** :   
-
-The OAuth Client library converts the accessToken and refreshToken expiry time to `TimeStamp` for better maintainability as shown below :   
 
-    this.expires_in = Date.now() + (tokenData.expires_in * 1000);
-    this.x_refresh_token_expires_in = Date.now() + (tokenData.x_refresh_token_expires_in * 1000);
-
-so if you're providing the token that was returned from `createToken` or `refresh` then be sure you set the token as shown above or refer below :
+**Note** :   
+The OAuth Client library converts the accessToken and refreshToken expiry time to `TimeStamp`. If you are setting a stored token, please pass in the `createdAt` for accurate experiations. 
 
 ```javascript
 oauthClient.setToken(authToken);

src/OAuthClient.js

@@ -695,7 +695,7 @@ OAuthClient.prototype.createError = function(e, authResponse) {
  * @private
  */
 OAuthClient.prototype.isAccessTokenValid = function() {
-    return (this.token.expires_in > Date.now());
+    return this.token.isAccessTokenValid();
 };
 
 /**
@@ -734,4 +734,4 @@ OAuthClient.prototype.log = function(level,message,messageData) {
     }
 };
 
-module.exports = OAuthClient;
+module.exports = OAuthClient;

src/access-token/Token.js

@@ -40,6 +40,7 @@ function Token(params) {
     this.x_refresh_token_expires_in = params.x_refresh_token_expires_in || 0;
     this.id_token = params.id_token || '';
     this.latency = params.latency || 60 * 1000;
+    this.createdAt = params.createdAt || Date.now();
 }
 
 /**
@@ -95,20 +96,26 @@ Token.prototype.setToken = function(tokenData) {
     this.access_token = tokenData.access_token;
     this.refresh_token = tokenData.refresh_token;
     this.token_type = tokenData.token_type ;
-    this.expires_in = Date.now() + (tokenData.expires_in * 1000);
-    this.x_refresh_token_expires_in = Date.now() + (tokenData.x_refresh_token_expires_in * 1000);
+    this.expires_in = tokenData.expires_in;
+    this.x_refresh_token_expires_in = tokenData.x_refresh_token_expires_in;
     this.id_token = tokenData.id_token || '';
+    this.createdAt = tokenData.createdAt || Date.now();
     return this;
 
 };
 
+Token.prototype._checkExpiry = function(seconds) {
+    var expiry = this.createdAt + (seconds * 1000);
+    return (expiry  - this.latency > Date.now());
+}
+
 /**
  * Check if access_token is valid
  * @returns {boolean}
  */
 Token.prototype.isAccessTokenValid = function() {
 
-    return (this.expires_in  - this.latency > Date.now());
+    return this._checkExpiry(this.expires_in);
 
 };
 
@@ -119,9 +126,9 @@ Token.prototype.isAccessTokenValid = function() {
  */
 Token.prototype.isRefreshTokenValid = function() {
 
-    return (this.x_refresh_token_expires_in - this.latency > Date.now());
+    return this._checkExpiry(this.x_refresh_token_expires_in);
 
 };
 
 
-module.exports = Token;
+module.exports = Token;

test/OAuthClientTest.js

@@ -418,4 +418,4 @@ describe('Tests for OAuthClient', function()  {
 
 
 
-});
+});

test/TokenTest.js

@@ -29,6 +29,37 @@ describe('Tests for Token', function() {
         expect(token).to.have.property('id_token');
     });
 
+    it('Set Token using Constructor', function() {
+        var oauthClient = new OAuthClientTest({
+            clientId: 'clientID',
+            clientSecret: 'clientSecret',
+            environment: 'sandbox',
+            redirectUri: 'http://localhost:8000/callback',
+            token: expectedAccessToken
+        });
+        var token = oauthClient.getToken();
+
+        expect(token.access_token).to.equal(expectedAccessToken.access_token);
+        expect(token.refresh_token).to.equal(expectedAccessToken.refresh_token);
+        expect(token.token_type).to.equal(expectedAccessToken.token_type);
+        expect(token.expires_in).to.equal(expectedAccessToken.expires_in);
+        expect(token.x_refresh_token_expires_in).to.equal(expectedAccessToken.x_refresh_token_expires_in);
+
+    })
+
+    it('Set Token using Helper Method', function() {
+
+        oauthClient.token.setToken(expectedAccessToken);
+        var token = oauthClient.getToken();
+
+        expect(token.access_token).to.equal(expectedAccessToken.access_token);
+        expect(token.refresh_token).to.equal(expectedAccessToken.refresh_token);
+        expect(token.token_type).to.equal(expectedAccessToken.token_type);
+        expect(token.expires_in).to.equal(expectedAccessToken.expires_in);
+        expect(token.x_refresh_token_expires_in).to.equal(expectedAccessToken.x_refresh_token_expires_in);
+
+    });
+
     it('Get Access Token using Helper Method', function() {
 
         oauthClient.token.setToken(expectedAccessToken);