github.rb in sinatra_auth_github-0.0.14

- old
+ new

@@ -3,11 +3,11 @@
 require 'rest_client'
 
 module Sinatra
   module Auth
     module Github
-      VERSION = "0.0.13"
+      VERSION = "0.0.14"
 
       class BadAuthentication < Sinatra::Base
         get '/unauthenticated' do
           status 403
           "Unable to authenticate, sorry bud."
@@ -34,14 +34,28 @@
         def github_user
           warden.user
         end
 
         def github_request(path)
-          response = RestClient.get("https://github.com/api/v2/json/#{path}", {:accept => :json, :params => {:access_token => github_user.token}})
+          response = RestClient.get "https://github.com/api/v2/json/#{path}", :params => { :access_token => github_user.token }, :accept => :json
           JSON.parse(response.body)
         end
 
+        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)
+        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"])
+        end
+
         def _relative_url_for(path)
           request.script_name + path
         end
       end
 
@@ -52,9 +66,10 @@
           manager.failure_app           = app.github_options[:failure_app] || BadAuthentication
 
           manager[:github_secret]       = app.github_options[:secret]
           manager[:github_scopes]       = app.github_options[:scopes] || 'email,offline_access'
           manager[:github_client_id]    = app.github_options[:client_id]
+          manager[:github_organization] = app.github_options[:organization] || nil
           manager[:github_callback_url] = app.github_options[:callback_url] || '/auth/github/callback'
         end
 
         app.helpers Helpers
 