zoho_hub 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85ad0f4580d7758046129affd8819a1cc96560f0f2b4637b20647db3231de092
-  data.tar.gz: cb637f4961be8aaec37b56624b41301911aa4102a5bda48db526f4ed7b8d6a5e
+  metadata.gz: e281a8267ab893eea4e24d703c925f35f8a502cd00df9fcbb8a502aec5c47c6b
+  data.tar.gz: d87addb71b60704a885e7afbf724aa089945450d120e815dbe89bade1b161d79
 SHA512:
-  metadata.gz: 7ab15bd80340c46e2c8e4d2a6c68eae51bc156b65b92cd0ea3f0bf206d68923e6a5eacf8b16c355e1bc4e21d3d4212a253b394138c948824be0f811326ddb485
-  data.tar.gz: b828374accd2189ca276a0f6de4a55b5c7c00d1d1491c09fb9aecbaecdf5fc9ea91db661570617fa5cf6c6ca2b6fba409cafdaa08e69ac5c5eccd2f742120bbd
+  metadata.gz: d4882911df8348e20b5b887648b6da62887cf9773511e47564ac9d405a897beb52985d23eaa6bb30bb4c2483923014a94104f84669b49fceacc965f45b551e88
+  data.tar.gz: ee61fc7985866b898412f755c08a19c222f33281be1f3818763f4fc7b25eb6f2fb0f88520212e47964d344616abb3a7610509cae9a6c87b49aa5cc35d0110d96

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zoho_hub (0.1.10)
+    zoho_hub (0.1.11)
       activesupport (~> 5.2)
       addressable (~> 2.5)
       faraday (~> 0.15)

data/lib/zoho_hub/auth.rb

@@ -10,6 +10,7 @@ module ZohoHub
     extend Forwardable
 
     TOKEN_PATH = '/oauth/v2/token'
+    REVOKE_TOKEN_PATH = '/oauth/v2/token/revoke'
     AUTH_PATH = '/oauth/v2/auth'
 
     DEFAULT_SCOPES = %w[
@@ -29,18 +30,14 @@ module ZohoHub
       @scopes = scopes || DEFAULT_SCOPES
     end
 
-    def token_full_uri
-      Addressable::URI.join(@configuration.base_url, TOKEN_PATH)
-    end
-
-    def auth_full_uri
-      Addressable::URI.join(@configuration.base_url, AUTH_PATH)
+    def self.auth_url
+      new.auth_url
     end
 
     def auth_url
       uri = auth_full_uri
 
-      uri.query_values = {
+      query = {
         client_id: client_id,
         scope: @scopes.join(','),
         access_type: @access_type,
@@ -48,21 +45,27 @@ module ZohoHub
         response_type: 'code'
       }
 
+      # The consent page must be presented otherwise we don't get the refresh token back.
+      query[:prompt] = 'consent' if @access_type == DEFAULT_ACCESS_TYPE
+
+      uri.query_values = query
+
       Addressable::URI.unencode(uri.to_s)
     end
 
-    def token_url(grant_token)
-      uri = token_full_uri
+    def auth_full_uri
+      Addressable::URI.join(@configuration.base_url, AUTH_PATH)
+    end
 
-      uri.query_values = {
-        client_id: client_id,
-        client_secret: secret,
-        code: grant_token,
-        redirect_uri: redirect_uri,
-        grant_type: 'authorization_code'
-      }
+    def self.refresh_token(refresh_token)
+      new.refresh_token(refresh_token)
+    end
 
-      Addressable::URI.unencode(uri.to_s)
+    def refresh_token(refresh_token)
+      result = Faraday.post(refresh_url(refresh_token))
+
+      json = parse(result.body)
+      json.merge(refresh_token: refresh_token)
     end
 
     def refresh_url(refresh_token)
@@ -78,19 +81,16 @@ module ZohoHub
       Addressable::URI.unencode(uri.to_s)
     end
 
-    def self.refresh_token(refresh_token)
-      new.refresh_token(refresh_token)
+    def parse(body)
+      MultiJson.load(body, symbolize_keys: true)
     end
 
-    def refresh_token(refresh_token)
-      result = Faraday.post(refresh_url(refresh_token))
-
-      json = parse(result.body)
-      json.merge(refresh_token: refresh_token)
+    def token_full_uri
+      Addressable::URI.join(@configuration.base_url, TOKEN_PATH)
     end
 
     def revoke_refresh_token(refresh_token)
-      uri = token_full_uri
+      uri = revoke_token_full_uri
 
       uri.query_values = { token: refresh_token }
 
@@ -101,6 +101,10 @@ module ZohoHub
       parse(result.body)
     end
 
+    def revoke_token_full_uri
+      Addressable::URI.join(@configuration.base_url, REVOKE_TOKEN_PATH)
+    end
+
     def self.get_token(grant_token)
       new.get_token(grant_token)
     end
@@ -111,8 +115,20 @@ module ZohoHub
       parse(result.body)
     end
 
-    def parse(body)
-      MultiJson.load(body, symbolize_keys: true)
+    def token_url(grant_token)
+      uri = token_full_uri
+
+      query = {
+        client_id: client_id,
+        client_secret: secret,
+        code: grant_token,
+        redirect_uri: redirect_uri,
+        grant_type: 'authorization_code'
+      }
+
+      uri.query_values = query
+
+      Addressable::URI.unencode(uri.to_s)
     end
   end
 end

data/lib/zoho_hub/connection.rb

@@ -22,7 +22,7 @@ module ZohoHub
     def initialize(access_token:, api_domain: DEFAULT_DOMAIN, expires_in: 3600, refresh_token: nil)
       @access_token = access_token
       @expires_in = expires_in
-      @api_domain = api_domain
+      @api_domain = api_domain || DEFAULT_DOMAIN
       @refresh_token ||= refresh_token # do not overwrite if it's already set
     end
 

data/lib/zoho_hub/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ZohoHub
-  VERSION = '0.1.10'
+  VERSION = '0.1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zoho_hub
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Ricardo Otero