omniauth-fitbit 1.0.5 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bb284ea02707a038bb8bd523ff6da1cb3356a6f1
+  data.tar.gz: 481ccbf103390f616d3d089a471f827189ec3d92
+SHA512:
+  metadata.gz: 7b369fd4ac9e5efafe5de271b83c5115cbaa81b10d00c7bf2107ed1fb5cdf11162b11beb90b0dab46de96cd5cd2341a536bb0e1d74b7511a11b578699b89f00a
+  data.tar.gz: f756527a776b7865a5bc6809318dab76a95f092e97f4861e399488f09c948c9e2d852c1dd5428d537e6223093c07d073b9466ee7496ef20d4a0810267588ffb8

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem 'omniauth-oauth', '~> 1.0'
+gem 'omniauth-oauth2', '~> 1.4'
 
 group :development, :test do
   gem 'rspec'

data/LICENSE.md

@@ -1,4 +1,4 @@
-Copyright (c) 2012 TK Gospodinov
+Copyright (c) 2016 TK Gospodinov
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/example/example.rb

@@ -3,7 +3,7 @@ require 'omniauth-fitbit'
 
 use Rack::Session::Cookie
 use OmniAuth::Builder do
-  provider :fitbit, '<consumer_key>', '<consumer_secret>'
+  provider :fitbit, '', '', { :scope => 'profile', :redirect_uri => 'http://localhost:4567/auth/fitbit/callback' }
 end
 
 get '/' do

data/lib/omniauth-fitbit/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Fitbit
-    VERSION = "1.0.5"
+    VERSION = "2.0.0"
   end
 end

data/lib/omniauth/strategies/fitbit.rb

@@ -1,22 +1,37 @@
-require 'omniauth'
-require 'omniauth/strategies/oauth'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class Fitbit < OmniAuth::Strategies::OAuth
+    class Fitbit < OmniAuth::Strategies::OAuth2
 
       option :name, "fitbit"
 
       option :client_options, {
-          :site               => 'https://api.fitbit.com',
-          :authorize_url      => 'https://www.fitbit.com/oauth/authorize',
-          :request_token_path => '/oauth/request_token',
-          :access_token_path  => '/oauth/access_token',
-          :authorize_path     => '/oauth/authorize'
+          :site          => 'https://api.fitbit.com',
+          :authorize_url => 'https://www.fitbit.com/oauth2/authorize',
+          :token_url     => 'https://api.fitbit.com/oauth2/token'
       }
 
+      option :response_type, 'code'
+      option :authorize_options, %i(scope response_type redirect_uri)
+
+      def build_access_token
+        options.token_params.merge!(:headers => {'Authorization' => basic_auth_header })
+        super
+      end
+
+      def basic_auth_header
+        "Basic " + Base64.strict_encode64("#{options[:client_id]}:#{options[:client_secret]}")
+      end
+
+      def query_string
+        # Using state and code params in the callback_url causes a mismatch with
+        # the value set in the fitbit application configuration, so we're skipping them
+        ''
+      end
+
       uid do
-        access_token.params['encoded_user_id']
+        access_token.params['user_id']
       end
 
       info do

data/omniauth-fitbit.gemspec

@@ -8,14 +8,14 @@ Gem::Specification.new do |s|
   s.authors     = ["TK Gospodinov"]
   s.email       = ["tk@gospodinov.net"]
   s.homepage    = "http://github.com/tkgospodinov/omniauth-fitbit"
-  s.summary     = %q{OmniAuth strategy for Fitbit}
-  s.description = %q{OmniAuth strategy for Fitbit}
+  s.summary     = %q{OmniAuth OAuth2 strategy for Fitbit}
+  s.description = %q{OmniAuth OAuth2 strategy for Fitbit}
 
   s.files         = `git ls-files`.split($\)
   s.executables   = s.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
+  s.add_runtime_dependency 'omniauth-oauth2', '~> 1.4'
   s.add_runtime_dependency 'multi_xml'
 end

data/spec/omniauth/strategies/fitbit_spec.rb

@@ -5,40 +5,66 @@ describe "OmniAuth::Strategies::Fitbit" do
     OmniAuth::Strategies::Fitbit.new(nil, @options || {})
   end
 
+  describe 'response_type' do
+    it 'includes :code' do
+      expect(subject.options["response_type"]).to include('code')
+    end
+  end
+
+  describe 'authorize_options' do
+    it 'includes :scope' do
+      expect(subject.options["authorize_options"]).to include(:scope)
+    end
+
+    it 'includes :response_type' do
+      expect(subject.options["authorize_options"]).to include(:response_type)
+    end
+
+    it 'includes :redirect_uri' do
+      expect(subject.options["authorize_options"]).to include(:redirect_uri)
+    end
+  end
+
   context 'client options' do
     it 'has correct OAuth endpoint' do
-      subject.options.client_options.site.should eq('https://api.fitbit.com')
+      expect(subject.options.client_options.site).to eq('https://api.fitbit.com')
     end
 
-    it 'has correct request token url' do
-      subject.options.client_options.request_token_path.should eq('/oauth/request_token')
+    it 'has correct authorize url' do
+      expect(subject.options.client_options.authorize_url).to eq('https://www.fitbit.com/oauth2/authorize')
     end
 
-    it 'has correct access token url' do
-      subject.options.client_options.access_token_path.should eq('/oauth/access_token')
+    it 'has correct token url' do
+      expect(subject.options.client_options.token_url).to eq('https://api.fitbit.com/oauth2/token')
     end
+  end
 
-    it 'has correct authorize url' do
-      subject.options.client_options.authorize_url.should eq('https://www.fitbit.com/oauth/authorize')
+  context 'auth header' do
+    before :each do
+      subject.options.client_id = 'testclientid'
+      subject.options.client_secret = 'testclientsecret'
     end
 
+    it 'returns the correct authorization header value' do
+      expect(subject.basic_auth_header).to eq('Basic ' + Base64.strict_encode64("testclientid:testclientsecret"))
+    end
   end
 
   context 'uid' do
     before :each do
       access_token = double('access_token')
-      access_token.stub('params') { { 'encoded_user_id' => '123ABC' } }
-      subject.stub(:access_token) { access_token }
+      allow(access_token).to receive('params') { { 'user_id' => '123ABC' } }
+      allow(subject).to receive(:access_token) { access_token }
     end
 
     it 'returns the correct id from raw_info' do
-      subject.uid.should eq('123ABC')
+      expect(subject.uid).to eq('123ABC')
     end
   end
 
   context 'info' do
     before :each do
-      subject.stub(:raw_info) {
+      allow(subject).to receive(:raw_info) {
         {
           "user" =>
           {
@@ -60,45 +86,45 @@ describe "OmniAuth::Strategies::Fitbit" do
     end
 
     it 'returns the correct name from raw_info' do
-      subject.info[:name].should eq("JD")
+      expect(subject.info[:name]).to eq("JD")
     end
 
     it 'returns the correct full name from raw_info' do
-      subject.info[:full_name].should eq("John Doe")
+      expect(subject.info[:full_name]).to eq("John Doe")
     end
 
     it 'returns the correct display name from raw_info' do
-      subject.info[:display_name].should eq("JD")
+      expect(subject.info[:display_name]).to eq("JD")
     end
 
     it 'returns the correct nickname from raw_info' do
-      subject.info[:nickname].should eq("Johnnie")
+      expect(subject.info[:nickname]).to eq("Johnnie")
     end
 
     it 'returns the correct gender from raw_info' do
-      subject.info[:gender].should eq("MALE")
+      expect(subject.info[:gender]).to eq("MALE")
     end
 
     it 'returns the correct gender from raw_info' do
-      subject.info[:about_me].should eq("I live in Kansas City, MO")
+      expect(subject.info[:about_me]).to eq("I live in Kansas City, MO")
     end
 
     it 'returns the correct gender from raw_info' do
-      subject.info[:city].should eq("Kansas City")
+      expect(subject.info[:city]).to eq("Kansas City")
     end
 
     it 'returns the correct gender from raw_info' do
-      subject.info[:state].should eq("MO")
+      expect(subject.info[:state]).to eq("MO")
     end
 
     it 'returns the correct gender from raw_info' do
-      subject.info[:country].should eq("US")
+      expect(subject.info[:country]).to eq("US")
     end
   end
 
   context 'dateOfBirth is empty' do
     before :each do
-      subject.stub(:raw_info) {
+      allow(subject).to receive(:raw_info) {
         {
           "user" =>
           {
@@ -109,7 +135,7 @@ describe "OmniAuth::Strategies::Fitbit" do
       }
     end
     it 'when return nil' do
-      subject.info[:dob].should be_nil
+      expect(subject.info[:dob]).to be_nil
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'rspec'
 require 'rack/test'
 require 'webmock/rspec'
-require 'omniauth'
+require 'omniauth-oauth2'
 require 'omniauth-fitbit'
 
 RSpec.configure do |config|

metadata

@@ -1,56 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-fitbit
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - TK Gospodinov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: omniauth-oauth
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: OmniAuth strategy for Fitbit
+description: OmniAuth OAuth2 strategy for Fitbit
 email:
 - tk@gospodinov.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -65,28 +60,27 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/tkgospodinov/omniauth-fitbit
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: OmniAuth strategy for Fitbit
+specification_version: 4
+summary: OmniAuth OAuth2 strategy for Fitbit
 test_files:
 - spec/omniauth/strategies/fitbit_spec.rb
 - spec/spec_helper.rb