scottmotte-merb_auth_slice_multisite 0.7.0 → 0.7.1

data/README.textile

@@ -76,6 +76,14 @@ def get_site
 end
 </code></pre>
 
+8. Configure forgot_password functionality. Add the following into merb/merb-auth/setup.rb
+<pre><code># To change the parameter names for the password or login field you may set either of these two options
+#
+# Merb::Plugins.config[:"merb-auth"][:login_param]    = :email 
+# Merb::Plugins.config[:"merb-auth"][:password_param] = :my_password_field_name
+Merb::Slices::config[:merb_auth_slice_multisite][:send_password_from_email] = "no-reply@yourapp.com"
+Merb::Slices::config[:merb_auth_slice_multisite][:domain] = "example.com"</code></pre>
+
 
 h2. Additional details:
 

data/VERSION.yml

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

data/app/controllers/passwords.rb

@@ -1,25 +1,30 @@
 class MerbAuthSliceMultisite::Passwords <  MerbAuthSliceMultisite::Application
- 
-  def forgot_password
-    render
-  end
   
   def send_password
     @login_param = Merb::Authentication::Strategies::Multisite::Base.login_param
     @site_id_param = Merb::Authentication::Strategies::Multisite::Base.site_id_param
-    @user = Merb::Authentication.user_class.find_with_login_param(@login_param, params[@login_param])
     @user = Merb::Authentication.user_class.first(@login_param => params[@login_param], @site_id_param => params[@site_id_param])
       
     if @user
       from = MerbAuthSliceMultisite[:send_password_from_email]
-      raise "No :send_password_from_email option set for Merb::Slices::config[:merb_auth_slice_multisite][:send_password_from_email]" unless from      
-      send_mail(MerbAuthSliceMultisite::SendPasswordMailer, :send_password, { :subject => (MerbAuthSliceMultisite[:send_password_subject] || "Your password"), :from => from, :to => @user.email }, { :user => @user })
-      # MerbAuthSliceMultisite::SendPasswordMailer.dispatch_and_deliver(:send_password, :subject => (MerbAuthSliceMultisite[:send_password_subject] || "Your password"), :from => from, :to => @user.email), :user => @user)
+      raise "No :send_password_from_email option set for Merb::Slices::config[:merb_auth_slice_multisite][:send_password_from_email]" unless from 
+      @user.password = @user.password_confirmation = new_generated_password     
+      send_mail(MerbAuthSliceMultisite::SendPasswordMailer, :send_password, { :subject => (MerbAuthSliceMultisite[:send_password_subject] || "Forgetful? :)"), :from => from, :to => @user.email }, { :user => @user })
+      @user.save
       redirect "/", :message => {:notice => "Password sent".t}
     else
       message[:error] = "User with #{@login_param} \"%s\" not found".t(params[@login_param].freeze)
       render :forgot_password
     end
   end
+  
+  private
+  
+    def new_generated_password
+      chars = ("a".."z").to_a
+      start_password = ""
+      1.upto(6) { |i| start_password << chars[rand(chars.size-1)] }
+      @password = start_password
+    end
  
 end # MerbAuthSliceMultisite::Passwords

data/app/mailers/views/send_password_mailer/send_password.text.erb

@@ -1,3 +1,3 @@
-Your password is <%= @user.password %>
+Your new password is <%= @user.password %>
 
 	Log on at http://<%= @user.site.subdomain %>.<%= Merb::Slices::config[:merb_auth_slice_multisite][:domain] %>

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

@@ -1,7 +1,6 @@
-<h3>Login</h3>
-
-<div>
-
+<div id="login">
+	<h3>Login</h3>
+	
   <%= error_messages_for session.authentication %>
   <% @login_param = Merb::Authentication::Strategies::Multisite::Base.login_param %>
   <% @password_param = Merb::Authentication::Strategies::Multisite::Base.password_param %>
@@ -13,9 +12,9 @@
 	@current_site = Site.first(:subdomain => request.first_subdomain)
 	%>
   
-	<form action="<%= slice_url(:merb_auth_slice_multisite, :perform_login) %>" method="POST" accept-charset="utf-8">
+	<form action="<%= slice_url(:merb_auth_slice_multisite, :perform_login) %>" method="POST" accept-charset="utf-8" id="login_form">
 		<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" />
+		<input type="hidden" name="_method" value="PUT" />
 	  <div class="formRow">
 	    <label><%= @login_param.to_s.capitalize %>: <input type="text" name="<%= @login_param.to_s %>" value="" id="<%= @login_param.to_s %>"></label>
 	  </div> <!-- close: formRow -->
@@ -29,4 +28,16 @@
 	    <a href="/forgot_password">Forgot password</a>
 	  </div> <!-- close: formRow -->
 	</form>
+</div>
+
+<div id="forgot_password">
+	<form action="/send_password" method="post" accept-charset="utf-8" id="send_password_form">
+		<input type="hidden" name="<%= @site_id_param.to_s %>" value="<%= @current_site.id %>" id="<%= @site_id_param.to_s %>">
+		<div class="formRow">
+	    <label for="<%= @login_param.to_s %>"><%= @login_param.to_s.capitalize %>: <input type="text" class="text" name="<%= @login_param.to_s %>" id="<%= @login_param.to_s %>" /></label>
+	  </div> <!-- close: formRow -->
+		<div class="formRow">
+			<input type="submit" name="Reset" value="Reset password" id="Reset" />
+	  </div> <!-- close: formRow -->
+	</form>
 </div>

data/lib/merb_auth_slice_multisite.rb

@@ -87,12 +87,10 @@ if defined?(Merb::Plugins)
     # @note prefix your named routes with :merb_auth_slice_multisite_
     #   to avoid potential conflicts with global named routes.
     def self.setup_router(scope)
-      # example of a named route
+      scope.match("/send_password", :method => :post).to(:controller => "passwords", :action => "send_password").name(:send_password)
       scope.match("/login", :method => :get ).to(:controller => "/exceptions", :action => "unauthenticated").name(:login)
       scope.match("/login", :method => :put ).to(:controller => "sessions", :action => "update").name(:perform_login)
       scope.match("/logout").to(:controller => "sessions", :action => "destroy").name(:logout)
-      scope.match("/forgot_password", :method => :get).to(:controller => "passwords", :action => "forgot_password").name(:forgot_password)
-      scope.match("/forgot_password", :method => :post).to(:controller => "passwords", :action => "send_password").name(:send_password)
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scottmotte-merb_auth_slice_multisite
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - scottmotte
@@ -63,8 +63,6 @@ files:
 - app/views/exceptions/unauthenticated.html.erb
 - app/views/layout
 - app/views/layout/merb_auth_slice_multisite.html.erb
-- app/views/passwords
-- app/views/passwords/forgot_password.html.erb
 - config/database.yml
 - config/dependencies.rb
 - config/init.rb

data/app/views/passwords/forgot_password.html.erb

@@ -1,18 +0,0 @@
-<% @login_param = Merb::Authentication::Strategies::Multisite::Base.login_param %>
-<% @site_id_param = Merb::Authentication::Strategies::Multisite::Base.site_id_param %>
-<% 
-# make @current_site value. application.rb does not get call 
-# because the authentication is protected at the rack level - which is better, 
-# but it means I have to add the following duplicate line of code as far as I know.
-@current_site = Site.first(:subdomain => request.first_subdomain)
-%>
-
-<form action="" method="post">
-	<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" />
-  <p>
-    <label for="<%= @login_param.to_s %>"><%= @login_param.to_s.capitalize.t %></label>
-    <input type="text" class="text" name="<%= @login_param.to_s %>" id="<%= @login_param.to_s %>" />
-  </p>
-  <input type="submit" value="Reset password" />
-</form>