omniauth-gitlab 3.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f47d5dde46b9dc356bd1ec717ba0b7dc87b49e188b84dcf1617d366709f390f
-  data.tar.gz: 6661be3cca493f7891e4663fead785e36639e121c4dde78b7b61de281dd3b08d
+  metadata.gz: c36f216de3933b8e782706e7fe0951a9df1d796df257ddc712398162245c9117
+  data.tar.gz: 45b8a3bfbb477ec3ec98f428bc582db73259528875e08ad38792b78ff23981e1
 SHA512:
-  metadata.gz: 8c25c70c310391102a0c594ab09b1122e2ca4d8d761a631a7460e04ecce9120bdaa17bc29c3cd40cfbc17b62936c85973c8a10e63d1f6c37d6bbc268175ef33f
-  data.tar.gz: 91165b4ffb9b274608f91a131c4514611536626384ed7ddcfe356bf4b0049bc8b4fb143b6cc159d974d1657a1e5f084d32b4985d215727c15d7d6f45ec12b449
+  metadata.gz: 66021915a9373712a724e8348bd6948bc0d3c31cd98afbbcdf6bd4b4f20a67a6c4344939e82475c6de8faca1abc1ea99e052f5bb9b85f342544f488d3418e632
+  data.tar.gz: c6d4db7f49f3eb046eb34d17509ee5beabf6ea7e6eb2096e41a5bccdaa3df58a8da37c6f5997a19b835eb08bc38d4d56bcbf280dc0aae7fcbf86975aee19b272

data/.github/workflows/ruby.yml

@@ -0,0 +1,21 @@
+name: CI 
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: ['2.6', '2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby ${{ matrix.ruby-version }}
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # 'bundle install' and cache
+    - name: Run specs 
+      run: |
+        bundle exec rspec

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

@@ -4,7 +4,7 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class GitLab < OmniAuth::Strategies::OAuth2
-      option :client_options, site: 'https://gitlab.com/api/v4'
+      option :client_options, site: 'https://gitlab.com'
 
       option :redirect_url
 
@@ -24,13 +24,11 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('user').parsed
+        @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 = '3.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
@@ -27,7 +27,7 @@ describe OmniAuth::Strategies::GitLab do
     context 'with defaults' do
       subject { gitlab_service.options.client_options }
 
-      its(:site) { is_expected.to eq 'https://gitlab.com/api/v4' }
+      its(:site) { is_expected.to eq 'https://gitlab.com' }
     end
 
     context 'with override' do
@@ -51,8 +51,30 @@ describe OmniAuth::Strategies::GitLab do
 
   describe '#raw_info' do
     it 'sent request to current user endpoint' do
-      expect(access_token).to receive(:get).with('user').and_return(response)
+      expect(access_token).to receive(:get).with('api/v4/user').and_return(response)
       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: 3.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Sergey Sein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-12 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
@@ -101,6 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".project"
 - ".rspec"
@@ -132,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: This is the strategy for authenticating to your GitLab service