sinatra_auth_github 0.0.15 → 0.0.16

data/lib/sinatra/auth/github.rb

@@ -35,23 +35,34 @@ module Sinatra
           warden.user
         end
 
+        # API Requests
         def github_request(path)
           response = RestClient.get "https://github.com/api/v2/json/#{path}", :params => { :access_token => github_user.token }, :accept => :json
           JSON.parse(response.body)
         end
 
+        # Access Inquiries
+        def github_organization_access?(name)
+          orgs = github_request("user/show/#{github_user.login}/organizations")["organizations"]
+          orgs.map { |org| org["login"] }.include?(name)
+        end
+
+        def github_organization_team_access?(name, team)
+          members = github_request("teams/#{team}/members")["users"]
+          members.map { |user| user["login"] }.include?(github_user.login)
+        rescue RestClient::Unauthorized => e
+          false
+        end
+
+        # Auth only certain individuals
         def github_organization_authenticate!(name)
           authenticate!
-          orgs = github_request("user/show/#{github_user.login}/organizations")["organizations"]
-          halt([401, "Unauthorized User"]) unless orgs.map { |org| org["login"] }.include?(name)
+          halt([401, "Unauthorized User"]) unless github_organization_access?(name)
         end
 
         def github_organization_team_authenticate!(name, team)
           authenticate!
-          members = github_request("teams/#{team}/members")["users"]
-          halt([401, "Unauthorized User"]) unless members.map { |user| user["login"] }.include?(github_user.login)
-        rescue RestClient::Unauthorized => e
-          halt([401, "Unauthorized User"])
+          halt([401, "Unauthorized User"]) unless github_organization_team_access?(name, team)
         end
 
         def _relative_url_for(path)

data/sinatra_auth_github.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sinatra_auth_github"
-  s.version     = "0.0.15"
+  s.version     = "0.0.16"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Corey Donohoe"]
   s.email       = ["atmos@atmos.org"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_auth_github
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 0
-  - 15
-  version: 0.0.15
+  - 16
+  version: 0.0.16
 platform: ruby
 authors: 
 - Corey Donohoe