New flag ACTIVATE_USERS to activate users found active on ldap (#56)

thorin · Jan 12, 2013 · ea33eb2 · ea33eb2
1 parent 1d2b3b3
commit ea33eb2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/lib/redmine_ldap_sync/redmine_ext/auth_source_ldap_patch.rb b/lib/redmine_ldap_sync/redmine_ext/auth_source_ldap_patch.rb
@@ -84,15 +84,20 @@ def sync_users
 
               sync_user_attributes(user) unless user_is_fresh
 
-              if user.groups.exists?(:lastname => required_group)
-                if user.locked?
-                  user.activate!
-                  puts "   -> activated: the user is a member of group '#{required_group}'"
+              if required_group.present?
+                if user.groups.exists?(:lastname => required_group)
+                  if user.locked?
+                    user.activate!
+                    puts "   -> activated: the user is a member of group '#{required_group}'"
+                  end
+                elsif user.active?
+                  user.lock!
+                  puts "   -> locked: the user is not a member of group '#{required_group}'"
                 end
-              elsif user.active?
-                user.lock!
-                puts "   -> locked: the user is not a member of group '#{required_group}'"
-              end if required_group.present?
+              elsif activate_users? && user.locked?
+                user.activate!
+                puts "   -> activated: ACTIVATE_USERS flag is on"
+              end
             end
 
             update_closure_cache! if nested_groups_enabled?
@@ -398,6 +403,10 @@ def name_of(attribute)
             @attribute_names[attribute]
           end
 
+          def activate_users?
+            defined?($activate_users) && $activate_users
+          end
+
           def reset_ldap_settings!
             @settings = nil
             @attribute_names = nil

diff --git a/lib/tasks/sync_users.rake b/lib/tasks/sync_users.rake
@@ -17,6 +17,7 @@ namespace :redmine do
           Group.send :include, RedmineLdapSync::RedmineExt::GroupDryRun
         end
 
+        $activate_users = !ENV['ACTIVATE_USERS'].nil?
         AuthSourceLdap.all.each do |as|
           puts "Synchronizing AuthSource #{as.name}..."
           as.sync_users