timedoctor 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18ec15218465099f9b2dc4ecaea38ee6865185ec641f2993f98d5a4ad13c4bb9
-  data.tar.gz: f689d43de75653e747524abd2f7937a134917882c44638c76ba24314d013ce06
+  metadata.gz: 1863262f810d0a719b977fe636c3533d7466f0a34d39ab89f72384c9ef0ca5b7
+  data.tar.gz: 74229ed160f0c670c813975561b54009b5d0be70d1ed63642d9f41f7a6ba8e4c
 SHA512:
-  metadata.gz: 7ed21cca98983b5edfc5178e9dff3f352dbe0e3c1cfa56edadc1f3c78d354a9e097ee8b9c68c6f80669949794526a99481dc7ed3146b2c3749c380b57abc1d0c
-  data.tar.gz: d4ac18f10dffc9a22687493a7b8dca406a0a3b2992dd3cb72696d8e2730ac28824458f429cff602a05c158d62d3527fd3bf2e2ddcdfd0915dcb8a7f24ebf78a4
+  metadata.gz: f52af45bb440b0a8d7b408cd70d867e7153c74934e46ee850be47512680ddf851856733af4c745707f330f18a2be40d72205a8f5a62d881d04f0288bd0b1053a
+  data.tar.gz: f1158310c37b58803bc15bc7862e1f422e1c81ccdf9df38b305ecb9f47ca0bec0cfa34182eb8d4f64e1de3e264be1d43f4edb112f3679c4e7ecebe910cd0fd0c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    timedoctor (0.2.0)
+    timedoctor (0.3.1)
       faraday (~> 0.15.0)
 
 GEM

data/bin/console

@@ -13,30 +13,32 @@ require 'timedoctor'
 # require 'irb'
 # IRB.start(__FILE__)
 #
-# config = {
-#   client_id: '1091_4hnloyc6pqqscckokws808o8soocko4c44owwws404g8k4sgos',
-#   client_secret: '7wvmks0khckcw40s00cssg4w8s404o8g0g8k00cgo8kow0cow',
-#
+config = {
+  client_id: '1091_4hnloyc6pqqscckokws808o8soocko4c44owwws404g8k4sgos',
+  client_secret: '7wvmks0khckcw40s00cssg4w8s404o8g0g8k00cgo8kow0cow',
+
 #   access_token:
 # "Y2ZkMGY5OTA1NGI3NmJjZTZlYWJlYjczNGM4N2E2NTYwZjFmNzhjZGVhMGY3ZmU0MTIyZjQ5NTNkOGIzYWI3ZA",
 #   refresh_token:
 # "ZmM3OTg1NjZmYjgwYmZlYzM2NzAwMjFlZmFhZmU4MDk1Y2ZhZWNlYjMyYTg0NzlmMzRmNzBiOWM5NTUxNjY4MA",
 #   user_id: 1188995,
 #   company_id: 587525,
-#
-#   on_token_refresh: ->(data, conf) do
-#     p 'SUCCESS'
-#
-#     p data
-#
-#     conf[:access_token]  = data[:access_token]
-#     conf[:refresh_token] = data[:refresh_token]
-#   end,
-#
-#   on_token_refresh_error: ->(data, conf) { p "FAILURE" }
-# }
-#
-# client = TimeDoctor::Client.new(config)
+
+  # on_token_refresh: ->(data, conf) do
+  #   p 'SUCCESS'
+  #
+  #   p data
+  #
+  #   conf[:access_token]  = data[:access_token]
+  #   conf[:refresh_token] = data[:refresh_token]
+  # end,
+  #
+  # on_token_refresh_error: ->(data, conf) { p "FAILURE" }
+  on_token_authorize_error: ->(data, conf) { p "FAILURE" }
+}
+
+p TimeDoctor::Auth.new(config).fetch_token
+# p TimeDoctor::Client.new(config).authorize
 #
 # # p client.companies.list
 #

data/lib/timedoctor.rb

@@ -6,3 +6,4 @@ require 'timedoctor/exceptions'
 require 'timedoctor/config'
 require 'timedoctor/worker'
 require 'timedoctor/token'
+require 'timedoctor/auth'

data/lib/timedoctor/auth.rb

@@ -0,0 +1,13 @@
+module TimeDoctor
+  class Auth
+    def initialize(config)
+      @config = Config.new(config)
+    end
+
+    attr_reader :config
+
+    def fetch_token
+      TimeDoctor::Token.new(config).fetch
+    end
+  end
+end

