tkh_authentication 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51349fbe53b75922d615973d307d7b3542e1679
-  data.tar.gz: b1bcacda9bcd66ff228419359f504cdba7f27a3f
+  metadata.gz: a6b683fdf77d249ed31b3965f83005273158e379
+  data.tar.gz: 463bfb0a23424d14a461ae67d59a45083b23dffa
 SHA512:
-  metadata.gz: 90594fe0bd1279e009d2d81606ef32c678b2fab5e7dcc42572b6fd7580813ae8abc56b9f927b12fc296ef9d7b2af099e6ff58eb26ac7ccddd4b139cb40587ecd
-  data.tar.gz: 5274fdd8aa41e303d3c5549862cda66b22cc639e4b4e278de7ac2cc8d8e0b984f1812ef516ca3ac97a01a5da7e81e51bb3d9562f6db0cfd669c0ec6323f3b03a
+  metadata.gz: a8d4951353ea888963d3cb6c0cdb4c3934dbe81deefd96b3f29a51cfdc7c1bf2a6bf1651264787b4a65a4581a8c38ba136fd688c7ba07caeceeffaed440b873b
+  data.tar.gz: 786ce1f96ea99508e4e5f0fd41ecc238cc7f65bdd1f72ad0476b715072ae76a45b02668b64602e5c8623d179c0dcfbf5c230b5437e4c5f58ae985c3da4f6f933

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.9.8
+
+* Debugged the parse_email method. The remote true submitting of the form was interfering with many conditions.
+
+
 ## 0.9.7
 
 * Created a whole new authentication pathway. Please run 'bundle update tkh_authentication' -> 'rake tkh_authentication:update' -> 'rake db:migrate'

data/app/controllers/reception_controller.rb

@@ -1,5 +1,7 @@
 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
@@ -10,36 +12,57 @@ class ReceptionController < ApplicationController
   end
 
   def parse_email
-    @user = User.find_by(email: params[:user][:email])
-    if @user.blank? # first take care of the easy case with a completely new user
-      # create new record
-      @user = User.new(user_params)
-      if @user.save
-        send_validation_email
-        flash[:notice] = "Your record has been successfully created."
-        # show screen to user with notice about email validation
-        @status = 'email_validation_email_sent'
-      else # problem saving new user record for some reason
-        redirect_to email_input_path, alert: "We had problems creating your record. Please try again. Make sure the email address is valid."
-      end
-    else # the email address was already in the database
-      # Returning user pathway goes here
-      if @user.email_validated? && @user.has_a_password?
-        respond_to do |format|
-          format.html { redirect_to enter_your_password_path(auth_token: @user.auth_token) }
-          format.js {}
+    unless params[:user][:email].blank?
+      @user = User.find_by(email: params[:user][:email])
+      if @user.blank? # first take care of the easy case with a completely new user
+        # create new record
+        @user = User.new(user_params)
+        if @user.save
+          send_validation_email
+          @status = 'email_validation'
+          respond_to do |format|
+            format.html { flash[:notice] = "Your record has been successfully created." }
+            format.js {}
+          end
+        else # problem saving new user record for some reason
+          @status = 'no_user_save'
+          respond_to do |format|
+            format.html { flash[:alert] = "We had problems creating your record. Please try again. Make sure the email address is valid." }
+            format.js {}
+          end
         end
-      elsif @user.email_validated? && !@user.has_a_password? # doesn't have a password
-        # User needs to securily create a password
-        send_password_creation_security_email
-        flash[:notice] = "There is 1 last step!"
-        # show screen to user with notice about password confirmation email
-        @status = 'password_confirmation_email_sent'
-      elsif !@user.email_validated?
-        send_validation_email
-        flash[:notice] = "For your security, we need to verify your email address."
-        # show screen to user with notice about email validation
-        @status = 'email_validation_email_sent'
+      else # the email address was already in the database
+        # Returning user pathway goes here
+        if @user.email_validated? && @user.has_a_password?
+          @status = 'enter_password'
+          respond_to do |format|
+            format.html { redirect_to enter_your_password_path(auth_token: @user.auth_token) }
+            format.js {}
+          end
+        elsif @user.email_validated? && !@user.has_a_password? # doesn't have a password
+          # User needs to securily create a password
+          send_password_creation_security_email
+          # show screen to user with notice about password confirmation email
+          @status = 'password_confirmation'
+          respond_to do |format|
+            format.html { flash[:notice] = "There is 1 last step!" }
+            format.js {}
+          end
+        elsif !@user.email_validated?
+          send_validation_email
+          # show screen to user with notice about email validation
+          @status = 'email_validation'
+          respond_to do |format|
+            format.html { flash[:notice] = "For your security, we need to verify your email address." }
+            format.js {}
+          end
+        end
+      end
+    else # email is blank
+      @status = 'blank_email'
+      respond_to do |format|
+        format.html { flash[:alert] = "Your email address cannot be blank." }
+        format.js {}
       end
     end
   end

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

@@ -13,5 +13,14 @@
   <br />
   <%= f.input_field :remember_me, as: :boolean, boolean_style: :inline, checked: 'checked' %> &nbsp;remember me
   <br /><br />
+
+  <% unless @user.visible_name_present? %>
+    <p>Please take a few seconds to enter your name.</p>
+    <%= f.input :first_name %>
+    <%= f.input :last_name %>
+    <% # i want certain sites to use a different label for this. They can add a partial in host app. %>
+    <%= f.input :other_name, label: render('shared/other_name_label') %><br />
+  <% end %>
+
   <%= f.submit 'Create password and log in!', class: 'btn btn-primary' %>
 <% end %>

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

@@ -3,7 +3,7 @@
 
 <% unless current_user # most folks coming to this page should not be logged in %>
 
-  <h1>Login</h1>
+  <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 %>

data/app/views/reception/parse_email.js.erb

@@ -1,4 +1,36 @@
-// $('#email-input-form').slideUp(500);
-$('#email-input-form').replaceWith("<%= escape_javascript(render(:partial => 'reception/enter_your_password_form')) %>");
-$(".user_password").effect("highlight", { color: '#8D5530' }, 750);
-$('input#user_password').focus();
+<% if @status == 'enter_password' %>
+
+  $('h1#login-header').html('Please Enter Your Password');
+  $('#email-input-form').replaceWith("<%= escape_javascript(render(:partial => 'reception/enter_your_password_form')) %>");
+  $('h1').effect("highlight", { color: '#8D5530' }, 1000);
+  $(".user_password").effect("highlight", { color: '#8D5530' }, 1000);
+  $('input#user_password').focus();
+  $('.alert-danger').slideUp(750);
+
+<% elsif @status == 'email_validation' %>
+
+  $('h1#login-header').html('A Validation Email is Coming');
+  $('#email-input-form').replaceWith("<p class=\"validation-message\">We have sent you an email. Please check your inbox or your spam folder.</p>");
+  $('h1').effect("highlight", { color: '#8D5530' }, 1000);
+  $("p.validation-message").effect("highlight", { color: '#8D5530' }, 1000);
+  $('.alert-danger').slideUp(750);
+
+<% elsif @status == 'password_confirmation' %>
+
+  $('h1#login-header').html('A Password Creation Security Email is Coming');
+  $('#email-input-form').replaceWith("<p class=\"confirmation-message\">For your security we need to check that you truly are the owner of this account. Please check your inbox or spam folder.</p>");
+  $('h1').effect("highlight", { color: '#8D5530' }, 1000);
+  $("p.confirmation-message").effect("highlight", { color: '#8D5530' }, 1000);
+  $('.alert-danger').slideUp(750);
+
+<% elsif @status == 'blank_email' %>
+
+  $('h1#login-header').after('<div class="alert alert-danger"><a class="close" data-dismiss="alert">×</a>The email address CANNOT be blank.</div>');
+  $('.alert-danger').hide().slideDown(750);
+
+<% elsif @status == 'no_user_save' %>
+
+  $('h1#login-header').after('<div class="alert alert-danger"><a class="close" data-dismiss="alert">×</a>We had problems creating your record. Please try again. Make sure the email address is valid.</div>');
+  $('.alert-danger').hide().slideDown(750);
+
+<% end %>

data/lib/tkh_authentication/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_authentication
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Swami Atma