From 67dc2685a72c125b53f351c3a75bf812123e96bd Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 12 Nov 2012 13:03:13 +0100
Subject: fixed signup bug and refactored a bit

---
 users/app/assets/javascripts/users.js.coffee | 51 ++++++++++++++++------------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
index 24302fe..8a9f0e9 100644
--- a/users/app/assets/javascripts/users.js.coffee
+++ b/users/app/assets/javascripts/users.js.coffee
@@ -3,43 +3,50 @@
 # You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
 #
 
-validate_password = (event) ->
+preventDefault = (event) ->
+  event.preventDefault()
 
-  password = $('#srp_password').val()
-  confirmation = $('#srp_password_confirmation').val()
-  login = $('#srp_username').val()
-
-  if password != confirmation
-    alert "Password and Confirmation do not match!"
-    $('#srp_password').focus()
-    return false
-  if password == login
-    alert "Password and Login may not match!"
-    $('#srp_password').focus()
-    return false
-  if password.length < 8
-    alert "Password needs to be at least 8 characters long!"
-    $('#srp_password').focus()
-    return false
+validOrAbort = (event) ->
+  errors = {}
+  
+  abortIfErrors = ->
+    return if $.isEmptyObject(errors)
+    $.each errors, (field, error) ->
+      alert(error) 
+      $('#srp_password').focus()
+    event.stopImmediatePropagation()
+    
+  validatePassword = ->
+    password = $('#srp_password').val()
+    confirmation = $('#srp_password_confirmation').val()
+    login = $('#srp_username').val()
+  
+    if password != confirmation
+      errors.password_confirmation = "Confirmation does not match!"
+    if password == login
+      errors.password = "Password and Login may not match!"
+    if password.length < 8
+      errors.password = "Password needs to be at least 8 characters long!"
+
+  validatePassword()
+  abortIfErrors()
   
-  return true
   
-
 signup = (event) ->
   srp = new SRP(jqueryRest())
   srp.register ->
     window.location = '/'
-  false
 
 login = (event) ->
   srp = new SRP(jqueryRest())
   srp.identify ->
     window.location = '/'
-  false
 
 
 $(document).ready ->
-  $('#new_user').submit validate_password
+  $('#new_user').submit preventDefault
+  $('#new_user').submit validOrAbort
   $('#new_user').submit signup
+  $('#new_session').submit preventDefault
   $('#new_session').submit login
 
-- 
cgit v1.2.3


From 05ea71016fd54a14159c72299c25efbdc2f177bc Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 12 Nov 2012 19:16:19 +0100
Subject: adding client side validations to the mix

---
 Gemfile.lock                                   |  6 ++++++
 app/assets/javascripts/application.js          |  2 ++
 config/initializers/client_side_validations.rb | 14 ++++++++++++++
 ui_dependencies.rb                             |  2 ++
 users/app/views/users/new.html.haml            |  2 +-
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 config/initializers/client_side_validations.rb

diff --git a/Gemfile.lock b/Gemfile.lock
index 6792476..a7d110d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -61,6 +61,10 @@ GEM
     arel (3.0.2)
     bootstrap-sass (2.1.0.0)
     builder (3.0.3)
+    client_side_validations (3.2.1)
+    client_side_validations-simple_form (2.0.0)
+      client_side_validations (~> 3.2.0)
+      simple_form (~> 2.0.3)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
       railties (~> 3.2.0)
@@ -173,6 +177,8 @@ PLATFORMS
 
 DEPENDENCIES
   bootstrap-sass (~> 2.1.0)
+  client_side_validations
+  client_side_validations-simple_form
   coffee-rails (~> 3.2.2)
   haml (~> 3.1.7)
   haml-rails (~> 0.3.4)
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index dc975d4..f7ca1ec 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -16,3 +16,5 @@
 //= require users
 //= require_tree .
 //= require bootstrap
+//= require rails.validations
+//= require rails.validations.simple_form
diff --git a/config/initializers/client_side_validations.rb b/config/initializers/client_side_validations.rb
new file mode 100644
index 0000000..2c73fa3
--- /dev/null
+++ b/config/initializers/client_side_validations.rb
@@ -0,0 +1,14 @@
+# ClientSideValidations Initializer
+
+# Uncomment to disable uniqueness validator, possible security issue
+# ClientSideValidations::Config.disabled_validators = [:uniqueness]
+
+# Uncomment the following block if you want each input field to have the validation messages attached.
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  unless html_tag =~ /^<label/
+    %{<div class="field_with_errors">#{html_tag}<label for="#{instance.send(:tag_id)}" class="message">#{instance.error_message.first}</label></div>}.html_safe
+  else
+    %{<div class="field_with_errors">#{html_tag}</div>}.html_safe
+  end
+end
+
diff --git a/ui_dependencies.rb b/ui_dependencies.rb
index 9b9f853..44f8f32 100644
--- a/ui_dependencies.rb
+++ b/ui_dependencies.rb
@@ -2,6 +2,8 @@ gem "haml", "~> 3.1.7"
 gem "bootstrap-sass", "~> 2.1.0"
 gem "jquery-rails"
 gem "simple_form"
+gem 'client_side_validations'
+gem 'client_side_validations-simple_form'
 
 group :assets do
   gem "haml-rails", "~> 0.3.4"
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index 835e99a..3e7d06d 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -1,6 +1,6 @@
 .span8.offset2
   %h2=t :signup
-  = simple_form_for @user, :html => {:class => 'form-horizontal'} do |f|
+  = simple_form_for @user, :validate => true, :html => {:class => 'form-horizontal'} do |f|
     %legend=t :signup_message
     = f.input :login, :input_html => { :id => :srp_username }
     = f.input :password, :required => true, :input_html => { :id => :srp_password }
-- 
cgit v1.2.3


From 6363bde178c9adb08754cfc83ea102039492d6c6 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Mon, 12 Nov 2012 19:49:21 +0100
Subject: fixed .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index cdbdc16..fc7039e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,9 +17,10 @@
 /pkg
 /*/pkg
 /log
+Gemfile.lock
 */Gemfile.lock
 test/dummy/log/*
 test/dummy/tmp/*
 
 # Ignore configuration file.
-config/config.ymlGemfile.lock
+config/config.yml
-- 
cgit v1.2.3


From 78475cb1b3d4f18a5c0a0fb326e6465b92a5f0e7 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 13 Nov 2012 12:00:01 +0100
Subject: testing against current staging server

---
 users/test/integration/api/python/flow_with_srp.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/users/test/integration/api/python/flow_with_srp.py b/users/test/integration/api/python/flow_with_srp.py
index 0a11aec..b599252 100755
--- a/users/test/integration/api/python/flow_with_srp.py
+++ b/users/test/integration/api/python/flow_with_srp.py
@@ -16,7 +16,7 @@ def id_generator(size=6, chars=string.ascii_uppercase + string.digits):
   return ''.join(random.choice(chars) for x in range(size))
 
 # using globals for a start
-server = 'http://springbok/1/'
+server = 'http://springbok.leap.se/1/'
 login = id_generator()
 password = id_generator() + id_generator()
 
-- 
cgit v1.2.3


From 6ba3366f778340ebeaa73fd53372368b16de6c98 Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Tue, 13 Nov 2012 12:00:13 +0100
Subject: using client side validations during signup

---
 users/app/assets/javascripts/users.js.coffee | 11 +++--------
 users/app/models/user.rb                     | 11 +++++++++--
 users/app/views/users/new.html.haml          |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/users/app/assets/javascripts/users.js.coffee b/users/app/assets/javascripts/users.js.coffee
index 8a9f0e9..ab437f6 100644
--- a/users/app/assets/javascripts/users.js.coffee
+++ b/users/app/assets/javascripts/users.js.coffee
@@ -1,8 +1,3 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
-#
-
 preventDefault = (event) ->
   event.preventDefault()
 
@@ -11,9 +6,9 @@ validOrAbort = (event) ->
   
   abortIfErrors = ->
     return if $.isEmptyObject(errors)
-    $.each errors, (field, error) ->
-      alert(error) 
-      $('#srp_password').focus()
+    # we're relying on client_side_validations here instead of printing
+    # our own errors. This gets us translatable error messages.
+    $('.control-group.error input, .control-group.error select, control-group.error textarea').first().focus()
     event.stopImmediatePropagation()
     
   validatePassword = ->
diff --git a/users/app/models/user.rb b/users/app/models/user.rb
index 0f5d650..824c439 100644
--- a/users/app/models/user.rb
+++ b/users/app/models/user.rb
@@ -16,8 +16,11 @@ class User < CouchRest::Model::Base
       :message => "Only letters, digits and _ allowed" }
 
   validates :password_salt, :password_verifier,
-    :format => { :with => /\A[\dA-Fa-f]+\z/,
-      :message => "Only hex numbers allowed" }
+    :format => { :with => /\A[\dA-Fa-f]+\z/, :message => "Only hex numbers allowed" }
+
+  validates :password, :presence => true,
+    :confirmation => true,
+    :format => { :with => /.{8}.*/, :message => "needs to be at least 8 characters long" }
 
   timestamps!
 
@@ -71,4 +74,8 @@ class User < CouchRest::Model::Base
     APP_CONFIG['admins'].include? self.login
   end
 
+  protected
+  def password
+    password_verifier
+  end
 end
diff --git a/users/app/views/users/new.html.haml b/users/app/views/users/new.html.haml
index 3e7d06d..be14c52 100644
--- a/users/app/views/users/new.html.haml
+++ b/users/app/views/users/new.html.haml
@@ -3,7 +3,7 @@
   = simple_form_for @user, :validate => true, :html => {:class => 'form-horizontal'} do |f|
     %legend=t :signup_message
     = f.input :login, :input_html => { :id => :srp_username }
-    = f.input :password, :required => true, :input_html => { :id => :srp_password }
+    = f.input :password, :required => true, :validate => true, :input_html => { :id => :srp_password }
     = f.input :password_confirmation, :required => true, :input_html => { :id => :srp_password_confirmation }
     = f.button :submit, :value => t(:signup), :class => 'btn-primary' 
     = link_to t(:cancel), root_url, :class => :btn
-- 
cgit v1.2.3