tkh_authentication 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6b683fdf77d249ed31b3965f83005273158e379
-  data.tar.gz: 463bfb0a23424d14a461ae67d59a45083b23dffa
+  metadata.gz: ad67afa91517c97feb537facbd5a88becab69c46
+  data.tar.gz: 50a213457bc223e4f6d28038783d852e2435d0ee
 SHA512:
-  metadata.gz: a8d4951353ea888963d3cb6c0cdb4c3934dbe81deefd96b3f29a51cfdc7c1bf2a6bf1651264787b4a65a4581a8c38ba136fd688c7ba07caeceeffaed440b873b
-  data.tar.gz: 786ce1f96ea99508e4e5f0fd41ecc238cc7f65bdd1f72ad0476b715072ae76a45b02668b64602e5c8623d179c0dcfbf5c230b5437e4c5f58ae985c3da4f6f933
+  metadata.gz: f649d7e592ae9b578b21f01bfa6b1797d36e4e2c925ecb4a6e9ba52c6850377c8a3d388a4c8d65416993c3a86c0f7f2f85a31955f63448bb52eb2043d767029a
+  data.tar.gz: 11b7120fe872280c23731260b9c97431154c4da8f1038628d89e070a2815c31d4078d467875bef48e99808fd7ca9015270d3416d4d44c5702dccaf0cfb926c09

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.9.9
+
+* Upon succesful login, if target page is a reception page, redirect user to home page instead.
+* Extracted the email_input form to a partial which can be called from any page on top of being used in the login page.
+
+
 ## 0.9.8
 
 * Debugged the parse_email method. The remote true submitting of the form was interfering with many conditions.

data/app/controllers/reception_controller.rb

@@ -1,7 +1,5 @@
 class ReceptionController < ApplicationController
 
-  # FIXME - debugging mode now. The ajax call has messed conditions where I want HTML to be rendered.
-
   # TODO change email address - may be a profile feature in tkh_mailing_list
   # TODO change password -              ""
   # TODO localize the whole process
@@ -128,7 +126,8 @@ class ReceptionController < ApplicationController
       if @user.email_validated?
         if @user.authenticate(params[:user][:password])
           login_the_user
-          redirect_to (session[:target_page] || root_url), notice: t('authentication.login_confirmation')
+          flash[:notice] = t('authentication.login_confirmation')
+          redirect_user_upon_successful_login
           destroy_target_page
         else # most likely wrong password
           flash.now.alert = t('authentication.warning.email_or_password_invalid')
@@ -251,4 +250,17 @@ class ReceptionController < ApplicationController
     end
   end
 
+  def redirect_user_upon_successful_login
+    if session[:target_page].present?
+      # add case when target pages is login page.
+      unless Rails.application.routes.recognize_path(session[:target_page])[:controller] == 'reception'
+        redirect_to session[:target_page]
+      else # the target page is the login or reception page
+        redirect_to root_url
+      end
+    else # no target page is set
+      redirect_to root_url
+    end
+  end
+
 end

data/app/views/reception/_email_input_form.html.erb

@@ -0,0 +1,9 @@
+<% submit_message = 'proceed' if submit_message.blank? %>
+
+<%= simple_form_for User.new, url: parse_email_path, html: { id: 'email-input-form' }, remote: true, method: 'post' do |f| %>
+  <%= f.error_notification %>
+
+  <%= f.input :email, autofocus: true, label: 'Please enter your email address' %>
+  <br />
+  <%= f.button :submit, submit_message, :class => 'btn btn-primary' %>
+<% end %>

data/app/views/reception/email_input.html.erb

@@ -5,13 +5,7 @@
 
   <h1 id="login-header">Login</h1>
 
-  <%= simple_form_for User.new, url: parse_email_path, html: { id: 'email-input-form' }, remote: true, method: 'post' do |f| %>
-    <%= f.error_notification %>
-
-    <%= f.input :email, autofocus: true, label: 'Please enter your email address' %>
-    <br />
-    <%= f.button :submit, 'proceed', :class => 'btn btn-primary' %>
-  <% end %>
+  <%= render 'email_input_form' %>
 
 <% else # the user is already logged in %>
 

data/config/routes.rb

@@ -11,7 +11,7 @@ Rails.application.routes.draw do
     end
 
     ##### ACCESS CONTROL
-    # legacy routes. Pointing to new pathway.
+    # legacy routes. Pointing to new pathway. Keep them. They are semantically sound.
     get 'signup', to: 'reception#email_input', as: 'signup'
     get 'login', to: 'reception#email_input', as: 'login'
     get 'logout', to: 'reception#disconnect', as: 'logout'

data/lib/tkh_authentication/version.rb

@@ -1,3 +1,3 @@
 module TkhAuthentication
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_authentication
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-12 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,6 +96,7 @@ files:
 - app/controllers/users_controller.rb
 - app/mailers/reception_mailer.rb
 - app/models/user.rb
+- app/views/reception/_email_input_form.html.erb
 - app/views/reception/_enter_your_password_form.html.erb
 - app/views/reception/_enter_your_password_form.js.erb
 - app/views/reception/change_your_password.html.erb
@@ -170,7 +171,8 @@ files:
 - test/test_helper.rb
 - test/tkh_authentication_test.rb
 homepage: https://github.com/allesklar/tkh_authentication
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []