devise_active_directory_authenticatable 0.3.0 → 0.3.1

data/Rakefile

@@ -22,7 +22,7 @@ begin
     gemspec.homepage = "http://github.com/ajrkerr/devise_activedirectory_authenticatable"
     gemspec.authors = ["Adam Kerr"]
     gemspec.add_dependency "devise", ">= 1.1.5"
-    gemspec.add_dependency "active_directory", ">= 1.2.0"
+    gemspec.add_dependency "active_directory", ">= 1.2.4"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/devise_active_directory_authenticatable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{devise_active_directory_authenticatable}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Kerr"]
-  s.date = %q{2011-02-17}
+  s.date = %q{2011-02-22}
   s.description = %q{Active Directory authentication module for Devise, based off of LDAP Authentication}
   s.email = %q{ajrkerr@gmail.com}
   s.extra_rdoc_files = [
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/ajrkerr/devise_activedirectory_authenticatable}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{Active Directory authentication module for Devise}
 
   if s.respond_to? :specification_version then
@@ -42,14 +42,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<devise>, [">= 1.1.5"])
-      s.add_runtime_dependency(%q<active_directory>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<active_directory>, [">= 1.2.4"])
     else
       s.add_dependency(%q<devise>, [">= 1.1.5"])
-      s.add_dependency(%q<active_directory>, [">= 1.2.0"])
+      s.add_dependency(%q<active_directory>, [">= 1.2.4"])
     end
   else
     s.add_dependency(%q<devise>, [">= 1.1.5"])
-    s.add_dependency(%q<active_directory>, [">= 1.2.0"])
+    s.add_dependency(%q<active_directory>, [">= 1.2.4"])
   end
 end
 

data/lib/devise_active_directory_authenticatable.rb

@@ -51,7 +51,7 @@ module Devise
   #Username attribute used for logging in
   #Will be automagicaly mapped to authentication_keys.first
   mattr_accessor :ad_username
-  @@ad_username = :userPrincipalName
+  @@ad_username = :userprincipalname
 
   #Map Devise authentication key accordingly
   #Does this work when initializers are set too?

data/lib/devise_active_directory_authenticatable/models/ad_group.rb

@@ -10,16 +10,17 @@ module Devise
       include AdObject
 
       module ClassMethods
-        def activedirectory_class
-          ActiveDirectory::Group
-        end
-
+        # TODO find a way to get rid of this with metaprogramming
         def devise_model
           AdGroup
         end
 
+        def activedirectory_class
+          ActiveDirectory::Group
+        end
+
         def sync_all
-          #return false unless connected_to_activedirectory?
+          return false unless connected_to_activedirectory?
           find_or_create_from_activedirectory.each do |gp|
             gp.save
           end

data/lib/devise_active_directory_authenticatable/models/ad_object.rb

@@ -3,8 +3,6 @@ module Devise
   module AdObject
     extend ActiveSupport::Concern
 
-    #Constants for easy access
-    ADConnect = DeviseActiveDirectoryAuthenticatable
     Logger = DeviseActiveDirectoryAuthenticatable::Logger
 
     def klass
@@ -13,32 +11,36 @@ module Devise
 
     # Update the attributes of the current object from the AD
     # Defaults to current user if no parameters given
-    def activedirectory_sync!(params = {})
+    def activedirectory_sync! params = {}
       params[:objectguid] = self.objectguid if params.empty?
-      ad_objs = params[:object] || klass.find_in_activedirectory(params)
+      ad_obj = params[:object] || klass.find_in_activedirectory(params).first
+      copy_from_activedirectory ad_obj unless ad_obj.nil?
+    end
 
-      return false if ad_objs.nil?
-      ad_objs = Array(ad_objs) unless ad_objs.is_a? Array
+    # Update the attributes of the current object from the AD
+    # Defaults to current user if no parameters given
+    def update_from_activedirectory! params = {}
+      params[:objectguid] = self.objectguid if params.empty?
+      ad_obj = params[:object] || klass.find_in_activedirectory(params).first
+      copy_from_activedirectory ad_obj unless ad_obj.nil?
+    end
 
-      #Grab attributes from Devise mapping
-      ad_objs.each do |ad_obj|
-        ::Devise.ad_attr_mapping[klass.devise_model_name.to_sym].each do |local_attr, active_directory_attr|
-          self[local_attr] = ad_obj.send(active_directory_attr)
-        end
+    # Update the local object using an Active Directory entry
+    def copy_from_activedirectory ad_obj
+      ::Devise.ad_attr_mapping[klass.devise_model_name.to_sym].each do |local_attr, active_directory_attr|
+        self[local_attr] = ad_obj.send(active_directory_attr)
       end
     end
 
-    def activedirectory_self
-      find_in_activedirectory :objectGUID => objectGUID
+    def find_in_activedirectory
+      klass.find_in_activedirectory :objectGUID => objectGUID
     end
 
     module ClassMethods
 
-      # def devise_model
-      #   self.ancestors.each do |mod|
-      #     return mod if mod.include? self.class
-      #   end
-      # end
+      def login_with
+        ::Devise.authentication_keys.first
+      end
 
       def devise_model_name
         devise_model.name[/.*::(.*)/, 1]
@@ -48,36 +50,6 @@ module Devise
         activedirectory_class.name[/.*::(.*)/, 1]
       end
 
-      #TODO switch from reverse to rassoc to allow for multiple mappings
-      def ad_field_to_local field_name
-        @ad_to_local_map ||= ::Devise.ad_attr_mapping[devise_model_name.to_sym].invert
-        return (@ad_to_local_map.has_key? field_name) ? @ad_to_local_map[field_name] : field_name
-      end
-
-      #TODO switch from reverse to rassoc to allow for multiple mappings
-      def local_field_to_ad field_name
-        @local_to_ad_map ||= ::Devise.ad_attr_mapping[devise_model_name.to_sym]
-        return (@local_to_ad_map.has_key? field_name) ? @local_to_ad_map[field_name] : field_name
-      end
-
-      def ad_attrs_to_local ad_attrs
-        local_attrs = {}
-        ad_attrs.each do |ad_key, value|
-          local_key = ad_field_to_local(ad_key)
-          local_attrs[local_key] = value
-        end
-        local_attrs
-      end
-
-      def local_attrs_to_ad local_attrs
-        ad_attrs = {}
-        local_attrs.each do |local_key, value|
-          ad_key = local_field_to_ad(local_key)
-          ad_attrs[ad_key] = value
-        end
-        ad_attrs
-      end
-
       #Search based on GUID, DN or Username primarily
       def find_in_activedirectory(local_params = {})
         #Reverse mappings for user
@@ -85,9 +57,7 @@ module Devise
 
         return find_all_in_activedirectory if ad_params.empty?
 
-        ad_objs = activedirectory_class.find(:all, ad_params)
-
-        return ad_objs
+        activedirectory_class.find(:all, ad_params)
       end
 
       def find_or_create_from_activedirectory params = {}
@@ -122,8 +92,41 @@ module Devise
 
       def activedirectory_connect
         ActiveDirectory::Base.setup(::Devise.ad_settings)
-        raise DeviseActiveDirectoryAuthenticatable::ActiveDirectoryException, "Invliad Username or Password" unless ActiveDirectory::Base.connected?
+        raise DeviseActiveDirectoryAuthenticatable::ActiveDirectoryException, "Invalid Username or Password" unless ActiveDirectory::Base.connected?
+      end
+
+      private
+
+      #TODO switch from reverse to rassoc to allow for multiple mappings
+      def ad_field_to_local field_name
+        @ad_to_local_map ||= ::Devise.ad_attr_mapping[devise_model_name.to_sym].invert
+        return (@ad_to_local_map.has_key? field_name) ? @ad_to_local_map[field_name] : field_name
       end
+
+      #TODO switch from reverse to rassoc to allow for multiple mappings
+      def local_field_to_ad field_name
+        @local_to_ad_map ||= ::Devise.ad_attr_mapping[devise_model_name.to_sym]
+        return (@local_to_ad_map.has_key? field_name) ? @local_to_ad_map[field_name] : field_name
+      end
+
+      def ad_attrs_to_local ad_attrs
+        local_attrs = {}
+        ad_attrs.each do |ad_key, value|
+          local_key = ad_field_to_local(ad_key)
+          local_attrs[local_key] = value
+        end
+        local_attrs
+      end
+
+      def local_attrs_to_ad local_attrs
+        ad_attrs = {}
+        local_attrs.each do |local_key, value|
+          ad_key = local_field_to_ad(local_key)
+          ad_attrs[ad_key] = value
+        end
+        ad_attrs
+      end
+
     end
   end
 end

