active_directory_login 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47fbbe0fe7ddb8fd3ec3ba897b83d98ba377e915
-  data.tar.gz: bfa62e77801d567ca7d95fff669f792c8f84b443
+  metadata.gz: 35dbce9c799a3b240d53d37db932486d6b13b138
+  data.tar.gz: 897280b514e3103f8be0fbf6ea37f2482064458a
 SHA512:
-  metadata.gz: 613463170d1b6f58ce61c69171f277901a0f6c5e93641db2a98ecc6c22ac3c26123ad5f5bf03dab4ae28a689c29eddd84ff11d7a0290dd336df220ff1d3353ad
-  data.tar.gz: 70010927678048f1713484efade2d723f113bab7d2766e5cbabc34f09c543a27ebc191e9ab2a9b1cbf2bbb6aa77cfb64d9b224f7a2641684a0b007ede983cefb
+  metadata.gz: a59a6f2317c42c66fbf0773a435a64ec474c3bca2a7ff64bb0d6c4ef9e9f03e72a576e565cd879d25bb995b642ac75a0c8ff07ad51f41507d3545719becf9187
+  data.tar.gz: e628d1e43fe5e7d8ea607a66cf43de44810377cacc1d35fd333cd5dd4bee9bfd49c19dfad41e3dc2297c5adb4a0241e7cebaad42958355cfb1171517e58dd550

data/lib/active_directory_login/client.rb

@@ -62,10 +62,9 @@ module ActiveDirectoryLogin
 
     def with_user(username_or_email, password, &block)
       raise Error, "block required" if block.nil?
-        
       @ad_user = find_user(username_or_email)
       @ad_user_password = password
-      @query = query(username_or_email)
+      @query = query
       @app_user = @query.first
 
       value = block.call
@@ -93,10 +92,9 @@ module ActiveDirectoryLogin
       @ad_user.try(:authenticate, @ad_user_password)
     end
 
-    def query(username_or_email)
-      @query ||= (username_or_email =~ /@/) ?
-        User.where { (provider == User::LDAP) & (email =~ username_or_email) } :
-        User.where { (provider == User::LDAP) & (username =~ username_or_email) }
+    def query
+      ad_email = @ad_user.mail.downcase
+      @query =  User.where { (provider == User::LDAP) & (email =~ ad_email) }
     end
 
     def create_or_update_user
@@ -105,7 +103,7 @@ module ActiveDirectoryLogin
         name:      "#{@ad_user.givenname} #{@ad_user.sn}",
         email:     @ad_user.mail.downcase,
         username:  @ad_user[:sAMAccountName]
-      )
+        )
 
       # Update the user's password and permissions (can't use update_attributes as it might not be saved yet)
       user.password              = @ad_user_password
@@ -127,6 +125,10 @@ module ActiveDirectoryLogin
 
       ad_key  = (username_or_email =~ /@/) ? :mail : :sAMAccountName
       ad_user = ActiveDirectory::User.find(:first, ad_key => username_or_email)
+      if ad_user.nil? # User hasnt used their primary email so try the secondary
+        ad_user = ActiveDirectory::User.find(:first,  "msrtcsip-primaryuseraddress" => "sip:#{username_or_email}")
+      end
+      ad_user
     end
 
 
@@ -183,7 +185,7 @@ module ActiveDirectoryLogin
         staff_unchanged_emails = staff_unchanged.collect(&:email)
 
         # create any new staff
-        pending = Array(staff_member_emails - staff_allowed_emails - staff_disallowed_emails - staff_unchanged_emails)
+        pending = Array(staff_member_emails - staff_allowed_emails - staff_unchanged_emails)
         pending.each do |pending_email|
           with_user(pending_email, SecureRandom.hex){ create_or_update_user }
         end
@@ -207,8 +209,8 @@ module ActiveDirectoryLogin
         superuser_unchanged_emails = superuser_unchanged.collect(&:email)
         
         # create any new superuser
-        pending = Array(superuser_member_emails - superuser_allowed_emails - superuser_disallowed_emails - superuser_unchanged_emails)
-         pending.each do |pending_email|
+        pending = Array(superuser_member_emails - superuser_allowed_emails - superuser_unchanged_emails)
+        pending.each do |pending_email|
           with_user(pending_email, SecureRandom.hex){ create_or_update_user }
         end
         superuser_created_emails = pending
@@ -218,7 +220,6 @@ module ActiveDirectoryLogin
 
         ## update users
         user_group = find_group(user_dn)
-
         member_emails = user_group.member.collect(&:mail).map(&:downcase)
         member_emails = member_emails - superuser_member_emails - staff_member_emails
         
@@ -234,7 +235,7 @@ module ActiveDirectoryLogin
         user_unchanged_emails = user_unchanged.collect(&:email)
         
         #create any new user
-        pending = Array(pending - user_allowed_emails - user_unchanged_emails)
+        pending = Array(member_emails - user_allowed_emails - user_unchanged_emails)
         pending.each do |pending_email|
           with_user(pending_email, SecureRandom.hex){ create_or_update_user }
         end

data/lib/active_directory_login/version.rb

@@ -1,3 +1,3 @@
 module ActiveDirectoryLogin
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_directory_login
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brad Murray
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler