username -> email

4 files changed, 8 insertions, 8 deletions

diff --git a/app/assets/javascripts/models/session.js.coffee b/app/assets/javascripts/models/session.js.coffee
index 1a513b2c..96a7d390 100644
--- a/app/assets/javascripts/models/session.js.coffee
+++ b/app/assets/javascripts/models/session.js.coffee
@@ -2,16 +2,16 @@ class CakeSide.Models.Session extends Backbone.Model
   EMAIL_REGEX=/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/
   modelKey: 'session'
   defaults:
-    username: null
+    email: null
     password: null
 
-  requiredFields: ['username', 'password']
+  requiredFields: ['email', 'password']
 
   validate: (attributes, options) ->
     errors = {}
 
-    if !EMAIL_REGEX.test(attributes.username)
-      errors['username'] = @errorFor('username', 'invalid')
+    if !EMAIL_REGEX.test(attributes.email)
+      errors['email'] = @errorFor('email', 'invalid')
 
     _.each @requiredFields, (field) =>
       if _.isEmpty(attributes[field])
diff --git a/app/assets/javascripts/views/sessions/login_form.js.coffee b/app/assets/javascripts/views/sessions/login_form.js.coffee
index 7240bdbe..7363f583 100644
--- a/app/assets/javascripts/views/sessions/login_form.js.coffee
+++ b/app/assets/javascripts/views/sessions/login_form.js.coffee
@@ -15,7 +15,7 @@ class CakeSide.Views.LoginForm extends CakeSide.AutoView
     @renderErrors(@model.validationError)
 
   onInput: (event) ->
-    @model.set('username', @field('username').val())
+    @model.set('email', @field('email').val())
     @model.set('password', @field('password').val())
     @$('input[type=submit]').prop('disabled', !@model.isValid())
     @render()
diff --git a/app/controllers/sessions_controller.rb b/app/controllers/sessions_controller.rb
index 76572592..564569b4 100644
--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -5,7 +5,7 @@ class SessionsController < ApplicationController
   end
 
   def create
-    if @session = User.login(session_params[:username], session_params[:password])
+    if @session = User.login(session_params[:email], session_params[:password])
       reset_session
       session[:raphael] = @session.access(request)
       redirect_to my_dashboard_path
@@ -24,6 +24,6 @@ class SessionsController < ApplicationController
   private
 
   def session_params
-    params.require(:session).permit(:username, :password)
+    params.require(:session).permit(:email, :password)
   end
 end
diff --git a/app/views/sessions/new.html.erb b/app/views/sessions/new.html.erb
index 8417b008..39d5a406 100644
--- a/app/views/sessions/new.html.erb
+++ b/app/views/sessions/new.html.erb
@@ -28,7 +28,7 @@
       <%= form_for(@session, url: sessions_path(@session), html: { class: "form-horizontal needs-validation", novalidate: :novalidate }) do |f| %>
         <legend>Got an account? Login!</legend>
         <div class="form-group">
-          <%= email_field_tag 'session[username]', '', placeholder: 'Email', class: "form-control", required: :required %>
+          <%= email_field_tag 'session[email]', '', placeholder: 'Email', class: "form-control", required: :required %>
           <div class="invalid-feedback"></div>
         </div>
         <div class="form-group">