sinatra_auth_github 0.5.3 → 0.5.4

data/lib/sinatra/auth/github.rb

@@ -58,15 +58,6 @@ module Sinatra
           warden.user
         end
 
-        def github_api_uri
-          if ENV['GITHUB_OAUTH_API_DOMAIN']
-            ENV['GITHUB_OAUTH_API_DOMAIN']
-          else
-            uri = URI.parse(env['warden'].config[:github_oauth_domain])
-            "#{uri.scheme}://api.#{uri.host}"
-          end
-        end
-
         # Send a V3 API GET request to path
         #
         # path - the path on api.github.com to hit
@@ -77,7 +68,7 @@ module Sinatra
         #   github_raw_request("/user")
         #   # => RestClient::Response
         def github_raw_request(path)
-          RestClient.get("#{github_api_uri}/#{path}", :params => { :access_token => github_user.token }, :accept => :json)
+          github_user.github_raw_request(path)
         end
 
         # Send a V3 API GET request to path and parse the response body
@@ -90,7 +81,7 @@ module Sinatra
         #   github_request("/user")
         #   # => { 'login' => 'atmos', ... }
         def github_request(path)
-          Yajl.load(github_raw_request(path))
+          github_user.github_request(path)
         end
 
         # See if the user is a public member of the named organization
@@ -99,10 +90,7 @@ module Sinatra
         #
         # Returns: true if the user is public access, false otherwise
         def github_public_organization_access?(name)
-          orgs = github_request("orgs/#{name}/public_members")
-          orgs.map { |org| org["login"] }.include?(github_user.login)
-        rescue RestClient::Forbidden, RestClient::Unauthorized, RestClient::ResourceNotFound => e
-          false
+          github_user.publicized_organization_member?(name)
         end
 
         # See if the user is a member of the named organization
@@ -111,10 +99,7 @@ module Sinatra
         #
         # Returns: true if the user has access, false otherwise
         def github_organization_access?(name)
-          orgs = github_request("orgs/#{name}/members")
-          orgs.map { |org| org["login"] }.include?(github_user.login)
-        rescue RestClient::Forbidden, RestClient::Unauthorized, RestClient::ResourceNotFound => e
-          false
+          github_user.organization_member?(name)
         end
 
         # See if the user is a member of the team id
@@ -123,10 +108,7 @@ module Sinatra
         #
         # Returns: true if the user has access, false otherwise
         def github_team_access?(team_id)
-          members = github_request("teams/#{team_id}/members")
-          members.map { |user| user["login"] }.include?(github_user.login)
-        rescue RestClient::Forbidden, RestClient::Unauthorized, RestClient::ResourceNotFound => e
-          false
+          github_user.team_member?(team_id)
         end
 
         # Enforce user membership to the named organization

data/lib/sinatra/auth/github/version.rb

@@ -1,7 +1,7 @@
 module Sinatra
   module Auth
     module Github
-      VERSION = "0.5.3"
+      VERSION = "0.5.4"
     end
   end
 end

data/sinatra_auth_github.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "sinatra",       "~>1.0"
   s.add_dependency "yajl-ruby",     "~>1.1"
   s.add_dependency "rest-client",   "~>1.6.1"
-  s.add_dependency "warden-github", "~>0.4.4"
+  s.add_dependency "warden-github", "~>0.5.0"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec",     "~>2.0.0"

data/spec/app.rb

@@ -6,6 +6,7 @@ module Example
     enable :sessions
 
     set :github_options, {
+      :scopes    => "user",
       :secret    => ENV['GITHUB_CLIENT_SECRET'],
       :client_id => ENV['GITHUB_CLIENT_ID'],
     }
@@ -24,15 +25,19 @@ module Example
     end
 
     get '/orgs/:id' do
-      github_public_organization_authenticate!(params['id'])
+      github_organization_authenticate!(params['id'])
       "Hello There, #{github_user.name}! You have access to the #{params['id']} organization."
     end
 
-    # the scopes above need to include repo for team access :(
-    # get '/teams/:id' do
-    #   github_team_authenticate!(params['id'])
-    #   "Hello There, #{github_user.name}! You have access to the #{params['id']} team."
-    # end
+    get '/publicized_orgs/:id' do
+      github_publicized_organization_authenticate!(params['id'])
+      "Hello There, #{github_user.name}! You are publicly a member of the #{params['id']} organization."
+    end
+
+    get '/teams/:id' do
+      github_team_authenticate!(params['id'])
+      "Hello There, #{github_user.name}! You have access to the #{params['id']} team."
+    end
 
     get '/logout' do
       logout!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_auth_github
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -72,12 +72,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 0
-        - 4
-        - 4
-        version: 0.4.4
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency