omniauth-airtable 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6dc175d3d5b740bce9918994f46c5d6e13b02f3a808bc3d8839d8894c779d61b
-  data.tar.gz: cf689e7b572766ed8e2de57a41e55dc53ca0ba716f74b78511e1c305c29ffdb0
+  metadata.gz: 7adc79d151a495fb0421e33c3ab0439366b65b426af7abc28e2882876e99be1a
+  data.tar.gz: 9861a8f1ec008787a8098bac8a343a0662854f8bb1c9e194423ed222cd8a5d25
 SHA512:
-  metadata.gz: b49d1be2b22448650fb9193618d9c612632655424e08f7f9841c8fb305d2ff517b76ff8f28857ba664159542924d6c520b5bac9917fe272419287df871105e24
-  data.tar.gz: 5b08ac8a2c1cd90a8a790f38ead41b24abd6588d83f3a16091c42116db3a75a3cb187143559e55bc6235da936c948f41686f5328538e0f573ed556337d259835
+  metadata.gz: '023522241769af7e41bf240715ca61a561310f9d84f45da61f4aa867d595db07983916c8c3736293d09ada8832496d88cfd71b45cdd8ee56a997c2317bef645a'
+  data.tar.gz: 66f70d0aee5b3e36b9e154f619ec8efbe26ee3294e04d1641f0633bfb41becf4bcea9f19e676130f24dc60610edc9fcf6584662d0f33d6a23238889f5daa7abd

data/.github/workflows/ruby.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ["2.4", "2.5", "2.6", "2.7", "3.1", "3.2"]
+        ruby-version: ["3.0", "3.1", "3.2", "3.3"]
 
     steps:
       - uses: actions/checkout@v3

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version
+.DS_Store

data/README.md

@@ -16,7 +16,7 @@ gem 'omniauth-airtable'
 
 ```ruby
 use OmniAuth::Builder do
-  provider :airtable, ENV['AIRTABLE_CLIENT_ID'], ENV['AIRTABLE_CLIENT_SECRET'], { scope: 'useraccount', client_options: { site: 'https://<instance-id>.airtable.com' } }
+  provider :airtable, ENV['AIRTABLE_CLIENT_ID'], ENV['AIRTABLE_CLIENT_SECRET'], { scope: 'data.records:read data.records:write schema.bases:read schema.bases:write' }
 end
 ```
 
@@ -26,7 +26,7 @@ In `config/initializers/airtable.rb`
 
 ```ruby
   Rails.application.config.middleware.use OmniAuth::Builder do
-    provider :airtable, ENV['AIRTABLE_CLIENT_ID'], ENV['AIRTABLE_CLIENT_SECRET'], { scope: 'useraccount', client_options: { site: 'https://<instance-id>.airtable.com' } }
+    provider :airtable, ENV['AIRTABLE_CLIENT_ID'], ENV['AIRTABLE_CLIENT_SECRET'], { scope: 'data.records:read data.records:write schema.bases:read schema.bases:write' }
   end
 ```
 
@@ -41,7 +41,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do
     env['omniauth.strategy'].options[:client_id] = req.params['client_id']
     env['omniauth.strategy'].options[:client_secret] = req.params['client_secret']
   end
-  provider :airtable, nil, nil, { setup: setup_proc, scope: 'useraccount' }
+  provider :airtable, nil, nil, { setup: setup_proc, scope: 'data.records:read data.records:write schema.bases:read schema.bases:write' }
 end
 ```
 

data/lib/omniauth/strategies/airtable.rb

@@ -76,7 +76,7 @@ module OmniAuth
       end
 
       def callback_url
-        full_host + script_name + callback_path
+        options.redirect_url || (full_host + callback_path)
       end
 
       def basic_auth_header(client_id, client_secret)

data/lib/omniauth-airtable/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module Airtable
-    VERSION = "1.0.0"
+    VERSION = "2.0.0"
   end
 end

data/omniauth-airtable.gemspec

@@ -16,8 +16,11 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = OmniAuth::Airtable::VERSION
 
-  gem.add_dependency 'omniauth', '~> 1.5'
+  gem.required_ruby_version = ">= 3"
+
+  gem.add_dependency 'omniauth', '~> 2.0'
   gem.add_dependency 'omniauth-oauth2', '>= 1.4.0', '< 2.0'
+
   gem.add_development_dependency 'rspec', '~> 3.5'
   gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'

data/spec/omniauth/strategies/airtable_spec.rb

@@ -55,4 +55,26 @@ describe OmniAuth::Strategies::Airtable do
       end
     end
   end
+
+  describe '#callback_url' do
+    let(:base_url) { 'https://example.com' }
+
+    context 'no script name present' do
+      it 'has the correct default callback path' do
+        allow(subject).to receive(:full_host) { base_url }
+        allow(subject).to receive(:script_name) { '' }
+        allow(subject).to receive(:query_string) { '' }
+        expect(subject.callback_url).to eq(base_url + '/auth/airtable/callback')
+      end
+    end
+
+    context 'script name' do
+      it 'should set the callback path with script_name' do
+        allow(subject).to receive(:full_host) { base_url }
+        allow(subject).to receive(:script_name) { '/v1' }
+        allow(subject).to receive(:query_string) { '' }
+        expect(subject.callback_url).to eq(base_url + '/v1/auth/airtable/callback')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-airtable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Quentin Rousseau
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-19 00:00:00.000000000 Z
+date: 2024-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
@@ -125,7 +125,7 @@ homepage: https://github.com/kwent/omniauth-airtable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,15 +133,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.3
+signing_key:
 specification_version: 4
 summary: Official OmniAuth strategy for Airtable.
 test_files: