fitbit_client 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d472e8616f43677a3a28ac7137c7d60a8280721
-  data.tar.gz: 382b88f98061745a339f780cf99d4deb7b33bd41
+  metadata.gz: 268141f31ad3bf289dec2404577a09de5606e1ae
+  data.tar.gz: 35f15997f295c7394537131aa99e30f378193b46
 SHA512:
-  metadata.gz: 726befa5d90d4248eaedd89ca4136cc8b3a6a598d1471b04b36ae653546ddfbc44ef5a6b1beac7f8a5fd6393c17fc4a4ec3f55412a8a591a2692c7f0ad7796e0
-  data.tar.gz: 7df1adce571fbef32179594713fa3f2f5ad4819a43b82caf0519dac9a81540c1bc5c482cc4d10da74e298fa34483f94d576b71aeb4f6ce7c0bea6afb9aa253af
+  metadata.gz: af6103913ffde626389c6106072583da0ff4e0c8a1134e1d09620d6075367cfa1d7415881d17b51ebf52a6e9e0049784b7eba99eb90f929db77b569a99b6aa90
+  data.tar.gz: 1abc601fc74062c263a419ab9adf43ee18f872a96601fe9233bb04e9473ecc24c5c9badf650a1a71ca00149c4d1900c463f4cb09372ee96fdac0beddd840349c

data/.rubocop.yml

@@ -1,6 +1,8 @@
 inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.3
+  Exclude:
+    - 'test/**/*'
 
 Documentation:
   Enabled: false

data/README.md

@@ -1,6 +1,6 @@
 # FitbitClient
 
-[![Build Status](https://travis-ci.org/sounxrt/fitbit_client.svg?branch=master)](https://travis-ci.org/sounxrt/fitbit_client) [![Code Climate](https://codeclimate.com/github/sounxrt/fitbit_client/badges/gpa.svg)](https://codeclimate.com/github/sounxrt/fitbit_client) [![Test Coverage](https://codeclimate.com/github/sounxrt/fitbit_client/badges/coverage.svg)](https://codeclimate.com/github/sounxrt/fitbit_client/coverage)
+[![Build Status](https://travis-ci.org/sounxrt/fitbit_client.svg?branch=master)](https://travis-ci.org/sounxrt/fitbit_client) [![Code Climate](https://codeclimate.com/github/sounxrt/fitbit_client/badges/gpa.svg)](https://codeclimate.com/github/sounxrt/fitbit_client) [![Test Coverage](https://codeclimate.com/github/sounxrt/fitbit_client/badges/coverage.svg)](https://codeclimate.com/github/sounxrt/fitbit_client/coverage) [![Gem Version](https://badge.fury.io/rb/fitbit_client.svg)](https://badge.fury.io/rb/fitbit_client)
 
 Provides access to the Fitbit API using OAuth2
 

data/lib/fitbit_client.rb

@@ -2,6 +2,7 @@
 
 require 'fitbit_client/version'
 require 'fitbit_client/error'
+require 'fitbit_client/token_error'
 require 'fitbit_client/util'
 require 'fitbit_client/network/request'
 
@@ -34,6 +35,10 @@ module FitbitClient
   class << self
     attr_accessor :client_id, :client_secret
     attr_accessor :default_language, :default_locale
+
+    def debug_mode!(enable)
+      ENV['OAUTH_DEBUG'] = enable ? 'true' : 'false'
+    end
   end
 
   def self.configure

data/lib/fitbit_client/client.rb

@@ -17,15 +17,6 @@ module FitbitClient
       raise ArgumentError, 'FitbitClient::Client cannot operate without a client_id and client_secret values' if empty_str?(@client_id) || empty_str?(@client_secret)
     end
 
-    def debug_mode!(enable)
-      if enable
-        @original_oauth_debug = ENV['OAUTH_DEBUG']
-        ENV['OAUTH_DEBUG'] = 'true'
-      elsif @original_oauth_debug
-        ENV['OAUTH_DEBUG'] = @original_oauth_debug
-      end
-    end
-
     # Force a refresh token
     def refresh_token!
       oauth2_refresh_token!

data/lib/fitbit_client/network/request.rb

@@ -44,10 +44,12 @@ module FitbitClient
           oauth2_access_token.request(method, path, opts)
         rescue OAuth2::Error => e # Handle refresh token issue automagically
           attempt += 1
-          if expired_token_error?(e.response)
+          parsed_response = parse_response(e.response)
+          if expired_token_error?(parsed_response)
             oauth2_refresh_token!
             retry if attempt < 2
           end
+          check_unrecoverable_token(parsed_response, e)
           raise FitbitClient::Error.new('Error during OAuth2 request', e.response)
         end
       end
@@ -63,9 +65,22 @@ module FitbitClient
         JSON.parse response.body
       end
 
-      def expired_token_error?(response)
-        json_response = parse_response(response)
-        json_response.dig('errors', 0, 'errorType') == 'expired_token'
+      def check_unrecoverable_token(parsed_response, error)
+        if invalid_token_error?(parsed_response, 'invalid_grant', 'Refresh token invalid') ||
+           invalid_token_error?(parsed_response, 'invalid_token', 'Access token invalid')
+          raise FitbitClient::TokenError.new('Invalid token', error.response)
+        end
+      end
+
+      def expired_token_error?(parsed_response)
+        parsed_response.dig('errors', 0, 'errorType') == 'expired_token'
+      end
+
+      def invalid_token_error?(parsed_response, error_type, error_message)
+        message = parsed_response.dig('errors', 0, 'message')
+        return unless message
+        parsed_response.dig('errors', 0, error_type) == 'invalid_token' &&
+          message.start_with?(error_message)
       end
 
       def oauth2_refresh_token!

data/lib/fitbit_client/resources/common.rb

@@ -3,9 +3,18 @@
 module FitbitClient
   module Resources
     module Common
+      def path_user_version(path, options = {})
+        version = options.fetch(:version, '1')
+        return "/#{version}#{path}.json" if options[:skip_user]
+
+        # Add user id
+        user_id = options.fetch(:user_id, '-')
+        "/#{version}/user/#{user_id}#{path}.json"
+      end
+
       def skip_user_options!(options)
         options[:skip_user] = true
-        options.delete![:user_id] if options.key?(:user_id)
+        options.delete(:user_id) if options.key?(:user_id)
       end
 
       def time_series_path(type, resource, date, end_limit)

data/lib/fitbit_client/resources/sleep.rb

@@ -138,11 +138,12 @@ module FitbitClient
 
       private
 
+      # rubocop:disable Metrics/LineLength
       def sleep_default_version!(options)
         if options[:version] == '1'
           warn '[DEPRECATION] These endpoints are deprecated and support for them may end unexpectedly. If your application does not depend on the sleep as calculated by these endpoints, please use the new v1.2 sleep endpoints.'
         else
-          options[:version] = '1.2'
+          options[:version] ||= '1.2'
         end
       end
     end

data/lib/fitbit_client/token_error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module FitbitClient
+  # This class represent a unrecoverable token error
+  class TokenError < Error
+  end
+end

data/lib/fitbit_client/util.rb

@@ -6,15 +6,6 @@ module FitbitClient
       obj.nil? || obj.empty?
     end
 
-    def path_user_version(path, options = {})
-      version = options.fetch(:version, '1')
-      return "/#{version}#{path}.json" if options[:skip_user]
-
-      # Add user id
-      user_id = options.fetch(:user_id, '-')
-      "/#{version}/user/#{user_id}#{path}.json"
-    end
-
     # Convert a Date object to a iso8601 format String (yyyy-MM-dd)
     def iso_date(date)
       date.iso8601
@@ -28,6 +19,6 @@ module FitbitClient
       time.strftime('%H:%M:%S')
     end
 
-    module_function :empty_str?, :iso_date, :iso_time, :iso_time_with_seconds, :path_user_version
+    module_function :empty_str?, :iso_date, :iso_time, :iso_time_with_seconds
   end
 end

data/lib/fitbit_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FitbitClient
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fitbit_client
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Michel Ocon
@@ -179,6 +179,7 @@ files:
 - lib/fitbit_client/resources/devices.rb
 - lib/fitbit_client/resources/sleep.rb
 - lib/fitbit_client/resources/subscription.rb
+- lib/fitbit_client/token_error.rb
 - lib/fitbit_client/util.rb
 - lib/fitbit_client/version.rb
 homepage: https://github.com/sounxrt/fitbit_client