omniauth-gitlab 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c90ebc7ccce82e78ef6218157792adbf2a8be97
-  data.tar.gz: 78aa9a9c27a1b99fe18a70cc619547552af6b88c
+  metadata.gz: '09a621d84d0ca9c607f349887115c8c243689f8a'
+  data.tar.gz: 9033ecc6420c9821bdd09ae446773d65b266e141
 SHA512:
-  metadata.gz: 46f9f7128e336fb1f6c11050982378c633ef5a2702db33f8d8acaed89669b85d6d40ce39c9ba525840ed9a6918c20a44c0ed04d54dfe169fe82ebc8995ba83e8
-  data.tar.gz: f9712c2a6af44bd34cfc20abb593576acf05aaa2f2aa646536fd034267e2acb872235811376d3cad91669f9caa255f6abda976b2010c2c49ef43b060f752b2b5
+  metadata.gz: a92f292b33ac370abe67821c10f97aaeb2bd026c2e39cfac74bb740cad9da670d2cdfe1a128d7ee1f560d59b0f798d66637b896eca18511c9957e8b539ebe434
+  data.tar.gz: a20742007b746b20406f8dbcf52775ccdab7618505b7c7f3835eb697df520c2639fdfbbd1f7a8dba2d66e6865a2527142bc577106eed24e8f43527aec0a74589

data/README.md

@@ -31,12 +31,35 @@ Or install it yourself as:
 ## Standalone Usage
 
     use OmniAuth::Builder do
