rughetto-merb-auth-remember-me 0.0.2 → 0.0.3

data/TODO

@@ -1,5 +1,2 @@
 TODO:
-Fix LICENSE with your name
-Fix Rakefile with your name and contact info
-Add your code to lib/pn-remember-me.rb
-Add your Merb rake tasks to lib/pn-remember-me/merbtasks.rb
+make token refresh with each request ??

data/lib/merb-auth-remember-me.rb

@@ -1,27 +1,35 @@
-# make sure we're running inside Merb
 if defined?(Merb::Plugins)
-
   $:.unshift File.dirname(__FILE__)
 
   # register the authentication strategy
   require(File.expand_path(File.dirname(__FILE__) / "merb-auth-remember-me" / "mixins") / "authenticated_user")
   strategy_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-remember-me" / "strategies"
+  Merb.logger.info('Registering and activating RememberMe strategy')
   Merb::Authentication.register(:remember_me, strategy_path / "remember_me.rb")
+  Merb::Authentication.activate!(:remember_me) # and activate it
   
   # Plugin configurations
-  Merb::Plugins.config[:merb_auth_remember_me] = { }
-  
-  Merb::BootLoader.before_app_loads do
-  end
+  Merb::Plugins.config[:merb_auth_remember_me] = {:include_model_methods => true }
   
   Merb::BootLoader.after_app_loads do
     Merb::Authentication.after_authentication do |user,request,params|
       if params[:remember_me] == "1" 
         user.remember_me
-        request.cookies.set_cookie(:auth_token, user.remember_token, :expires => user.remember_token_expires_at.to_time)
+        request.cookies.set_cookie(
+          :auth_token, 
+          user.remember_token, 
+          :expires => user.remember_token_expires_at.to_time
+        )
       end
       user 
-    end
-  end
-  
-end
+    end # Merb::Authentication.after_authentication
+    
+    Merb::Authentication.user_class.class_eval do
+      if Merb::Plugins.config[:merb_auth_remember_me][:include_model_methods]
+        Merb.logger.info("Including RememberMe Mixin in #{Merb::Authentication.user_class}. 
+        To avoid this inclusion add 'Merb::Plugins.config[:merb_auth_remember_me][:include_model_methods] = false' in your config/init.rb before_app_loads method")
+        include Merb::Authentication::Mixins::AuthenticatedUser
+      end  
+    end # Merb::Authentication.user_class.class_eval
+  end # Merb::BootLoader.after_app_loads
+end # if defined?(Merb::Plugins)

data/lib/merb-auth-remember-me/strategies/remember_me.rb

@@ -1,56 +1,12 @@
-class RememberMe < Merb::Authentication::Strategy
-  def run!
-    login_from_cookie
-  end
-
-  def current_user
-    @current_user
-  end
-  
-  def current_user=(new_user)
-    @current_user = new_user
-  end
-  
-  # Called from #current_user.  Finaly, attempt to login by an expiring token in the cookie.
-  # for the paranoid: we _should_ be storing user_token = hash(cookie_token, request IP)
-  def login_from_cookie
-    current_user = cookies[:auth_token] && Merb::Authentication.user_class.first(:conditions => ["remember_token = ?", cookies[:auth_token]])
-    if current_user && current_user.remember_token?
-      handle_remember_cookie! false # freshen cookie token (keeping date)
-      current_user
-    end
-  end
-  
-  #
-  # Remember_me Tokens
-  #
-  # Cookies shouldn't be allowed to persist past their freshness date,
-  # and they should be changed at each login
-
-  # Cookies shouldn't be allowed to persist past their freshness date,
-  # and they should be changed at each login
-
-  def valid_remember_cookie?
-    return nil unless current_user
-    (current_user.remember_token?) && 
-      (cookies[:auth_token] == current_user.remember_token)
-  end
-  
-  # Refresh the cookie auth token if it exists, create it otherwise
-  def handle_remember_cookie! new_cookie_flag
-    return unless current_user
-    case
-    when valid_remember_cookie? then current_user.refresh_token # keeping same expiry date
-    when new_cookie_flag        then current_user.remember_me 
-    else                             current_user.forget_me
-    end
-    send_remember_cookie!
-  end
-  
-  def send_remember_cookie!
-    cookies.set_cookie(:auth_token, current_user.remember_token, :expires => current_user.remember_token_expires_at.to_time)
-  end
-
-
-end
-
+module Merb::Authentication::Strategies
+  class RememberMeStrategy < Merb::Authentication::Strategy
+    def run!
+      if cookies[:auth_token]
+        user = Merb::Authentication.user_class.first(
+          :conditions => [ "remember_token = ?", cookies[:auth_token] ]
+        )
+      end  
+      user && user.remembered? ? user : nil
+    end # run!
+  end # RememberMeStrategy
+end # Merb::Authentication::Strategies

metadata

@@ -1,10 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: rughetto-merb-auth-remember-me
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Surasit Liangpornrattana
+- Rue the Ghetto
 autorequire: 
 bindir: bin
 cert_chain: []
@@ -23,7 +24,7 @@ dependencies:
         version: "1.0"
     version: 
 description: Merb plugin that provides remember me for merb-auth-slice-password
-email: punneng@gmail.com
+email: ru_ghetto@rubyghetto.com
 executables: []
 
 extensions: []
@@ -55,7 +56,7 @@ files:
 - spec/strategies
 - spec/strategies/remember_me_spec.rb
 has_rdoc: true
-homepage: https://github.com/PunNeng/pn-merb-auth-remember-me
+homepage: https://github.com/rughetto/merb-auth-remember-me
 post_install_message: 
 rdoc_options: []