data/lib/devise_active_directory_authenticatable/models/ad_user.rb

@@ -1,7 +1,6 @@
 require 'devise_active_directory_authenticatable/strategy'
 require 'devise_active_directory_authenticatable/exception'
 require 'devise_active_directory_authenticatable/models/ad_object'
-require 'devise_active_directory_authenticatable/models/ad_group'
 
 module Devise
   module Models
@@ -13,6 +12,10 @@ module Devise
 
       Logger = DeviseActiveDirectoryAuthenticatable::Logger
 
+      included do
+
+      end
+
       ## Devise key
       def login_with
         self[::Devise.authentication_keys.first]
@@ -26,26 +29,25 @@ module Devise
       end
 
       def authenticate_with_activedirectory params = {}
-        params[:username] ||= self[login_with]
-        set_activedirectory_credentials params
-        activedirectory_connect
+        params[:username] ||= login_with
+        self.class.set_activedirectory_credentials params
+        self.class.activedirectory_connect
       end
 
       module ClassMethods
-        def activedirectory_class
-          ActiveDirectory::User
-        end
-
+        # TODO find a way to get rid of this with metaprogramming
         def devise_model
           AdUser
         end
 
+        def activedirectory_class
+          ActiveDirectory::User
+        end
+
         # Authenticate a user based on configured attribute keys. Returns the
         # authenticated user if it's valid or nil.
         def authenticate_with_activedirectory(attributes={}) 
-          @login_with = ::Devise.authentication_keys.first
-
-          username = attributes[@login_with]
+          username = attributes[login_with]
           password = attributes[:password]
 
           Logger.send "Attempting to login :#{@login_with} => #{username}"
@@ -59,7 +61,6 @@ module Devise
 
           # Find them in the local database
           user = find_or_create_from_activedirectory(@login_with => attributes[@login_with]).first
-          Logger.send "User: #{user.inspect}"
 
           # Check to see if we have the same user
           unless user.nil?

data/lib/generators/devise_active_directory_authenticatable/install_generator.rb

@@ -37,24 +37,32 @@ module DeviseActiveDirectoryAuthenticatable
   # }
 
 
+  # config.ad_attr_mapping = {
   ##Attribute mapping for user object
-  # config.ad_user_mapping = {
-  #   :objectguid => :objectguid, #Required
-  #   :username => :userprincipalname,
-  #   :dn => :dn,
-  #   :firstname => :givenname,
-  #   :lastname => :sn
-  # }
+  #   :AdUser => {
+  #     #Attributes are lowercase
+  #     :objectguid => :objectguid, #Required
+  #     :username => :userprincipalname,
+  #     :dn => :dn,
+  #     :firstname => :givenName,
+  #     :lastname => :sn,
+  #     :whenchanged => :whenchanged,
+  #     :whencreated => :whencreated,
+  #   },
 
-  # config.ad_group_mapping = {
-  #   :objectguid => :objectguid, #Required
-  #   :dn => :dn,
-  #   :name => :name,
-  #   :description => :description,
-  #   :whencreated => :whencreated,
-  #   :whenchanged => :whenchanged,
+  ##Attribute mapping for group objects
+  #   :AdGroup => {
+  #     #Attributes are lowercase
+  #     :objectguid => :objectguid, #Required
+  #     :dn => :dn,
+  #     :name => :name,
+  #     :description => :description,
+  #     :whencreated => :whencreated,
+  #     :whenchanged => :whenchanged,
+  #   }
   # }
 
+
   ##Username attribute
   ##Maps to :login_with in the devise configuration
   # config.ad_username = :userPrincipalName

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: devise_active_directory_authenticatable
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Adam Kerr
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -05:00
+date: 2011-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 31
+        hash: 23
         segments: 
         - 1
         - 2
-        - 0
-        version: 1.2.0
+        - 4
+        version: 1.2.4
   type: :runtime
   version_requirements: *id002
 description: Active Directory authentication module for Devise, based off of LDAP Authentication
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Active Directory authentication module for Devise