Merge pull request github#51 from github/limit-attributes

jch · jch · commit 3f02551d14de · 2014-10-15T15:29:56.000-07:00
Pass through search options for GitHub::Ldap::Domain#user?
diff --git a/lib/github/ldap/domain.rb b/lib/github/ldap/domain.rb
@@ -110,11 +110,15 @@ def valid_login?(login, password)
       # Check if a user exists based in the `uid`.
       #
       # login: is the user's login
+      # search_options: Net::LDAP#search compatible options to pass through
       #
       # Returns the user if the login matches any `uid`.
       # Returns nil if there are no matches.
-      def user?(login)
-        search(filter: login_filter(@uid, login), size: 1).first
+      def user?(login, search_options = {})
+        options = search_options.merge \
+          filter: login_filter(@uid, login),
+          size: 1
+        search(options).first
       end
 
       # Check if a user can be bound with a password.
diff --git a/test/domain_test.rb b/test/domain_test.rb
@@ -126,6 +126,11 @@ def test_user_returns_every_attribute
     assert_equal ['user1@github.com'], user[:mail]
   end
 
+  def test_user_returns_subset_of_attributes
+    assert entry = @domain.user?('user1', :attributes => [:cn])
+    assert_equal [:dn, :cn], entry.attribute_names
+  end
+
   def test_auth_binds
     assert user = @domain.user?('user1')
     assert @domain.auth(user, 'passworD1'), 'Expected user to bind'
