omniauth-gitlab 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 167ea9851f6d073cf7f20a5b52bc49012cb9974f
-  data.tar.gz: 63901981942a3047eed7c2d5097abb61f5c33a8a
+  metadata.gz: a198a18e23071e86551c6da0347caadaf5e02f88
+  data.tar.gz: fd1443f67e8224c237f3d947283b5a9286731f70
 SHA512:
-  metadata.gz: 1984ae2b2b9d636bebdf04013bba916578263dcab2499054d035e81f1ce94468cacc57fee9d849607d75482b3588301f2150c40dba15f091fc5e20b018b60855
-  data.tar.gz: 2c3ec21dd67e92e3a49057daa6fc9445fc37692b2f702875e38008f78a9ba7a9c23ab5bbc6aa3e7be47c89c7a55c41b83970bbbc2b591fd6e11d9d8664eec9ac
+  metadata.gz: 8f62fab0475285f7daa0e4c6ea1f23bcc0979dd88292d1b7e2a0fa8930542f162fb31b0a3392577887a41ae959eafd3da7d64583747ef1cd27c4d4a84a930996
+  data.tar.gz: af2a55b71ae642e9629d61a0db2e2f78aa84758e0cb09ddd7ceaca9022c8261a9871645b0f72870a62b5fff9c80c60f92ea15f153ac245a4ab5fbd8054fd0dc1

data/lib/omniauth-gitlab/version.rb

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

data/lib/omniauth/strategies/gitlab.rb

@@ -1,5 +1,6 @@
 require 'faraday'
 require 'multi_json'
+require 'omniauth'
 
 module OmniAuth
   module Strategies
@@ -19,8 +20,8 @@ module OmniAuth
           options[:on_login].call(self.env)
         else
           form = OmniAuth::Form.new(:title =>  (options[:title] || "Gitlab Verification"), :url => callback_path)
-          
-          form.text_field 'Email', 'email'
+
+          form.text_field 'Username or e-mail', 'login'
           form.password_field 'Password', 'password'
           form.button "Sign In"
           form.to_response
@@ -31,38 +32,47 @@ module OmniAuth
         return fail!(:invalid_credentials) unless identity
         super
       end
-      
+
       uid{ identity['id'].to_s }
       info do
         {
           :name => identity['name'],
           :email => identity['email'],
           :nickname => identity['username']
-        } 
+        }
       end
-      
+
       credentials do
         { :token => identity['private_token'] }
       end
-      
-      extra do 
+
+      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 = { :email => request['email'], :password => request['password'] }
+            req.params = {
+              key  => request['login'],
+              :password => request['password']
+            }
           end
           resp.success? ? MultiJson.decode(resp.body) : nil
-        end 
+        end
+      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}/)
       end
     end
   end
 end
 
 
-OmniAuth.config.add_camelization 'gitlab', 'GitLab'
+OmniAuth.config.add_camelization 'gitlab', 'GitLab'

data/omniauth-gitlab.gemspec

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

data/spec/omniauth/strategies/gitlab_spec.rb

@@ -2,9 +2,9 @@ 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
@@ -31,8 +31,8 @@ describe OmniAuth::Strategies::GitLab do
   end
 
   describe '#callback_phase' do
-    
-    context 'with valid credentials' 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'}).
@@ -45,9 +45,9 @@ describe OmniAuth::Strategies::GitLab do
                                 "created_at": "2012-05-23T08:00:58Z",
                                 "blocked": true
                             }')
-        post '/auth/gitlab/callback', :email => 'john@test.com', :password => 'awesome'
+        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
@@ -57,27 +57,57 @@ describe OmniAuth::Strategies::GitLab do
       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
+    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
+
+      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.nickname.should eq 'john_smith'
+        auth_hash.info.name.should eq 'John Smith'
       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', :email => 'john@test.com', :password => 'incorrect'
+        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      
+      end
 
     end
   end
-  
-end
+
+end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-gitlab
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ssein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.6
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 - !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
     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: 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
@@ -115,9 +115,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .project
-- .rspec
+- ".gitignore"
+- ".project"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -137,20 +137,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.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: