omniauth-gitlab 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '09a621d84d0ca9c607f349887115c8c243689f8a'
-  data.tar.gz: 9033ecc6420c9821bdd09ae446773d65b266e141
+  metadata.gz: 7c597b6b76d64221a58a0a3667d0db7d3f4cda1e
+  data.tar.gz: 50572bf66940d26d090044206c53c3386bc550fc
 SHA512:
-  metadata.gz: a92f292b33ac370abe67821c10f97aaeb2bd026c2e39cfac74bb740cad9da670d2cdfe1a128d7ee1f560d59b0f798d66637b896eca18511c9957e8b539ebe434
-  data.tar.gz: a20742007b746b20406f8dbcf52775ccdab7618505b7c7f3835eb697df520c2639fdfbbd1f7a8dba2d66e6865a2527142bc577106eed24e8f43527aec0a74589
+  metadata.gz: 93f9e5652960989210433e6b59837106ca1d853ea6559acede43d72ce99061dec9ffbae13897c9b3abea26ba82d7bd28a18f281232c7d7d2da292f57af651ad6
+  data.tar.gz: 889483d8c773d67728714831abaa13d0228feafd88bbcdc2155de0cd643f54ea7e415ef7e6e21f4d9adeeb8b6ad21d0c73dbf3dbab84e382a6320a0032484eda

data/README.md

@@ -41,10 +41,14 @@ Or install it yourself as:
 
 ## Custom scopes
 
+By default, the `api` scope is requested and must be allowed in GitLab's application configuration. To use different scopes:
+
     use OmniAuth::Builder do
       provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'], scope: 'read_user openid'
     end
 
+Requesting a scope that is not configured will result the error "The requested scope is invalid, unknown, or malformed.".
+
 ## Old API version
 
 API V3 will be unsupported from GitLab 9.5 and will be removed in GitLab 9.5 or later.

data/lib/omniauth-gitlab/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Gitlab
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

data/lib/omniauth/strategies/gitlab.rb

@@ -24,11 +24,15 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('user').parsed
+        @raw_info ||= access_token.get(user_endpoint_url).parsed
       end
 
       private
 
+      def user_endpoint_url
+        options.client_options.site.match(%r{v(\d+)/?$}) ? 'user' : '/api/v3/user'
+      end
+
       def callback_url
         options.redirect_url || (full_host + script_name + callback_path)
       end

data/omniauth-gitlab.gemspec

@@ -22,4 +22,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rspec-its', '~> 1.0'
   gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'rake', '>= 12.0'
 end

data/spec/omniauth/strategies/gitlab_spec.rb

@@ -50,9 +50,20 @@ describe OmniAuth::Strategies::GitLab do
   end
 
   describe '#raw_info' do
-    it 'sent request to current user endpoint' do
-      expect(access_token).to receive(:get).with('user').and_return(response)
-      expect(subject.raw_info).to eq(parsed_response)
+    context 'with new configuration' do
+      it 'sent request to current user endpoint' do
+        expect(access_token).to receive(:get).with('user').and_return(response)
+        expect(subject.raw_info).to eq(parsed_response)
+      end
+    end
+
+    context 'with old style configuration' do
+      let(:enterprise_site) { 'https://some.other.site.com/' }
+      subject { enterprise }
+      it 'sent request to current user endpoint' do
+        expect(access_token).to receive(:get).with('/api/v3/user').and_return(response)
+        expect(subject.raw_info).to eq(parsed_response)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitlab
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Sergey Sein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '12.0'
 description: This is the strategy for authenticating to your GitLab service
 email:
 - linchus@gmail.com