-      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'], 
-                                client_options: {
-                                     site: 'https://gitlab.YOURDOMAIN.com',
-                                     authorize_url: '/oauth/authorize',
-                                     token_url: '/oauth/token'
-                                 }      
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'],
+        {
+           client_options: {
+             site: 'https://gitlab.YOURDOMAIN.com/api/v4'
+           }
+        }
+    end
+
+## Custom scopes
+
+    use OmniAuth::Builder do
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'], scope: 'read_user openid'
+    end
+
+## Old API version
+
+API V3 will be unsupported from GitLab 9.5 and will be removed in GitLab 9.5 or later.
+
+[https://gitlab.com/help/api/v3_to_v4.md](https://gitlab.com/help/api/v3_to_v4.md)
+
+If you use GitLab 9.0 and below you could configure V3 API:
+
+    use OmniAuth::Builder do
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET'],
+        {
+           client_options: {
+             site: 'https://gitlab.YOURDOMAIN.com/api/v3'
+           }
+        }
     end
 
 ## Contributing

data/Rakefile

@@ -1,7 +1,7 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new
 
 desc 'Run specs'
-task :default => :spec
+task default: :spec

data/lib/omniauth-gitlab.rb

@@ -1,2 +1,2 @@
-require "omniauth-gitlab/version"
+require 'omniauth-gitlab/version'
 require 'omniauth/strategies/gitlab'

data/lib/omniauth-gitlab/version.rb

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

data/lib/omniauth/strategies/gitlab.rb

@@ -4,12 +4,7 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class GitLab < OmniAuth::Strategies::OAuth2
-
-      option :client_options, {
-          site: 'https://gitlab.com',
-          authorize_url: '/oauth/authorize',
-          token_url: '/oauth/token'
-      }
+      option :client_options, site: 'https://gitlab.com/api/v4'
 
       option :redirect_url
 
@@ -17,10 +12,10 @@ module OmniAuth
 
       info do
         {
-            name:     raw_info['name'],
-            username: raw_info['username'],
-            email:    raw_info['email'],
-            image:    raw_info['avatar_url']
+          name: raw_info['name'],
+          username: raw_info['username'],
+          email: raw_info['email'],
+          image: raw_info['avatar_url']
         }
       end
 
@@ -29,7 +24,7 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v3/user').parsed
+        @raw_info ||= access_token.get('user').parsed
       end
 
       private
@@ -41,5 +36,4 @@ module OmniAuth
   end
 end
 
-
 OmniAuth.config.add_camelization 'gitlab', 'GitLab'

data/omniauth-gitlab.gemspec

@@ -6,14 +6,14 @@ require 'omniauth-gitlab/version'
 Gem::Specification.new do |gem|
   gem.name          = 'omniauth-gitlab'
   gem.version       = Omniauth::Gitlab::VERSION
-  gem.authors       = ['ssein']
+  gem.authors       = ['Sergey Sein']
   gem.email         = ['linchus@gmail.com']
-  gem.description   = %q{This is the strategy for authenticating to your GitLab service}
-  gem.summary       = %q{This is the strategy for authenticating to your GitLab service}
+  gem.description   = 'This is the strategy for authenticating to your GitLab service'
+  gem.summary       = 'This is the strategy for authenticating to your GitLab service'
   gem.homepage      = 'https://github.com/linchus/omniauth-gitlab'
 
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
@@ -21,7 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'omniauth-oauth2', '~> 1.0'
   gem.add_development_dependency 'rspec', '~> 3.1'
   gem.add_development_dependency 'rspec-its', '~> 1.0'
-  gem.add_development_dependency 'rack-test'
   gem.add_development_dependency 'simplecov'
-  gem.add_development_dependency 'webmock'
 end

data/spec/omniauth/strategies/gitlab_spec.rb

@@ -1,24 +1,19 @@
 require 'spec_helper'
 
 describe OmniAuth::Strategies::GitLab do
-
   let(:access_token) { double('AccessToken') }
   let(:parsed_response) { double('ParsedResponse') }
   let(:response) { double('Response', parsed: parsed_response) }
 
-  let(:enterprise_site)           { 'https://some.other.site.com/api/v3' }
-  let(:enterprise_authorize_url)  { '/oauth/authorize' }
-  let(:enterprise_token_url)      { '/oauth/access_token' }
+  let(:enterprise_site) { 'https://some.other.site.com/api/v3' }
 
   let(:gitlab_service) { OmniAuth::Strategies::GitLab.new({}) }
   let(:enterprise) do
-    OmniAuth::Strategies::GitLab.new('GITLAB_KEY', 'GITLAB_SECRET',
-                                         client_options: {
-                                             site: enterprise_site,
-                                             authorize_url: enterprise_authorize_url,
-                                             token_url: enterprise_token_url
-                                         },
-                                         redirect_url: 'http://localhost:9292/callback_url'
+    OmniAuth::Strategies::GitLab.new(
+      'GITLAB_KEY',
+      'GITLAB_SECRET',
+      client_options: { site: enterprise_site },
+      redirect_url: 'http://localhost:9292/callback_url'
     )
   end
 
@@ -32,17 +27,13 @@ describe OmniAuth::Strategies::GitLab do
     context 'with defaults' do
       subject { gitlab_service.options.client_options }
 
-      its(:site) { is_expected.to eq 'https://gitlab.com' }
-      its(:authorize_url) { is_expected.to eq '/oauth/authorize' }
-      its(:token_url) { is_expected.to eq '/oauth/token' }
+      its(:site) { is_expected.to eq 'https://gitlab.com/api/v4' }
     end
 
     context 'with override' do
       subject { enterprise.options.client_options }
 
       its(:site) { is_expected.to eq enterprise_site }
-      its(:authorize_url) { is_expected.to eq enterprise_authorize_url }
-      its(:token_url) { is_expected.to eq enterprise_token_url }
     end
   end
 
@@ -60,7 +51,7 @@ describe OmniAuth::Strategies::GitLab do
 
   describe '#raw_info' do
     it 'sent request to current user endpoint' do
-      expect(access_token).to receive(:get).with('/api/v3/user').and_return(response)
+      expect(access_token).to receive(:get).with('user').and_return(response)
       expect(subject.raw_info).to eq(parsed_response)
     end
   end

data/spec/spec_helper.rb

@@ -1,18 +1,8 @@
-$:.unshift File.expand_path('..', __FILE__)
-$:.unshift File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift File.expand_path('..', __FILE__)
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
 require 'rspec/its'
-require 'rack/test'
-require 'webmock/rspec'
 require 'omniauth'
 require 'omniauth-gitlab'
-
-RSpec.configure do |config|
-  config.include WebMock::API
-  config.include Rack::Test::Methods
-  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
-end
-
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitlab
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
-- ssein
+- Sergey Sein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-13 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: This is the strategy for authenticating to your GitLab service
 email:
 - linchus@gmail.com
@@ -147,11 +119,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: This is the strategy for authenticating to your GitLab service
 test_files:
 - spec/omniauth/strategies/gitlab_spec.rb
 - spec/spec_helper.rb
-has_rdoc: