omniauth-gitlab 0.0.6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a198a18e23071e86551c6da0347caadaf5e02f88
-  data.tar.gz: fd1443f67e8224c237f3d947283b5a9286731f70
+  metadata.gz: 0d93eb381f07c12f9df411be7caf637e000cb806
+  data.tar.gz: 630aa5b0f829f7dee788c4cdb7539d0b5055ec70
 SHA512:
-  metadata.gz: 8f62fab0475285f7daa0e4c6ea1f23bcc0979dd88292d1b7e2a0fa8930542f162fb31b0a3392577887a41ae959eafd3da7d64583747ef1cd27c4d4a84a930996
-  data.tar.gz: af2a55b71ae642e9629d61a0db2e2f78aa84758e0cb09ddd7ceaca9022c8261a9871645b0f72870a62b5fff9c80c60f92ea15f153ac245a4ab5fbd8054fd0dc1
+  metadata.gz: 36e720d845afad73f409de4014dd9ef5ed88288c850fc92411fc169042e63823d8182e75c90546accc1a559c477f76e1da064e789274dde9e245a03213ab3f94
+  data.tar.gz: 64568a2529f5631d33309e7b740498906015382809f348a1a1830609165a6de3451e5adfd54758050a7dcc58af13ea37179717c12b6a29ad679e66f6d04701e2

data/README.md

@@ -1,8 +1,11 @@
 # Omniauth::Gitlab
 
-This is the strategy for authenticating to your GitLab service. To
-use it, you'll need to set gitlab url.
+This is the OAuth2 strategy for authenticating to your GitLab service.
 
+## Requirements
+
+Gitlab 7.7.0+
+ 
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,10 +23,19 @@ Or install it yourself as:
 ## Basic Usage
 
     use OmniAuth::Builder do
-      provider :gitlab, :site => 'https://your.git.lab.com/', :v => 'v3'
+      provider :gitlab, ENV['GITLAB_KEY'], ENV['GITLAB_SECRET']
     end
 
-Default value for :v parameter is 'v3'.
+## 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'
+                                 }      
+    end
 
 ## Contributing
 

data/lib/omniauth/strategies/gitlab.rb

@@ -1,74 +1,32 @@
-require 'faraday'
-require 'multi_json'
-require 'omniauth'
+
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class GitLab
-      include OmniAuth::Strategy
-
-      option :fields, [:email]
-      option :site, nil
-      option :v, 'v3'
-      option :uid_field, :email
-      option :on_login, nil
-      option :on_registration, nil
-      option :on_failed_registration, nil
+    class GitLab < OmniAuth::Strategies::OAuth2
 
-      def request_phase
-        if options[:on_login]
-          options[:on_login].call(self.env)
-        else
-          form = OmniAuth::Form.new(:title =>  (options[:title] || "Gitlab Verification"), :url => callback_path)
+      option :client_options, {
+          site: 'https://gitlab.com',
+          authorize_url: '/oauth/authorize',
+          token_url: '/oauth/token'
+      }
 
-          form.text_field 'Username or e-mail', 'login'
-          form.password_field 'Password', 'password'
-          form.button "Sign In"
-          form.to_response
-        end
-      end
-
-      def callback_phase
-        return fail!(:invalid_credentials) unless identity
-        super
-      end
+      uid { raw_info['id'].to_s }
 
-      uid{ identity['id'].to_s }
       info do
         {
-          :name => identity['name'],
-          :email => identity['email'],
-          :nickname => identity['username']
+            name:     raw_info['name'],
+            username: raw_info['username'],
+            email:    raw_info['email']
         }
       end
 
-      credentials do
-        { :token => identity['private_token'] }
-      end
-
       extra do
-        { :raw_info => identity }
-      end
-
-      def identity
-        @identity ||= begin
-          conn = Faraday.new(:url => options[:site])
-          key = is_email?(request['login']) ? :email : :login
-          resp = conn.post do |req|
-            req.url "/api/#{options[:v]}/session"
-            req.headers['Content-Type'] = 'application/json'
-            req.params = {
-              key  => request['login'],
-              :password => request['password']
-            }
-          end
-          resp.success? ? MultiJson.decode(resp.body) : nil
-        end
+        { raw_info: raw_info }
       end
 
-      # check if login string looks like email
-      def is_email?(str)
-        str.match(/[a-zA-Z0-9._%]@(?:[a-zA-Z0-9]+\.)[a-zA-Z]{2,4}/)
+      def raw_info
+        @raw_info ||= access_token.get('/api/v3/user').parsed
       end
     end
   end

data/lib/omniauth-gitlab/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Gitlab
-    VERSION = "0.0.6"
+    VERSION = "1.0.0"
   end
 end

