active_directory_login 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e02fdfac6d56c6d29878373189b3653b39628b1a
-  data.tar.gz: 9a1dfe06904783e63c50a9c24a017b9e5017f459
+  metadata.gz: c892e5b739bd1f8cd09c4a398b85fa08e59d7134
+  data.tar.gz: ba290b49088433670ae44dce6a1c047f61bfa4a5
 SHA512:
-  metadata.gz: 7a3f9659b6dc5d286214a755ebf564250dee92b7ea5f3125807e90e233ef4c34df66cf3cee1f17da5191773f0951216a85686a76e957624c3168f355c9b627da
-  data.tar.gz: 56f1d5ed89c767727fe9761bea0cb19d7625ed495047215b4c3b61623d3ba5ffdc051925a593466cd41bd7cf7bdfd8d80ab1ceef23ea47f8be38aefe08ee9a1b
+  metadata.gz: 394ec0c6b95043a8bcad2975e8c8cbe2ea2dbb1b852680e6d572202c0b2bd22eff3ac16aefb9f715ce4f59171395dc11d261640a1c21d664dbd2351d503df1f0
+  data.tar.gz: a2a0f4dbcddbc9884cacfc8033d4023a7f6e9fe28645e267e90349336b4b60e77c60c4a89592bb18fca3760ca5f7d9058f5ddca9f7d2094ece9264a33093452e

data/lib/active_directory_login/client.rb

@@ -93,8 +93,8 @@ module ActiveDirectoryLogin
     end
 
     def query
-      ad_username = @ad_user.sAMAccountName.downcase
-      @query =  User.where { (provider == User::LDAP) & (username =~ ad_username) }
+      @query = User.where('provider = :provider AND lower(username) LIKE :username',
+                         { provider: User::LDAP, username: @ad_user.sAMAccountName.downcase })
     end
 
     def create_or_update_user
@@ -174,17 +174,17 @@ module ActiveDirectoryLogin
         staff_member_names = staff_group.member.map { |u| u.sAMAccountName.downcase }
 
         # users not flagged as staff in docgenie but in AD staff group
-        allowed = User.where { (lower(username).in staff_member_names) & (staff == false) }
+        allowed = User.where(staff: false).where("lower(username) IN (:names)", { names: staff_member_names })
         allowed.update_all(staff: true)
         staff_allowed_names = allowed.map { |u| u.username.downcase }
         
         # users flagged as staff in docgenie but not in AD staff group
-        disallowed = User.where { (lower(username).not_in staff_member_names) & (staff == true) }
+        disallowed = User.where(staff: true).where.not("lower(username) IN (:names)", { names: staff_member_names })
         disallowed.update_all(staff: false)
         staff_disallowed_names = disallowed.map { |u| u.username.downcase }
 
         # users flagged as staff in docgenie and in AD staff group
-        staff_unchanged = User.where { (lower(username).in staff_member_names) & (staff == true) }
+        staff_unchanged = User.where(staff: true).where("lower(username) IN (:names)", { names: staff_member_names })
         staff_unchanged_names = staff_unchanged.map { |u| u.username.downcase }
 
         # users in AD staff group but not in docgenie (at all)
@@ -199,15 +199,15 @@ module ActiveDirectoryLogin
         superuser_group = find_group(superuser_dn)
         superuser_member_names = superuser_group.member.map { |u| u.sAMAccountName.downcase } - staff_member_names
         
-        allowed = User.where { (lower(username).in superuser_member_names) & (staff == false) }
+        allowed = User.where(staff: false).where("lower(username) IN (:names)", { names: superuser_member_names })
         allowed.update_all(superuser: true)
         superuser_allowed_names = allowed.map { |u| u.username.downcase }
         
-        disallowed = User.where { (lower(username).not_in superuser_member_names) & (staff == true) }
+        disallowed = User.where(staff: true).where.not("lower(username) IN (:names)", { names: superuser_member_names })
         disallowed.update_all(superuser: false)
         superuser_disallowed_names = disallowed.map { |u| u.username.downcase }
 
-        superuser_unchanged = User.where { (lower(username).in superuser_member_names) & (staff == true) }
+        superuser_unchanged = User.where(staff: true).where("lower(username) IN (:names)", { names: superuser_member_names })
         superuser_unchanged_names = superuser_unchanged.map { |u| u.username.downcase }
         
         # create any new superuser
@@ -225,15 +225,15 @@ module ActiveDirectoryLogin
         member_names = user_group.member.map { |u| u.sAMAccountName.downcase }
         member_names = member_names - superuser_member_names - staff_member_names
         
-        allowed = User.where { (lower(username).in member_names) & (staff == false) & (superuser == false) & (locked_at != nil) }
+        allowed = User.where(staff: false, superuser: false).where.not(locked_at: nil).where("lower(username) IN (:names)", { names: member_names })
         allowed.update_all(locked_at: nil)
         user_allowed_names = allowed.map { |u| u.username.downcase }
         
-        disallowed = User.where { (lower(username).not_in member_names) & (staff == false) & (superuser == false) & (locked_at == nil) }
+        disallowed = User.where(staff: false, superuser: false, locked_at: nil).where.not("lower(username) IN (:names)", { names: member_names })
         disallowed.each { |u| u.lock_access! }
         user_disallowed_names = disallowed.map { |u| u.username.downcase }
 
-        user_unchanged = User.where { (lower(username).in member_names) & (staff == false) & (superuser == false) & (locked_at == nil) }
+        user_unchanged = User.where(staff: false, superuser: false, locked_at: nil).where("lower(username) IN (:names)", { names: member_names })
         user_unchanged_names = user_unchanged.map { |u| u.username.downcase }
         
         #create any new user

data/lib/active_directory_login/version.rb

@@ -1,3 +1,3 @@
 module ActiveDirectoryLogin
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_directory_login
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brad Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler