sinatra_auth_github 0.0.13 → 0.0.14

data/README.md

@@ -13,4 +13,48 @@ The Extension in Action
 =======================
     % gem install bundler
     % bundle install
-    % GH_CLIENT_ID="<from GH>" GH_SECRET="<from GH>" bundle exec rackup
+    % GITHUB_CLIENT_ID="<from GH>" GITHUB_CLIENT_SECRET="<from GH>" bundle exec shotgun
+
+```ruby
+module Example
+  class App < Sinatra::Base
+    enable :sessions
+
+    set  :github_options, {
+                            # GitHub Provided secrets
+                            :secret       => ENV['GITHUB_CLIENT_SECRET'],
+                            :client_id    => ENV['GITHUB_CLIENT_ID'],
+
+                            # How much info you need about the user
+                            :scopes       => 'user,offline_access',
+
+                            # restrict access to a members of organization named
+                            :organization => "github",
+
+                            # restrict access to specific team on an organization
+                            :team         => nil # || 42
+                          }
+
+    register Sinatra::Auth::Github
+
+    before do
+      authenticate!
+    end
+
+    helpers do
+      def repos
+        github_request("repos/show/#{github_user.login}")
+      end
+    end
+
+    get '/' do
+      "Hello There, #{github_user.name}!#{github_user.token}\n#{repos.inspect}"
+    end
+
+    get '/logout' do
+      logout!
+      redirect '/'
+    end
+  end
+end
+```

data/lib/sinatra/auth/github.rb

@@ -5,7 +5,7 @@ require 'rest_client'
 module Sinatra
   module Auth
     module Github
-      VERSION = "0.0.13"
+      VERSION = "0.0.14"
 
       class BadAuthentication < Sinatra::Base
         get '/unauthenticated' do
@@ -36,10 +36,24 @@ module Sinatra
         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
@@ -54,6 +68,7 @@ module Sinatra
           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
 

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.13"
+  s.version     = "0.0.14"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Corey Donohoe"]
   s.email       = ["atmos@atmos.org"]
@@ -14,11 +14,12 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "sinatra_auth_github"
 
   s.add_dependency "sinatra",       "~>1.0"
-  s.add_dependency "rest-client",   "~>1.5.1"
-  s.add_dependency "warden-github", "~>0.0.7"
+  s.add_dependency "rest-client",   "~>1.6.1"
+  s.add_dependency "warden-github", "~>0.0.8"
 
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec",     "~>1.3.0"
+  s.add_development_dependency "shotgun"
   s.add_development_dependency "bundler",   "~>1.0"
   s.add_development_dependency "randexp",   "~>0.1.5"
   s.add_development_dependency "rack-test", "~>0.5.3"

data/spec/app.rb

@@ -4,14 +4,26 @@ module Example
   class App < Sinatra::Base
     enable :sessions
 
-    set  :github_options, { :client_id => ENV['GH_CLIENT_ID'],
-                            :secret    => ENV['GH_SECRET'],
-                            :scopes    => 'user,offline_access,repo' }
+    set  :github_options, {
+                            # GitHub Provided secrets
+                            :secret       => ENV['GITHUB_CLIENT_SECRET'],
+                            :client_id    => ENV['GITHUB_CLIENT_ID'],
+
+                            # How much info you need about the user
+                            :scopes       => 'user,offline_access,repo',
+
+                            # restrict access to a members of organization named
+                            :organization => "github",
+
+                            # restrict access to specific team on an organization
+                            :team         => nil # || 42
+                           }
 
     register Sinatra::Auth::Github
 
     before do
-      authenticate!
+      # authenticate!
+      # halt([401, "Unauthorized User"]) unless github_organization_member?
     end
 
     helpers do
@@ -21,9 +33,20 @@ module Example
     end
 
     get '/' do
+      authenticate!
       "Hello There, #{github_user.name}!#{github_user.token}\n#{repos.inspect}"
     end
 
+    get '/orgs/:id' do
+      github_organization_authenticate!(params['id'])
+      "Hello There, #{github_user.name}! You have access to the #{params['id']} organization."
+    end
+
+    get '/orgs/:org_id/team/:id' do
+      github_organization_team_authenticate!(params['org_id'], params['id'])
+      "Hello There, #{github_user.name}! You have access to the #{params['id']} team under the #{params['org_id']} organization."
+    end
+
     get '/logout' do
       logout!
       redirect '/'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_auth_github
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 0
-  - 13
-  version: 0.0.13
+  - 14
+  version: 0.0.14
 platform: ruby
 authors: 
 - Corey Donohoe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 -07:00
+date: 2011-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 13
         segments: 
         - 1
-        - 5
+        - 6
         - 1
-        version: 1.5.1
+        version: 1.6.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,12 +57,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 15
         segments: 
         - 0
         - 0
-        - 7
-        version: 0.0.7
+        - 8
+        version: 0.0.8
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -96,9 +96,23 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: shotgun
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,11 +123,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: randexp
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,11 +139,11 @@ dependencies:
         - 5
         version: 0.1.5
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,11 +155,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: ruby-debug
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -155,7 +169,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: A sinatra extension for easy oauth integration with github
 email: 
 - atmos@atmos.org
@@ -168,7 +182,6 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile