omniauth-github-organization 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f622b7bb7d431b7b0cc18aa1f8542cee4c0316c7864b2d8bad55c3c46ea12996
-  data.tar.gz: 1599886d8c96e9a9d303be6fec714e63a7bb21272f0f03f736cdca64c00a9aaf
+  metadata.gz: 0de1670bdccb65312021de8fa605c7b1f916927d461e254bedcf78e6705809c7
+  data.tar.gz: 52d3f97602da9b052a931efbf83ce0bdf61b78fd6e3ae0f86274ea6503693c44
 SHA512:
-  metadata.gz: 87e4307ee5ee1e6daac28f6d08bd2f3b4697ed8fb72ffb89728d411eb427d53563314ab0037af11972ad46962e23514d0c2573c8785a71fdbe18e431b94a205d
-  data.tar.gz: 05d1fc1239e1b2307bfede0a1368a03b97a834c3c14631ef08e7fabd643d18b8cf7943041469ea11a301c3f8701c7a0338f086c6c5846620fdd64e6f3d7e6db9
+  metadata.gz: 14bc8f4374cf6646f01de5c0aabbc57591ad727c9cc0b8c6a0428ba565a4518ee16889f2e21e7503f48786a588290c0659f8216cc0bfab1f5a2084aa649968ca
+  data.tar.gz: 131fae3accfb3fe29ef2fb1eed03aa51f605e0787b900301f9fb37477345b26c260a5eb505594c7dfd6a1d13a6f8cfbf5398ed993aa9f647d635cdb54615454b

data/lib/omniauth-github-organization/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GitHubOrganization
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.1.2'.freeze
   end
 end

data/lib/omniauth/strategies/github_organization.rb

@@ -28,14 +28,25 @@ module OmniAuth
       end
 
       def callback_phase
-        super
-        return fail!(:user_denied, CallbackError.new(:user_denied, options['organization'])) unless organizations.include? options['organization']
-      end
-
-      def organizations
-        access_token.options[:mode] = :query
-        organizations = access_token.get('user/orgs', headers: { 'Accept' => 'application/vnd.github.v3' }).parsed
-        organizations.map { |x| x['login'] }
+        error = request.params["error_reason"] || request.params["error"]
+        if error
+          fail!(error, CallbackError.new(request.params["error"], request.params["error_description"] || request.params["error_reason"], request.params["error_uri"]))
+        elsif !options.provider_ignores_state && (request.params["state"].to_s.empty? || request.params["state"] != session.delete("omniauth.state"))
+          fail!(:csrf_detected, CallbackError.new(:csrf_detected, "CSRF detected"))
+        else
+          self.access_token = build_access_token
+          self.access_token = access_token.refresh! if access_token.expired?
+          self.access_token.options[:mode] = :query
+          organizations = self.access_token.get('user/orgs', headers: { 'Accept' => 'application/vnd.github.v3' }).parsed
+          fail!(:user_denied, CallbackError.new(:user_denied, options['organization'])) unless  organizations.map { |x| x['login'] }.include? options['organization']
+          super
+        end
+      rescue ::OAuth2::Error, CallbackError => e
+        fail!(:invalid_credentials, e)
+      rescue ::Timeout::Error, ::Errno::ETIMEDOUT => e
+        fail!(:timeout, e)
+      rescue ::SocketError => e
+        fail!(:failed_to_connect, e)
       end
 
       uid { raw_info['id'].to_s }
@@ -46,7 +57,6 @@ module OmniAuth
           'email' => email,
           'name' => raw_info['name'],
           'image' => raw_info['avatar_url'],
-          'organizations' => organizations,
           'urls' => {
             'GitHub' => raw_info['html_url'],
             'Blog' => raw_info['blog'],

data/spec/omniauth/strategies/github_organization_spec.rb

@@ -26,10 +26,15 @@ describe OmniAuth::Strategies::GitHubOrganization do
   end
 
   before(:each) do
+    OmniAuth.config.test_mode = true
     allow(subject).to receive(:access_token).and_return(access_token)
     allow(subject).to receive(:organizations).and_return(%w[example test])
   end
 
+  after do
+    OmniAuth.config.test_mode = false
+  end
+
   context 'client options' do
     it 'should have correct site' do
       expect(subject.options.client_options.site).to eq('https://api.github.com')
@@ -169,10 +174,4 @@ describe OmniAuth::Strategies::GitHubOrganization do
     end
   end
 
-  it 'is should return error if organization not match' do
-    allow(subject).to receive(:organizations).and_return(%w[not_match])
-    expect(subject).to receive(:fail!).with(:user_denied, anything)
-    subject.callback_phase
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-github-organization
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Boris Ding