data/omniauth-gitlab.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'omniauth', '~> 1.0'
-  gem.add_dependency "faraday", "~> 0.9.0"
-  gem.add_dependency 'multi_json', '~> 1.0'
-  gem.add_development_dependency 'rspec', '~> 2.7'
+  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'

data/spec/omniauth/strategies/gitlab_spec.rb

@@ -1,113 +1,54 @@
 require 'spec_helper'
 
 describe OmniAuth::Strategies::GitLab do
-  attr_accessor :app
 
-  let(:auth_hash){ last_response.headers['env']['omniauth.auth'] }
-
-  def set_app!(gitlab_options = {})
-    old_app = self.app
-    self.app = Rack::Builder.app do
-      use Rack::Session::Cookie
-      use OmniAuth::Strategies::GitLab, {:site => 'http://some.site.com/'  }.merge(gitlab_options)
-      run lambda{|env| [404, {'env' => env}, ["HELLO!"]]}
-    end
-    if block_given?
-      yield
-      self.app = old_app
-    end
-    self.app
+  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(: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
+                                         }
+    )
   end
 
-  before(:all) do
-    set_app!
-  end
+  subject { gitlab_service }
 
-  describe '#request_phase' do
-    it 'should display a form' do
-      get '/auth/gitlab'
-      last_response.body.should be_include("<form")
-    end
+  before(:each) do
+    allow(subject).to receive(:access_token).and_return(access_token)
   end
 
-  describe '#callback_phase' do
-
-    context 'with valid credentials using email' do
-      before do
-       stub_request(:post, "http://some.site.com/api/v3/session?email=john@test.com&password=awesome").
-         with(:headers => {'Content-Type'=>'application/json'}).
-         to_return(:status => 200, :body => '{
-                                "id": 1,
-                                "username": "john_smith",
-                                "email": "john@example.com",
-                                "name": "John Smith",
-                                "private_token": "dd34asd13as",
-                                "created_at": "2012-05-23T08:00:58Z",
-                                "blocked": true
-                            }')
-        post '/auth/gitlab/callback', :login => 'john@test.com', :password => 'awesome'
-      end
-
-      it 'should populate the auth hash' do
-        auth_hash.should be_kind_of(Hash)
-      end
+  describe 'client options' do
+    context 'with defaults' do
+      subject { gitlab_service.options.client_options }
 
-      it 'should populate the uid' do
-        auth_hash['uid'].should eq '1'
-      end
-
-      it 'should populate the info hash' do
-        auth_hash.info.email.should eq 'john@example.com'
-        auth_hash.info.nickname.should eq 'john_smith'
-        auth_hash.info.name.should eq 'John Smith'
-      end
+      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' }
     end
 
-    context 'with valid credentials using login' do
-      before do
-       stub_request(:post, "http://some.site.com/api/v3/session?login=john_smith&password=awesome").
-         with(:headers => {'Content-Type'=>'application/json'}).
-         to_return(:status => 200, :body => '{
-                                "id": 1,
-                                "username": "john_smith",
-                                "email": "john@example.com",
-                                "name": "John Smith",
-                                "private_token": "dd34asd13as",
-                                "created_at": "2012-05-23T08:00:58Z",
-                                "blocked": true
-                            }')
-        post '/auth/gitlab/callback', :login => 'john_smith', :password => 'awesome'
-      end
-
-      it 'should populate the auth hash' do
-        auth_hash.should be_kind_of(Hash)
-      end
+    context 'with override' do
+      subject { enterprise.options.client_options }
 
-      it 'should populate the uid' do
-        auth_hash['uid'].should eq '1'
-      end
-
-      it 'should populate the info hash' do
-        auth_hash.info.email.should eq 'john@example.com'
-        auth_hash.info.nickname.should eq 'john_smith'
-        auth_hash.info.name.should eq 'John Smith'
-      end
+      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
 
-    context 'with invalid credentials' do
-      before do
-       stub_request(:post, "http://some.site.com/api/v3/session?email=john@test.com&password=incorrect").
-         with(:headers => {'Content-Type'=>'application/json'}).
-         to_return(:status => 401, :body => '{"message":"401Unauthorized"}')
-        post '/auth/gitlab/callback', :login => 'john@test.com', :password => 'incorrect'
-      end
-
-      it 'should fail with :invalid_credentials' do
-        last_response.should be_redirect
-        last_response.headers['Location'].should eq "/auth/failure?message=invalid_credentials&strategy=gitlab"
-      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(subject.raw_info).to eq(parsed_response)
     end
   end
-
 end

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
 SimpleCov.start
 require 'rspec'
+require 'rspec/its'
 require 'rack/test'
 require 'webmock/rspec'
 require 'omniauth'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 1.0.0
 platform: ruby
 authors:
 - ssein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-19 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -25,47 +25,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
+        version: '3.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement