Merge pull request #3 from codebender/updates_for_live_api

Updates for live OAuth 2.0 API

Author: codebender

README.md

@@ -1,19 +1,10 @@
 # OmniAuth OAuth2 strategy for Fitbit
-This gem is an OAuth2 OmniAuth Strategy for the [Fitbit API](https://wiki.fitbit.com/display/API/OAuth+2.0).
+This gem is an OAuth2 OmniAuth Strategy for the [Fitbit API](https://dev.fitbit.com/docs/oauth2/).
 
 ## Gem Status
 [![Gem Version](https://badge.fury.io/rb/omniauth-fitbit-oauth2.svg)](http://badge.fury.io/rb/omniauth-fitbit-oauth2)
 [![Build Status](https://semaphoreci.com/api/v1/projects/2fae3e5c-5bb1-4cf6-8d58-de1656ff3751/425290/shields_badge.svg)](https://semaphoreci.com/codebender/omniauth-fitbit-oauth2)
 
-## Fitbit Beta Notice
-:warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning:
-
-*This feature is in a beta state.
-During this period, Fitbit may need to make backwards incompatible changes with less than 30 days notice. Fitbit does NOT recommend using OAuth 2.0 in a production environment yet.
-With your help testing, we hope to resolve any issues over the next few months. When we believe it is production ready, we will update this post.*
-
-:warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning: :warning:
-
 ## Installing
 
 Add to your `Gemfile`:

exmaple/Gemfile renamed to example/Gemfile

@@ -22,7 +22,8 @@ use Rack::Session::Cookie
 
 use OmniAuth::Builder do
   provider :fitbit_oauth2, ENV['FITBIT_CLIENT_ID'], ENV['FITBIT_CLIENT_SECRET'],
-    :scope => 'activity sleep'
+    :scope => 'profile activity sleep', :expires_in => '2592000',
+    :prompt => 'login'
 end
 
 run App.new

exmaple/config.ru renamed to example/config.ru

@@ -13,7 +13,7 @@ class FitbitOauth2 < OmniAuth::Strategies::OAuth2
           :token_url      => 'https://api.fitbit.com/oauth2/token'
         }
 
-      option :authorize_options, [:scope, :response_type]
+      option :authorize_options, [:scope, :response_type, :expires_in, :prompt]
       option :response_type, 'code'
 
       def build_access_token
@@ -28,7 +28,9 @@ def basic_auth_header
       end
 
       def query_string
-        '' # The state and code params shouldn't be sent as part of the callback_url in the callback phase
+        # The state and code params shouldn't be sent as part of the
+        # callback_url in the callback phase
+        ''
       end
 
       uid do
@@ -61,12 +63,12 @@ def query_string
 
       def raw_info
         if options[:use_english_measure] == 'true'
-          @raw_info ||= MultiJson.load(access_token.
+          @raw_info ||= access_token.
             request('get', 'https://api.fitbit.com/1/user/-/profile.json',
-              { 'Accept-Language' => 'en_US' }).body)
+              { 'Accept-Language' => 'en_US' }).parsed
         else
-          @raw_info ||= MultiJson.load(access_token.
-            get('https://api.fitbit.com/1/user/-/profile.json').body)
+          @raw_info ||= access_token.
+            get('https://api.fitbit.com/1/user/-/profile.json').parsed
         end
       end
     end

lib/omniauth/strategies/fitbit_oauth2.rb

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.version       = OmniAuth::FitbitOauth2::VERSION
   gem.license       = 'MIT'
   gem.summary       = %q{OmniAuth Oauth2 strategy for fitbit.com.}
-  gem.description   = %q{OmniAuth Oauth2 strategy for fitbit.com - https://wiki.fitbit.com/display/API/OAuth+2.0}
+  gem.description   = %q{OmniAuth Oauth2 strategy for fitbit.com - https://dev.fitbit.com/docs/oauth2/}
   gem.author        = 'Matthew Bender'
   gem.email         = '[email protected]'
   gem.homepage      = 'https://github.com/codebender/omniauth-fitbit-oauth2'
@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.3'
 
-  gem.add_development_dependency 'rspec', '~> 3.2'
+  gem.add_development_dependency 'rspec', '~> 3.3'
 end