data/lib/timedoctor/token.rb

@@ -1,51 +1,57 @@
 module TimeDoctor
   class Token
-    class << self
-      ENTRY = 'https://webapi.timedoctor.com/oauth/v2/token'.freeze
-
-      def authorize(config)
-        response = Faraday.get ENTRY,
-                               client_id:     config[:client_id],
-                               client_secret: config[:client_secret],
-                               code:          config[:code],
-                               redirect_uri:  config[:redirect_uri],
-                               grant_type:    :authorization_code,
-                               _format:       :json
-
-        case response.status
-        when 200
-          data = JSON.parse(response.body, symbolize_names: true)
-          config[:access_token]  = data[:access_token]
-          config[:refresh_token] = data[:refresh_token]
-          config[:on_token_authorize].call(data, config)
-        when 400
-          data = JSON.parse(response.body, symbolize_names: true)
-          config[:on_token_authorize_error].call(data, config)
-        else
-          raise UnknownError, response
-        end
+    ENTRY = 'https://webapi.timedoctor.com/oauth/v2/token'.freeze
+
+    def initialize(config)
+      @config = config
+    end
+
+    attr_reader :config
+
+    def fetch
+      response = Faraday.get ENTRY,
+                             client_id:     config[:client_id],
+                             client_secret: config[:client_secret],
+                             code:          config[:code],
+                             redirect_uri:  config[:redirect_uri],
+                             grant_type:    :authorization_code,
+                             _format:       :json
+
+      data = JSON.parse(response.body, symbolize_names: true)
+
+      case response.status
+      when 200
+        config[:access_token]  = data[:access_token]
+        config[:refresh_token] = data[:refresh_token]
+        config[:on_token_authorize].call(data, config)
+        data
+      when 400
+        config[:on_token_authorize_error].call(data, config)
+      else
+        raise UnknownError, response
       end
+    end
+
+    def refresh
+      response = Faraday.get ENTRY,
+                             refresh_token: config[:refresh_token],
+                             client_id:     config[:client_id],
+                             client_secret: config[:client_secret],
+                             grant_type:    :refresh_token,
+                             _format:       :json
+
+      data = JSON.parse(response.body, symbolize_names: true)
 
-      def refresh(config)
-        response = Faraday.get ENTRY,
-                               refresh_token: config[:refresh_token],
-                               client_id:     config[:client_id],
-                               client_secret: config[:client_secret],
-                               grant_type:    :refresh_token,
-                               _format:       :json
-
-        case response.status
-        when 200
-          data = JSON.parse(response.body, symbolize_names: true)
-          config[:access_token]  = data[:access_token]
-          config[:refresh_token] = data[:refresh_token]
-          config[:on_token_refresh].call(data, config)
-        when 400
-          data = JSON.parse(response.body, symbolize_names: true)
-          config[:on_token_refresh_error].call(data, config)
-        else
-          raise UnknownError, response
-        end
+      case response.status
+      when 200
+        config[:access_token]  = data[:access_token]
+        config[:refresh_token] = data[:refresh_token]
+        config[:on_token_refresh].call(data, config)
+        data
+      when 400
+        config[:on_token_refresh_error].call(data, config)
+      else
+        raise UnknownError, response
       end
     end
   end

data/lib/timedoctor/worker.rb

@@ -5,13 +5,13 @@ module TimeDoctor
     attr_reader :config, :conn
 
     def initialize(config)
-      raise EmptyAccessToken unless config[:access_token]
-
       @config = config
       @conn   = Faraday.new(url: ENTRY)
     end
 
     def exchange(method, url, params = {})
+      raise EmptyAccessToken unless config[:access_token]
+
       params[:access_token] = config[:access_token]
       params[:_format]      = :json
 
@@ -21,7 +21,7 @@ module TimeDoctor
       when 200
         JSON.parse(response.body, symbolize_names: true)
       when 401
-        Token.refresh(config)
+        Token.new(config).refresh
         exchange(method, url, params)
       else
         raise UnknownError, response

data/lib/version.rb

@@ -1,3 +1,3 @@
 module TimeDoctor
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: timedoctor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eugene Yak
@@ -142,6 +142,7 @@ files:
 - bin/console
 - bin/setup
 - lib/timedoctor.rb
+- lib/timedoctor/auth.rb
 - lib/timedoctor/client.rb
 - lib/timedoctor/config.rb
 - lib/timedoctor/core/absent_late.rb