update Fitbit oauth2 url. closes #2

Author: guumaster

src/auth.js

@@ -8,7 +8,7 @@ module.exports = function(proto) {
       return tokenObj;
     }
 
-    return this.oauth2.accessToken.create(tokenObj);
+    return this.oauth2_token.accessToken.create(tokenObj);
   };
 
   proto.getAuthorizationUrl = function(redirect_uri, scope, state) {
@@ -27,7 +27,7 @@ module.exports = function(proto) {
 
   proto.getToken = function(code, redirect_uri) {
 
-    var authCode = this.oauth2.authCode;
+    var authCode = this.oauth2_token.authCode;
     var _this = this;
     return new Promise(function(resolve, reject) {
 

src/client.js

@@ -26,6 +26,15 @@ var FitbitClient = function(clientId, consumerSecret, options) {
     useBasicAuthorizationHeader: true
   });
 
+  this.oauth2_token = oauth2({
+    clientID: clientId,
+    clientSecret: consumerSecret,
+    site: config.FITBIT_BASE_API_URL_TOKEN,
+    authorizationPath: config.FITBIT_AUTH_PATH,
+    tokenPath: config.FITBIT_TOKEN_PATH,
+    useBasicAuthorizationHeader: true
+  });
+
   this.redirect_uri = options.redirect_uri;
   this.scope = options.scope || config.FITBIT_DEFAULT_SCOPE;
 

src/config.js

@@ -1,4 +1,5 @@
-const FITBIT_BASE_API_URL = 'https://api.fitbit.com';
+const FITBIT_BASE_API_URL = 'https://fitbit.com';
+const FITBIT_BASE_API_URL_TOKEN = 'https://api.fitbit.com';
 const FITBIT_AUTH_PATH = '/oauth2/authorize';
 const FITBIT_TOKEN_PATH = '/oauth2/token';
 const FITBIT_DEFAULT_SCOPE = [ 'activity', 'nutrition', 'profile', 'settings', 'sleep', 'social', 'weight' ];
@@ -7,5 +8,6 @@ module.exports = {
   FITBIT_BASE_API_URL: FITBIT_BASE_API_URL,
   FITBIT_AUTH_PATH: FITBIT_AUTH_PATH,
   FITBIT_TOKEN_PATH: FITBIT_TOKEN_PATH,
-  FITBIT_DEFAULT_SCOPE: FITBIT_DEFAULT_SCOPE
+  FITBIT_DEFAULT_SCOPE: FITBIT_DEFAULT_SCOPE,
+  FITBIT_BASE_API_URL_TOKEN: FITBIT_BASE_API_URL_TOKEN
 };

test/auth.js

@@ -15,15 +15,15 @@ describe('FitbitClient Authorization flow', function() {
 
   it('it has a default authorization url', function() {
     var authorization_uri = client.getAuthorizationUrl();
-    var final_url = 'https://api.fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fredirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&response_type=code&client_id=clientId_1234';
+    var final_url = 'https://fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fredirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&response_type=code&client_id=clientId_1234';
 
     expect(authorization_uri).to.eql(final_url);
   });
 
   it('accept a different redirect_uri for authorization', function() {
     var redirect_uri = 'http://different_redirect_uri';
     var authorization_uri = client.getAuthorizationUrl(redirect_uri);
-    var final_url = 'https://api.fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fdifferent_redirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&response_type=code&client_id=clientId_1234';
+    var final_url = 'https://fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fdifferent_redirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&response_type=code&client_id=clientId_1234';
 
     expect(authorization_uri).to.eql(final_url);
   });
@@ -33,7 +33,7 @@ describe('FitbitClient Authorization flow', function() {
     var scope = config.FITBIT_DEFAULT_SCOPE;
     scope.push('heartrate');
     var authorization_uri = client.getAuthorizationUrl(redirect_uri, scope);
-    var final_url = 'https://api.fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fdifferent_redirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&scope=heartrate&response_type=code&client_id=clientId_1234';
+    var final_url = 'https://fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fdifferent_redirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&scope=heartrate&response_type=code&client_id=clientId_1234';
 
     expect(authorization_uri).to.eql(final_url);
   });
@@ -44,7 +44,7 @@ describe('FitbitClient Authorization flow', function() {
     scope.push('heartrate');
     var state = 'KEEP_THIS_STATE';
     var authorization_uri = client.getAuthorizationUrl(redirect_uri, scope, state);
-    var final_url = 'https://api.fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fdifferent_redirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&scope=heartrate&scope=heartrate&state=KEEP_THIS_STATE&response_type=code&client_id=clientId_1234';
+    var final_url = 'https://fitbit.com/oauth2/authorize?redirect_uri=http%3A%2F%2Fdifferent_redirect_uri&scope=activity&scope=nutrition&scope=profile&scope=settings&scope=sleep&scope=social&scope=weight&scope=heartrate&scope=heartrate&state=KEEP_THIS_STATE&response_type=code&client_id=clientId_1234';
 
     expect(authorization_uri).to.eql(final_url);
   });