omniauth-gitlab 1.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 24e5db0951198ccfb5473ff5fe3a6a626b91edfe
-  data.tar.gz: cb7f0598640a8c6a80245cbb6f5758e53670eef3
+SHA256:
+  metadata.gz: 9f47d5dde46b9dc356bd1ec717ba0b7dc87b49e188b84dcf1617d366709f390f
+  data.tar.gz: 6661be3cca493f7891e4663fead785e36639e121c4dde78b7b61de281dd3b08d
 SHA512:
-  metadata.gz: 2fe15159ccfe5f31ff1266b036aa3b4366623f1c669a69599fa710ac77679093377135aa75d77b8b4446a8dbfcf8635cf1ed7de8e30b561712a45354072bcc44
-  data.tar.gz: 9611dc576bdba0613f62c452bdd4583d5c584c428395062bd732ffe9ea1833a401623daa15c444420f8a9f757391b58a2546ec7da3ba6cce473bb6e7442a07a5
+  metadata.gz: 8c25c70c310391102a0c594ab09b1122e2ca4d8d761a631a7460e04ecce9120bdaa17bc29c3cd40cfbc17b62936c85973c8a10e63d1f6c37d6bbc268175ef33f
+  data.tar.gz: 91165b4ffb9b274608f91a131c4514611536626384ed7ddcfe356bf4b0049bc8b4fb143b6cc159d974d1657a1e5f084d32b4985d215727c15d7d6f45ec12b449

data/README.md

@@ -31,12 +31,39 @@ 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
+
+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.
+
+[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.1'
+    VERSION = '3.0.0'
   end
 end

data/lib/omniauth/strategies/gitlab.rb

@@ -4,21 +4,18 @@ 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',
-          authorize_url: '/oauth/authorize',
-          token_url: '/oauth/token'
-      }
+      option :redirect_url
 
       uid { raw_info['id'].to_s }
 
       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
 
@@ -27,11 +24,16 @@ module OmniAuth
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v3/user').parsed
+        @raw_info ||= access_token.get('user').parsed
+      end
+
+      private
+
+      def callback_url
+        options.redirect_url || (full_host + script_name + callback_path)
       end
     end
   end
 end
 
-
 OmniAuth.config.add_camelization 'gitlab', 'GitLab'

data/omniauth-gitlab.gemspec

@@ -6,22 +6,21 @@ 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']
 
-  gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency 'omniauth-oauth2', '~> 1.0'
+  gem.add_dependency 'omniauth', '~> 2.0'
+  gem.add_dependency 'omniauth-oauth2', '~> 1.7.1'
   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'
+  gem.add_development_dependency 'rake', '>= 12.0'
 end

data/spec/omniauth/strategies/gitlab_spec.rb

@@ -1,23 +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
-                                         }
+    OmniAuth::Strategies::GitLab.new(
+      'GITLAB_KEY',
+      'GITLAB_SECRET',
+      client_options: { site: enterprise_site },
+      redirect_url: 'http://localhost:9292/callback_url'
     )
   end
 
@@ -31,23 +27,31 @@ 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
+
+  describe 'redirect_url' do
+    context 'with defaults' do
+      subject { gitlab_service.options }
+      its(:redirect_url) { is_expected.to be_nil }
+    end
+
+    context 'with customs' do
+      subject { enterprise.options }
+      its(:redirect_url) { is_expected.to eq 'http://localhost:9292/callback_url' }
     end
   end
 
   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.1
+  version: 3.0.0
 platform: ruby
 authors:
-- ssein
+- Sergey Sein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -95,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '12.0'
 description: This is the strategy for authenticating to your GitLab service
 email:
 - linchus@gmail.com
@@ -146,12 +132,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.3
 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: