omniauth-square-oauth2 0.0.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e081d6663cb435b61e57f93417049a37914dc5936e07aaec7d9f95333361d2
-  data.tar.gz: 9e76d9ed588620f437499b29c2918c26a048a62e206db0db8cc5359b7d584b11
+  metadata.gz: f19ab92a8efc93e052e61f76c30ae3aa747e5154e0c22ed05c1dd235a76d2999
+  data.tar.gz: 734bc25d8e398cc8d33b297b837dbafb7c1cffaa91254523cfed7525f89a2c45
 SHA512:
-  metadata.gz: 7274361873c49e29f358e9e48ef65fb6b5d2e6cd496e05ec539514da68721acf1b9a0497df63b4181d2dd91dc252f8c187f44e6a0cee977e9884f35cac63f1ae
-  data.tar.gz: a90cc7a83c2c6a2d82502aa78a7caa3937e7c84ff7729e786e9e8f3787e1ae7a01ed3d5dcdde5c076054d2d51e39a8ef92bbb5dc8f7a5a2a99a78cdee3392b8c
+  metadata.gz: e5f1b4c48dd0764ff141ead54e59435c026131cd407d6f430e673cad26aa8edf3d2f314d95a8bf10cfa6e9bc4ea898a6de68775981292d414933dc6e818c93e8
+  data.tar.gz: 913af461084fd09051c011e10d62202eff7d74f6862e6d6e9a16525bb27c4a3568a109d9eef3714dd760e6c56cc94565e08f8c64ee4317b6e763093cf75c45e1

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     omniauth-square-oauth2 (0.0.2)
-      omniauth-oauth2 (>= 1.1.1, < 1.3.0)
+      omniauth-oauth2 (>= 1.7.3)
 
 GEM
   remote: http://rubygems.org/
@@ -13,37 +13,41 @@ GEM
     crack (0.4.4)
     diff-lcs (1.4.4)
     docile (1.3.2)
-    faraday (0.9.2)
-      multipart-post (>= 1.2, < 3)
+    faraday (2.5.2)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.0)
     hashdiff (1.0.1)
-    hashie (4.1.0)
-    jwt (2.2.2)
-    multi_json (1.15.0)
+    hashie (5.0.0)
+    jwt (2.5.0)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    oauth2 (1.4.4)
-      faraday (>= 0.8, < 2.0)
+    oauth2 (2.0.7)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
-      multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    omniauth (1.9.1)
+      rash_alt (>= 0.4, < 1)
+      version_gem (~> 1.1)
+    omniauth (2.1.0)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
-    omniauth-oauth2 (1.2.0)
-      faraday (>= 0.8, < 0.10)
-      multi_json (~> 1.3)
-      oauth2 (~> 1.0)
-      omniauth (~> 1.2)
+      rack (>= 2.2.3)
+      rack-protection
+    omniauth-oauth2 (1.8.0)
+      oauth2 (>= 1.4, < 3)
+      omniauth (~> 2.0)
     parallel (1.19.2)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
     rack (2.2.3)
+    rack-protection (2.2.2)
+      rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     rainbow (3.0.0)
     rake (10.5.0)
+    rash_alt (0.4.12)
+      hashie (>= 3.4)
     regexp_parser (1.8.1)
     rexml (3.2.4)
     rspec (2.99.0)
@@ -66,11 +70,13 @@ GEM
     rubocop-ast (0.7.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.10.1)
+    ruby2_keywords (0.0.5)
     simplecov (0.19.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.3)
     unicode-display_width (1.7.0)
+    version_gem (1.1.0)
     webmock (3.9.1)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)

data/lib/omniauth/strategies/square.rb

@@ -7,10 +7,9 @@ module OmniAuth
     class Square < OmniAuth::Strategies::OAuth2
       option :name, 'square'
       option :client_options, {
-        site: 'https://squareup.com/',
-        connect_site: 'https://connect.squareup.com',
-        authorize_url: '/oauth2/authorize',
-        token_url: '/oauth2/token'
+        site: 'https://connect.squareup.com',
+        authorize_url: 'oauth2/authorize',
+        token_url: 'oauth2/token'
       }
 
       uid { raw_info['merchant'][0]['id'] }
@@ -18,7 +17,8 @@ module OmniAuth
       info do
         prune!(
           name: raw_info['merchant'][0]['business_name'],
-          country: raw_info['merchant'][0]['country']
+          country: raw_info['merchant'][0]['country'],
+          email: raw_info['email']
         )
       end
 
@@ -26,28 +26,23 @@ module OmniAuth
         { raw_info: raw_info }
       end
 
+      def callback_url
+        full_host + script_name + callback_path
+      end
+
       def build_access_token
-        connect_client = client.dup
-        connect_client.site = options.client_options.connect_site
-        auth_params = {
-          redirect_uri: callback_url,
-          client_id: options.client_id,
-          client_secret: options.client_secret,
-          grant_type: 'authorization_code'
-        }.merge(token_params.to_hash(symbolize_keys: true))
-        connect_client.auth_code.get_token(
-          request.params['code'],
-          auth_params.merge(
-            token_params.to_hash(symbolize_keys: true)
-          ),
-          deep_symbolize(options.auth_token_params)
-        )
+        options.token_params.merge!({client_id: options.client_id, client_secret: options.client_secret})
+        super
       end
 
-      private
+  private
 
       def raw_info
         @raw_info ||= access_token.get('/v2/merchants').parsed
+
+        # Get merchant email
+        team_members = access_token.post("/v2/team-members/search", {query: {filter: {is_owner: true}}})
+        @raw_info.merge!({email: team_members[0].email})
       end
 
       def prune!(hash)

data/lib/omniauth-square/version.rb

@@ -2,6 +2,6 @@
 
 module Omniauth
   module Square
-    VERSION = '0.0.3'
+    VERSION = '0.2.0'
   end
 end

data/omniauth-square-oauth2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'omniauth-oauth2', '>= 1.1.1', '< 1.3.0'
+  s.add_runtime_dependency 'omniauth-oauth2', '>= 1.7.3'
   s.add_development_dependency 'rack-test'
   s.add_development_dependency 'rake', '~> 10.0'
   s.add_development_dependency 'rspec', '~> 2.7'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-square-oauth2
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nick Robinson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-11 00:00:00.000000000 Z
+date: 2023-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.7.3
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement