omniauth-gitlab 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 136ee3cebba142f927c036e6be577c54f914a58df37a4ee5576b49c115a32be3
-  data.tar.gz: 21ff902a4cd932a94b73e26deba00a79bb74f26d34b0de14b64192b981b72b29
+  metadata.gz: c36f216de3933b8e782706e7fe0951a9df1d796df257ddc712398162245c9117
+  data.tar.gz: 45b8a3bfbb477ec3ec98f428bc582db73259528875e08ad38792b78ff23981e1
 SHA512:
-  metadata.gz: b80fc28abd0072f3647df64a8a217320247cdeee58aeed0f199ad202d140ed41c8fb10468ac8c30ccddd7f669b17c33af5e6c2f0d3021c6afaaf5bc927c523a5
-  data.tar.gz: 1360523616245319d90efcf1ed01c4430b3dadcf0505566f2dd284d8904b75ad538cb28031fdd0b90729a8e395f2da95a1b18df9974298b2b5e18d4abaad964b
+  metadata.gz: 66021915a9373712a724e8348bd6948bc0d3c31cd98afbbcdf6bd4b4f20a67a6c4344939e82475c6de8faca1abc1ea99e052f5bb9b85f342544f488d3418e632
+  data.tar.gz: c6d4db7f49f3eb046eb34d17509ee5beabf6ea7e6eb2096e41a5bccdaa3df58a8da37c6f5997a19b835eb08bc38d4d56bcbf280dc0aae7fcbf86975aee19b272

data/README.md

@@ -34,7 +34,7 @@ Or install it yourself as:
       provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'],
         {
            client_options: {
-             site: 'https://gitlab.YOURDOMAIN.com/api/v4'
+             site: 'https://gitlab.YOURDOMAIN.com'
            }
         }
     end

data/lib/omniauth/strategies/gitlab.rb

@@ -27,10 +27,8 @@ module OmniAuth
         @raw_info ||= access_token.get('api/v4/user').parsed
       end
 
-      private
-
       def callback_url
-        options.redirect_url || (full_host + script_name + callback_path)
+        options.redirect_url || (full_host + callback_path)
       end
     end
   end

data/lib/omniauth-gitlab/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Gitlab
-    VERSION = '4.0.0'
+    VERSION = '4.1.0'
   end
 end

data/omniauth-gitlab.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'omniauth', '~> 2.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
+  gem.add_dependency 'omniauth-oauth2', '~> 1.8.0'
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rspec-its', '~> 1.0'
   gem.add_development_dependency 'simplecov'

data/spec/omniauth/strategies/gitlab_spec.rb

@@ -5,7 +5,7 @@ describe OmniAuth::Strategies::GitLab do
   let(:parsed_response) { double('ParsedResponse') }
   let(:response) { double('Response', parsed: parsed_response) }
 
-  let(:enterprise_site) { 'https://some.other.site.com/api/v3' }
+  let(:enterprise_site) { 'https://some.other.site.com' }
 
   let(:gitlab_service) { OmniAuth::Strategies::GitLab.new({}) }
   let(:enterprise) do
@@ -55,4 +55,26 @@ describe OmniAuth::Strategies::GitLab do
       expect(subject.raw_info).to eq(parsed_response)
     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/gitlab/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/gitlab/callback')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitlab
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Sergey Sein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement