scottmotte-merb_auth_slice_multisite 0.7.5 → 0.8.0

data/README.textile

@@ -24,6 +24,7 @@ include Merb::Authentication::Mixins::UserBelongsToSite and then migrate your da
 # in model
 class User
 	include Merb::Authentication::Mixins::UserBelongsToSite
+	include Merb::Authentication::Mixins::AuthenticatedUser #for remember me functionality
 end
 
 
@@ -32,6 +33,7 @@ Merb::Authentication.user_class.class_eval{
   include Merb::Authentication::Mixins::SaltedUser
   include Merb::Authentication::Mixins::ActivatedUser
   include Merb::Authentication::Mixins::UserBelongsToSite # <-- this one
+	include Merb::Authentication::Mixins::AuthenticatedUser # <-- and this one
  }
 </code></pre>
 

data/VERSION.yml

@@ -1,4 +1,3 @@
---- 
 :major: 0
-:minor: 7
-:patch: 5
+:minor: 8
+:patch: 0

data/app/controllers/sessions.rb

@@ -17,6 +17,7 @@ class MerbAuthSliceMultisite::Sessions < MerbAuthSliceMultisite::Application
 
   def destroy
     "Add an after filter to do stuff after logout"
+    cookies.delete :auth_token
   end
   
   

data/app/views/exceptions/unauthenticated.html.erb

@@ -11,7 +11,6 @@
 <%= error_messages_for session.authentication %>
 <form action="<%= slice_url(:merb_auth_slice_multisite, :perform_login) %>" method="post" id="loginForm">
 	<h3>Login</h3>
-	
 	<input type="hidden" name="<%= @site_id_param.to_s %>" value="<%= @current_site.id %>" id="<%= @site_id_param.to_s %>">
 	<input type="hidden" name="_method" value="PUT" />
 	
@@ -27,6 +26,12 @@
       <div id="passwordElement" class="element">
 				<input type="password" name="<%= @password_param.to_s %>" value="" id="<%= @password_param.to_s %>">
       </div>
+    </div>
+		<div id="remember_meElements" class="elements">
+      <label for="remember_me">Remember me:</label>
+      <div id="remember_meElement" class="element">
+				<input type="checkbox" name="remember_me" value="1" id="remember_me" />
+      </div>
     </div>
     <div id="loginActions" class="actions">
       <div id="loginAction" class="action">

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

@@ -0,0 +1,97 @@
+require "digest/sha1"
+module Merb
+  class Authentication
+    module Mixins
+      # This mixin provides basic user remember token.
+      #
+      # Added properties:
+      #  :remember_token_expires_at, DateTime
+      #  :remember_token, String
+      #
+      # To use it simply require it and include it into your user class.
+      #
+      # class User
+      #   include Merb::Authentication::Mixins::AuthenticatedUser
+      #
+      # end
+      #
+      module AuthenticatedUser
+        def self.included(base)
+          base.class_eval do
+            include Merb::Authentication::Mixins::AuthenticatedUser::InstanceMethods
+            extend  Merb::Authentication::Mixins::AuthenticatedUser::ClassMethods
+
+            path = File.expand_path(File.dirname(__FILE__)) / "authenticated_user"
+            if defined?(DataMapper) && DataMapper::Resource > self
+              require path / "dm_authenticated_user"
+              extend(Merb::Authentication::Mixins::AuthenticatedUser::DMClassMethods)
+            elsif defined?(ActiveRecord) && ancestors.include?(ActiveRecord::Base)
+              require path / "ar_authenticated_user"
+              extend(Merb::Authentication::Mixins::AuthenticatedUser::ARClassMethods)
+            elsif defined?(Sequel) && ancestors.include?(Sequel::Model)
+              require path / "sq_authenticated_user"
+              extend(Merb::Authentication::Mixins::AuthenticatedUser::SQClassMethods)
+            end
+
+          end # base.class_eval
+        end # self.included
+
+
+        module ClassMethods
+          def secure_digest(*args)
+            Digest::SHA1.hexdigest(args.flatten.join('--'))
+          end
+
+          # Create random key.
+          #
+          # ==== Returns
+          # String:: The generated key
+          def make_token
+            secure_digest(Time.now, (1..10).map{ rand.to_s })
+          end 
+        end # ClassMethods
+
+        module InstanceMethods
+          def remember_token?
+            (!remember_token.blank?) && 
+              remember_token_expires_at && (Time.now.utc < remember_token_expires_at.utc)
+          end
+
+          # These create and unset the fields required for remembering users between browser closes
+          def remember_me(time = 2.weeks)
+            remember_me_for time
+          end
+
+          def remember_me_for(time)
+            remember_me_until time.from_now.utc
+          end
+
+          def remember_me_until(time)
+            self.remember_token_expires_at = time
+            self.remember_token            = self.class.make_token
+            save
+          end
+
+          # refresh token (keeping same expires_at) if it exists
+          def refresh_token
+            if remember_token?
+              self.remember_token = self.class.make_token 
+              save
+            end
+          end
+
+          # 
+          # Deletes the server-side record of the authentication token.  The
+          # client-side (browser cookie) and server-side (this remember_token) must
+          # always be deleted together.
+          #
+          def forget_me
+            self.remember_token_expires_at = nil
+            self.remember_token            = nil
+            save
+          end
+        end # InstanceMethods
+      end # AuthenticatedUser
+    end # Mixins
+  end # Authentication
+end # Merb

