lib/challah/techniques/api_key_technique.rb in challah-0.3.5 vs lib/challah/techniques/api_key_technique.rb in challah-0.4.0

@@ -1,11 +1,15 @@
 module Challah
   class ApiKeyTechnique
     def initialize(session)
-      @key = session.api_key? ? session.api_key : nil   
+      @key = session.key? ? session.key : nil   
     end
     
     def authenticate
+      # Api key functionality is only enabled with the :api_key_enabled option. This is turned
+      # off by default and must be manually enabled for security reasons.
+      return nil unless Challah.options[:api_key_enabled]
+      
       unless @key.to_s.blank?
         user = ::User.find_by_api_key(@key)
         
         if user and user.active?
           return user
\ No newline at end of file