hubspot-api-client 17.0.0.pre.beta.4 → 17.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2c752c107b386d795312696c8189ae9f8df886d2a8f8ef8598724b5411e92e6
-  data.tar.gz: 5887a6799cd014e69612817eb022d45e7c9324d1438770c937225c499c17a06b
+  metadata.gz: abbad95ec7ed2eab3eec2d180f721b54f7de216328c1df44670c32b3e14a882e
+  data.tar.gz: 0ac955e55206a6cd81881825c3f2669eb8cc5a792af273cb24cfaf1342230d6f
 SHA512:
-  metadata.gz: 04a06eca1bbb17c4e71ed4c209f1637bead5e1afb318add65d80f14fa940551a784d2507d39644f25b4cd6f973e0b78ad0685482d474785019e5d8967003c0e8
-  data.tar.gz: 902eaeb25c0d10fdced246c6b7d18b325633b049d07bedd3cb105816b6702f12c3fde6be5625a7f6fc8e7fc6fe63ce63551e56c7743603a00b1db1db95a2de2f
+  metadata.gz: 3961b180b6ca01a771749514c85d48cbca3b7ba18344038c39d2aed54c53389e6a3c1490a5f77913d67cbf9897ec9f101ac8ece545e528d0c2e54c73749c6da0
+  data.tar.gz: 579b92cbc0cb4c1db21a313866953d586a7e1c61ec200400265007625fcd5f817b6b4653c99e6d7ee6e5768a6685a036905391b83bde016b6c49daac4a985d41

data/CHANGELOG.md

@@ -5,9 +5,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/HubSpot/hubspot-api-ruby/compare/v17.0.0.pre.beta.4...HEAD)
+## [Unreleased](https://github.com/HubSpot/hubspot-api-ruby/compare/v17.0.0...HEAD)
 
 
+## [17.0.0.pre.beta.4] - 2023-06-14
+
+## Updated
+
+- Fix `Hubspot::OAuthHelper.authorize_url()` (don't add empty scopes or optional scopes to OAuth url)
+
 ## [17.0.0.pre.beta.4] - 2023-05-17
 
 ## Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hubspot-api-client (17.0.0.pre.beta.4)
+    hubspot-api-client (17.0.0)
       json (~> 2.1, >= 2.1.0)
       typhoeus (~> 1.4.0)
 

data/lib/hubspot/client.rb

@@ -19,7 +19,7 @@ module Hubspot
         events
         files
         marketing
-        o_auth
+        oauth
         settings
         webhooks
       ].freeze

data/lib/hubspot/discovery/oauth/client.rb

@@ -13,10 +13,6 @@ module Hubspot
             tokens
           ].freeze
         end
-
-        def discovery_module_path
-          super.gsub('o_auth', 'oauth')
-        end
       end
     end
   end

data/lib/hubspot/helpers/camel_case.rb

@@ -2,7 +2,11 @@ module Hubspot
   module Helpers
     class CamelCase
       def format(string)
-        string.split('_').collect(&:capitalize).join
+        if string == 'oauth'
+          'OAuth'
+        else
+          string.split('_').collect(&:capitalize).join
+        end
       end
     end
   end

data/lib/hubspot/helpers/path.rb

@@ -8,12 +8,11 @@ module Hubspot
       end
 
       def require_with_mapping(path)
-        require path.gsub('o_auth', 'oauth')
+        require path
       end
 
       def require_with_codegen_mapping(path)
         require path
-          .gsub('o_auth', 'oauth')
           .gsub('audit_logs/', 'audit-logs/')
           .gsub('blog_posts/', 'blog-posts/')
           .gsub('site_search', 'site-search')

data/lib/hubspot/helpers/snake_case.rb

@@ -2,7 +2,8 @@ module Hubspot
   module Helpers
     class SnakeCase
       def format(string)
-        string.gsub(/::/, '/').
+        string.gsub('OAuth', 'Oauth').
+        gsub(/::/, '/').
         gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
         gsub(/([a-z\d])([A-Z])/,'\1_\2').
         tr("-", "_").

data/lib/hubspot/oauth_helper.rb

@@ -2,15 +2,19 @@ module Hubspot
   class OAuthHelper
     AUTHORIZE_URL = 'https://app.hubspot.com/oauth/authorize'.freeze
     class << self
-      def authorize_url(client_id:, redirect_uri:, scope:, optional_scope: [])
-        query = URI.encode_www_form(
-          client_id: client_id,
-          redirect_uri: redirect_uri,
-          scope: Array(scope),
-          optional_scope: Array(optional_scope)
-        )
+      def authorize_url(client_id, redirect_uri, scopes = nil, optional_scopes = nil, state = nil)
+        query_params = {
+          "client_id" => client_id,
+          "redirect_uri" => redirect_uri
+        }
 
-        "#{AUTHORIZE_URL}?#{query}"
+        query_params["scope"] = scopes.join(' ') if scopes
+        query_params["optional_scope"] = optional_scopes.join(' ') if optional_scopes
+        query_params['state'] ||= state if state
+
+        params = URI.encode_www_form(query_params)
+
+        "#{AUTHORIZE_URL}?#{params}"
       end
     end
   end

data/lib/hubspot/version.rb

@@ -1,3 +1,3 @@
 module Hubspot
-VERSION = '17.0.0.pre.beta.4'
+VERSION = '17.0.0'
 end

data/spec/discovery/client_spec.rb

@@ -11,6 +11,6 @@ describe 'Hubspot::Client' do
   it { is_expected.to respond_to(:events) }
   it { is_expected.to respond_to(:files) }
   it { is_expected.to respond_to(:marketing) }
-  it { is_expected.to respond_to(:o_auth) }
+  it { is_expected.to respond_to(:oauth) }
   it { is_expected.to respond_to(:webhooks) }
 end

data/spec/discovery/oauth/access_tokens_api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Hubspot::Discovery::OAuth::AccessTokensApi' do
-  subject(:api) { Hubspot::Client.new(access_token: 'test').o_auth.access_tokens_api }
+  subject(:api) { Hubspot::Client.new(access_token: 'test').oauth.access_tokens_api }
   
   it { is_expected.to respond_to(:get) }
 end

data/spec/discovery/oauth/refresh_tokens_api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Hubspot::Discovery::OAuth::RefreshTokensApi' do
-  subject(:api) { Hubspot::Client.new(access_token: 'test').o_auth.refresh_tokens_api }
+  subject(:api) { Hubspot::Client.new(access_token: 'test').oauth.refresh_tokens_api }
   
   it { is_expected.to respond_to(:archive) }
   it { is_expected.to respond_to(:get) }

data/spec/discovery/oauth/tokens_api_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'Hubspot::Discovery::OAuth::TokensApi' do
-  subject(:api) { Hubspot::Client.new(access_token: 'test').o_auth.tokens_api }
+  subject(:api) { Hubspot::Client.new(access_token: 'test').oauth.tokens_api }
   
   it { is_expected.to respond_to(:create) }
 end

data/spec/helpers/authorize_url_spec.rb

@@ -0,0 +1,75 @@
+require 'uri'
+require 'rspec'
+
+require_relative "../../lib/hubspot/oauth_helper"
+
+describe 'get_auth_url' do
+  AUTHORIZE_URL = 'https://app.hubspot.com/oauth/authorize'
+
+  let(:data) do
+    {
+      client_id: 'client_id',
+      redirect_uri: 'http://localhost',
+      scope: ['contacts', 'timeline'],
+      optional_scope: ['scope1', 'scope3']
+    }
+  end
+
+  it 'returns the correct URL with empty scope' do
+    expected_params = {
+      client_id: data[:client_id],
+      redirect_uri: data[:redirect_uri]
+    }
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
+
+    result = Hubspot::OAuthHelper.authorize_url(data[:client_id], data[:redirect_uri])
+
+    expect(result).to eq(expected_url)
+  end
+
+  it 'returns the correct URL with scope' do
+    expected_params = {
+      client_id: data[:client_id],
+      redirect_uri: data[:redirect_uri],
+      scope: data[:scope].join(' ')
+    }
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
+
+    result = Hubspot::OAuthHelper.authorize_url(data[:client_id], data[:redirect_uri], data[:scope])
+
+    expect(result).to eq(expected_url)
+  end
+
+  it 'returns the correct URL with optional_scope' do
+    expected_params = {
+      client_id: data[:client_id],
+      redirect_uri: data[:redirect_uri],
+      scope: data[:optional_scope].join(' ')
+    }
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
+
+    result = Hubspot::OAuthHelper.authorize_url(data[:client_id], data[:redirect_uri], data[:optional_scope])
+
+    expect(result).to eq(expected_url)
+  end
+  it 'returns the correct URL' do
+    expected_params = {
+      client_id: data[:client_id],
+      redirect_uri: data[:redirect_uri],
+      scope: data[:scope].join(' '),
+      optional_scope: data[:optional_scope].join(' '),
+      state: "test_state"
+    }
+    expected_url = "#{AUTHORIZE_URL}?#{URI.encode_www_form(expected_params)}"
+
+    result = Hubspot::OAuthHelper.authorize_url(
+      data[:client_id],
+      data[:redirect_uri],
+      data[:scope],
+      data[:optional_scope],
+      "test_state"
+    )
+
+    expect(result).to eq(expected_url)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-api-client
 version: !ruby/object:Gem::Version
-  version: 17.0.0.pre.beta.4
+  version: 17.0.0
 platform: ruby
 authors:
 - HubSpot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-17 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -1939,6 +1939,7 @@ files:
 - spec/discovery/settings/users/users_api_spec.rb
 - spec/discovery/webhooks/settings_api_spec.rb
 - spec/discovery/webhooks/subscriptions_api_spec.rb
+- spec/helpers/authorize_url_spec.rb
 - spec/helpers/camel_case_spec.rb
 - spec/helpers/signature_spec.rb
 - spec/spec_helper.rb
@@ -1957,9 +1958,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key:
@@ -2114,6 +2115,7 @@ test_files:
 - spec/discovery/events/events_api_spec.rb
 - spec/discovery/webhooks/settings_api_spec.rb
 - spec/discovery/webhooks/subscriptions_api_spec.rb
+- spec/helpers/authorize_url_spec.rb
 - spec/helpers/signature_spec.rb
 - spec/helpers/camel_case_spec.rb
 - spec/spec_helper.rb