data/lib/merb-auth-remember-me/mixins/authenticated_user/dm_authenticated_user.rb

@@ -0,0 +1,17 @@
+module Merb
+  class Authentication
+    module Mixins
+      module AuthenticatedUser
+        module DMClassMethods
+          def self.extended(base)
+            base.class_eval do
+              property :remember_token_expires_at, DateTime
+              property :remember_token, String
+            end # base.class_eval
+          
+          end # self.extended
+        end # DMClassMethods
+      end # AuthenticatedUser
+    end # Mixins
+  end # Authentication
+end #Merb

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

@@ -0,0 +1,12 @@
+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

data/lib/merb_auth_slice_multisite.rb

@@ -7,6 +7,7 @@ if defined?(Merb::Plugins)
   dependency 'merb-auth-core'
   dependency 'merb-auth-more'
   require(File.expand_path(File.dirname(__FILE__) / "merb_auth_slice_multisite" / "mixins") / "user_belongs_to_site")
+  require(File.expand_path(File.dirname(__FILE__) / "merb-auth-remember-me" / "mixins") / "authenticated_user")
   
   Merb::Plugins.add_rakefiles "merb_auth_slice_multisite/merbtasks", "merb_auth_slice_multisite/slicetasks", "merb_auth_slice_multisite/spectasks"
 
@@ -42,13 +43,29 @@ if defined?(Merb::Plugins)
         # Register the custom strategy so that this slice may utilize it
         # from http://github.com/wycats/merb/blob/784ac7d71780d1a7cfb9152ba4cb0
         # e18a990ab7a/merb-auth/merb-auth-more/lib/merb-auth-more.rb
-        basic_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-more" / "strategies" / "multisite"
-        Merb::Authentication.register(:multisite_password_form, basic_path / "multisite_password_form.rb")
-        
-        # activate the strategy
+        merb_auth_more_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-more" / "strategies" / "multisite"
+        merb_auth_remember_me_path = File.expand_path(File.dirname(__FILE__)) / "merb-auth-remember-me" / "strategies"
+        Merb::Authentication.register(:multisite_password_form, merb_auth_more_path / "multisite_password_form.rb")
+        Merb::Authentication.register(:remember_me, merb_auth_remember_me_path / "remember_me.rb")
+        # activate the strategies
         ::Merb::Authentication.activate!(:multisite_password_form)
+        ::Merb::Authentication.activate!(:remember_me)
+        
+        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
+            )
+          end
+          user 
+        end # Merb::Authentication.after_authentication
       end
       
+
+      
       
         # from 0.3.2 version of merb_auth_slice_multisite
         # # Actually check if the user belongs to the site 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scottmotte-merb_auth_slice_multisite
 version: !ruby/object:Gem::Version 
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors: 
 - scottmotte
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-02 00:00:00 -07:00
+date: 2009-05-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -28,6 +28,13 @@ files:
 - lib/merb-auth-more/strategies
 - lib/merb-auth-more/strategies/multisite
 - lib/merb-auth-more/strategies/multisite/multisite_password_form.rb
+- lib/merb-auth-remember-me
+- lib/merb-auth-remember-me/mixins
+- lib/merb-auth-remember-me/mixins/authenticated_user
+- lib/merb-auth-remember-me/mixins/authenticated_user/dm_authenticated_user.rb
+- lib/merb-auth-remember-me/mixins/authenticated_user.rb
+- lib/merb-auth-remember-me/strategies
+- lib/merb-auth-remember-me/strategies/remember_me.rb
 - lib/merb_auth_slice_multisite
 - lib/merb_auth_slice_multisite/merbtasks.rb
 - lib/merb_auth_slice_multisite/mixins