omniauth-github-organization 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0de1670bdccb65312021de8fa605c7b1f916927d461e254bedcf78e6705809c7
-  data.tar.gz: 52d3f97602da9b052a931efbf83ce0bdf61b78fd6e3ae0f86274ea6503693c44
+  metadata.gz: 811e39bdf5700e014003066910ba4001ddc406022ab790dbaae64fc11f397e63
+  data.tar.gz: e85af1b4235f3ea36f4d0abff772b14110c64cf06f5c13b434fa7a6f872a78b4
 SHA512:
-  metadata.gz: 14bc8f4374cf6646f01de5c0aabbc57591ad727c9cc0b8c6a0428ba565a4518ee16889f2e21e7503f48786a588290c0659f8216cc0bfab1f5a2084aa649968ca
-  data.tar.gz: 131fae3accfb3fe29ef2fb1eed03aa51f605e0787b900301f9fb37477345b26c260a5eb505594c7dfd6a1d13a6f8cfbf5398ed993aa9f647d635cdb54615454b
+  metadata.gz: a71d07929ec95de6600df0357a5bf6a2a47d9aecdc3ff14960ef5ce5ba4a7cad3d293fe8c5c4c7cee63fc042ad969193b5840f2211365009bef24f9926e6af83
+  data.tar.gz: 674b7fb11efed63f852fc2e08110c53717f6ef5a2943bfd5432f304c98221fcac8149aaed7a58613ec36abc0e9b4cc5894d72ed2207563690679d5521498eee1

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

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

data/lib/omniauth/strategies/github_organization.rb

@@ -28,25 +28,14 @@ module OmniAuth
       end
 
       def callback_phase
-        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)
+        super
+        raise(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'] }
       end
 
       uid { raw_info['id'].to_s }

data/spec/omniauth/strategies/github_organization_spec.rb

@@ -31,9 +31,7 @@ describe OmniAuth::Strategies::GitHubOrganization do
     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

metadata

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