warden-github-rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e185d5a78a23adfb83fc779a6181e8e85875df64
-  data.tar.gz: eb41d3f118fcacae8837752c3444ae1f6e00682d
+  metadata.gz: 317b12d425b52157230b92ca9d1725fde4810b52
+  data.tar.gz: 491cb0453238f1823d265ac03fa52c22480db28d
 SHA512:
-  metadata.gz: 9850964cf5d91015006ceba8723fdd415c180806ac3d4239f154c0c087b454d59bff17bbc99f29765db0dbfe8db3a62c45f940178c8288f1238f2daafd761863
-  data.tar.gz: 7d50a810e69a6ddcf086ef0093e0d4a1328814063cba4a51ec305acc5de6fe42a27b6fc8563acaff5402a7f4aee00a8e135b746e6311820bc275ac51ba7b8447
+  metadata.gz: eb6d79bc65a7e366a59dd6eedfe5ffdbb4cec3f19b3eb89efffcc44b28321d39b3555cae9b02ab3037255a899a78ff327fc98f0ad74ade20a23c8b8aca7af159
+  data.tar.gz: 222c43607372b2fb9a0eb282b1642cb33c20c7ad1237a498ef642fe3d1e515b9c88b2e51cabc310a9b4699b3780345339d4a3c1f30a5430cf0aa43e4790b9ece

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.2.1
+
+- Add support for multiple teams ([@bhuga])
+
 ## v1.2.0
 
 - Add warden config to not intercept 401 status
@@ -33,3 +37,5 @@
 ## v0.0.1
 
 - Initial release
+
+[@bhuga]: https://github.com/bhuga

data/README.md

@@ -157,6 +157,11 @@ github_authenticated(team: 'markting') do
   get '/dashboard' => 'dashboard#show'
 end
 
+# Matches if a member of any of the teams given. Does not initiate login if not logged in.
+github_authenticated(team: ['markting', 'graphic-design']) do
+  get '/dashboard' => 'dashboard#show'
+end
+
 # Using dynamic membership values:
 github_authenticate(org: lambda { |req| req.params[:id] }) do
   get '/orgs/:id' => 'orgs#show'

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/warden/github/rails/routes.rb

@@ -57,8 +57,8 @@ module Warden
         end
 
         def github_enforce_options(user, options)
-          if (team = options[:team])
-            user.team_member?(Rails.team_id(team))
+          if (teams = options[:team])
+            Array(teams).any? { |team| user.team_member?(Rails.team_id(team)) }
           elsif (org = options[:org] || options[:organization])
             user.organization_member?(org)
           else

data/spec/integration/membership_spec.rb

@@ -21,12 +21,78 @@ describe 'request to a protected resource' do
 
         context 'and not team member' do
           before { github_login }
-          it { is_expected.to be_not_found}
+          it { is_expected.to be_not_found }
+        end
+      end
+    end
+
+    context 'which is specified by multiple numeric team ids' do
+      subject { get '/multi_team/protected' }
+
+      context 'when not logged in' do
+        it { is_expected.to be_github_oauth_redirect }
+      end
+
+      context 'when logged in' do
+        context 'and a first team member' do
+          before do
+            user = github_login
+            user.stub_membership(team: 123)
+          end
+
+          it { is_expected.to be_ok }
+        end
+
+        context 'and another team member' do
+          before do
+            user = github_login
+            user.stub_membership(team: 345)
+          end
+
+          it { is_expected.to be_ok }
+        end
+
+        context 'and not team member' do
+          before { github_login }
+          it { is_expected.to be_not_found }
         end
       end
     end
 
     context 'which is specified by a team alias' do
+      subject { get '/multi_team_alias/protected' }
+
+      context 'when not logged in' do
+        it { is_expected.to be_github_oauth_redirect }
+      end
+
+      context 'when logged in' do
+        context 'and a first team member' do
+          before do
+            user = github_login
+            user.stub_membership(team: 456)
+          end
+
+          it { is_expected.to be_ok }
+        end
+
+        context 'and another team member' do
+          before do
+            user = github_login
+            user.stub_membership(team: 789)
+          end
+
+          it { is_expected.to be_ok }
+        end
+
+        context 'and not team member' do
+          before { github_login }
+          it { is_expected.to be_not_found }
+        end
+      end
+    end
+
+    context 'which is specified by multiple team aliases' do
       subject { get '/team_alias/protected' }
 
       context 'when not logged in' do
@@ -45,7 +111,7 @@ describe 'request to a protected resource' do
 
         context 'and not team member' do
           before { github_login }
-          it { is_expected.to be_not_found}
+          it { is_expected.to be_not_found }
         end
       end
     end
@@ -65,7 +131,7 @@ describe 'request to a protected resource' do
 
         context 'and not team member' do
           before { github_login }
-          it { is_expected.to be_not_found}
+          it { is_expected.to be_not_found }
         end
       end
     end
@@ -113,7 +179,7 @@ describe 'request to a protected resource' do
 
         context 'and not organization member' do
           before { github_login }
-          it { is_expected.to be_not_found}
+          it { is_expected.to be_not_found }
         end
       end
     end
@@ -136,7 +202,34 @@ describe 'request to a resource that only exists when logged in' do
 
       context 'when not team member' do
         before { github_login }
-        it { is_expected.to be_not_found}
+        it { is_expected.to be_not_found }
+      end
+    end
+
+    context 'which is specified by multiple numeric team ids' do
+      subject { get '/multi_team/conditional' }
+
+      context 'when a first team member' do
+        before do
+          user = github_login
+          user.stub_membership(team: 123)
+        end
+
+        it { is_expected.to be_ok }
+      end
+
+      context 'when another team member' do
+        before do
+          user = github_login
+          user.stub_membership(team: 345)
+        end
+
+        it { is_expected.to be_ok }
+      end
+
+      context 'when not team member' do
+        before { github_login }
+        it { is_expected.to be_not_found }
       end
     end
 
@@ -154,7 +247,34 @@ describe 'request to a resource that only exists when logged in' do
 
       context 'when not team member' do
         before { github_login }
-        it { is_expected.to be_not_found}
+        it { is_expected.to be_not_found }
+      end
+    end
+
+    context 'which is specified by multiple team aliases' do
+      subject { get '/multi_team_alias/conditional' }
+
+      context 'when a member of the first team' do
+        before do
+          user = github_login
+          user.stub_membership(team: 456)
+        end
+
+        it { is_expected.to be_ok }
+      end
+
+      context 'when a member of another team' do
+        before do
+          user = github_login
+          user.stub_membership(team: 789)
+        end
+
+        it { is_expected.to be_ok }
+      end
+
+      context 'when not a team member' do
+        before { github_login }
+        it { is_expected.to be_not_found }
       end
     end
   end

data/spec/rails_app/config/initializers/warden_github_rails.rb

@@ -9,4 +9,5 @@ Warden::GitHub::Rails.setup do |config|
                            scope:         'repo'
 
   config.add_team :marketing, 456
+  config.add_team :interns,   789
 end

data/spec/rails_app/config/routes.rb

@@ -17,9 +17,13 @@ RailsApp::Application.routes.draw do
 
   github_authenticate(team: 123)  { get '/team/protected'   => responses[200] }
   github_authenticated(team: 123) { get '/team/conditional' => responses[200] }
+  github_authenticate(team: [123, 345])  { get '/multi_team/protected'   => responses[200] }
+  github_authenticated(team: [123, 345]) { get '/multi_team/conditional' => responses[200] }
 
   github_authenticate(team: :marketing)  { get '/team_alias/protected'   => responses[200] }
   github_authenticated(team: :marketing) { get '/team_alias/conditional' => responses[200] }
+  github_authenticate(team: [:marketing, :interns])  { get '/multi_team_alias/protected'   => responses[200] }
+  github_authenticated(team: [:marketing, :interns]) { get '/multi_team_alias/conditional' => responses[200] }
 
   github_authenticate(org: :foobar_inc)  { get '/org/protected'   => responses[200] }
   github_authenticated(org: :foobar_inc) { get '/org/conditional' => responses[200] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warden-github-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: An easy drop in solution for rails to use GitHub authentication.