Replace username with email

Author: Torie Joy-Warren

app/controllers/sessions_controller.rb

@@ -5,7 +5,7 @@ def new
   end
 
   def create
-    user = User.find_by(username: params[:username])
+    user = User.find_by(email: params[:email])
     if user&.authenticate(params[:password])
        session[:user_id] = user.id
        redirect_to user_path(user)

app/controllers/users_controller.rb

@@ -17,6 +17,6 @@ def create
   end
 
   def user_params
-    params.require(:user).permit(:username, :password)
+    params.require(:user).permit(:name, :email, :password)
   end
 end

app/models/user.rb

@@ -2,10 +2,15 @@ class User < ApplicationRecord
   has_many :recipes
   has_one :grocery_list
 
-  validates :username,
+  validates :name,
+    presence: true,
+    allow_blank: false
+
+  validates :email,
     presence: true,
     allow_blank: false,
-    uniqueness: { message: "\"%{value}\" is already taken. Please choose another!" }
+    format: { with: URI::MailTo::EMAIL_REGEXP },
+    uniqueness: { message: "An account with that email has already been created." }
 
   has_secure_password
 

app/views/sessions/new.html.erb

@@ -3,8 +3,8 @@
 
   <%= form_tag "/login" do %>
     <div class="field">
-      <%= label_tag :username, nil, class: "label" %>
-      <%= text_field_tag :username, nil, class: "input" %> <br/>
+      <%= label_tag :email, nil, class: "label" %>
+      <%= text_field_tag :email, nil, class: "input" %> <br/>
     </div>
     <div class="field">
       <%= label_tag :password, nil, class: "label" %>

app/views/users/new.html.erb

@@ -3,8 +3,12 @@
 
   <%= form_for(@user) do |f| %>
     <div class="field">
-      <%= f.label :username, class: "label" %>
-      <%= f.text_field :username, class: "input" %> <br/>
+      <%= f.label :name, class: "label" %>
+      <%= f.text_field :name, class: "input" %> <br/>
+    </div>
+    <div class="field">
+      <%= f.label :email, class: "label" %>
+      <%= f.text_field :email, class: "input" %> <br/>
     </div>
     <div class="field">
       <%= f.label :password, class: "label" %>

app/views/users/show.html.erb

@@ -1,6 +1,6 @@
 <div id="user-profile">
   <h1 id="user-welcome">
-    <%= "Welcome, #{current_user.username}!" %>
+    <%= "Welcome, #{current_user.name}!" %>
   </h1>
 
   <div class="columns">

db/migrate/20200327154020_create_users.rb

@@ -1,11 +1,12 @@
 class CreateUsers < ActiveRecord::Migration[6.0]
   def change
     create_table :users do |t|
-      t.string :username, null: false
+      t.string :name, null: false
+      t.string :email, null: false
       t.string :password_digest, null: false
 
       t.timestamps
     end
-    add_index :users, :username, unique: true
+    add_index :users, :email, unique: true
   end
 end

db/structure.sql

@@ -219,7 +219,8 @@ CREATE TABLE public.schema_migrations (
 
 CREATE TABLE public.users (
     id bigint NOT NULL,
-    username character varying NOT NULL,
+    name character varying NOT NULL,
+    email character varying NOT NULL,
     password_digest character varying NOT NULL,
     created_at timestamp(6) without time zone NOT NULL,
     updated_at timestamp(6) without time zone NOT NULL
@@ -408,10 +409,10 @@ CREATE INDEX index_recipes_on_user_id ON public.recipes USING btree (user_id);
 
 
 --
--- Name: index_users_on_username; Type: INDEX; Schema: public; Owner: -
+-- Name: index_users_on_email; Type: INDEX; Schema: public; Owner: -
 --
 
-CREATE UNIQUE INDEX index_users_on_username ON public.users USING btree (username);
+CREATE UNIQUE INDEX index_users_on_email ON public.users USING btree (email);
 
 
 --

spec/controllers/recipes_controller_spec.rb

@@ -3,7 +3,7 @@
 describe RecipesController do
   include Helpers::ControllerAuthentication
 
-  let(:user) { User.create!(username: "user1234", password: "password") }
+  let(:user) { User.create!(name: "name", email: "[email protected]", password: "password") }
 
   describe "GET #new" do
     before do

spec/controllers/sessions_controller_spec.rb

@@ -13,13 +13,13 @@
   describe "POST #create" do
     subject { post :create, params: user_params }
     let(:user_params) {
-      { username: username, password: password }
+      { email: email, password: password }
     }
-    let(:username) { "user1234" }
+    let(:email) { "[email protected]" }
     let(:password) { "password" }
 
     context "user exists" do
-      let!(:user) { User.create!(username: username, password: password) }
+      let!(:user) { User.create!(name: "name", email: email, password: password) }
 
       context "user credentials are valid" do
         it "logs in the user" do
@@ -30,7 +30,7 @@
 
       context "user credentials are invalid" do
         let(:user_params) {
-          { username: username, password: "badpassword" }
+          { email: email, password: "badpassword" }
         }
 
         it "does not log in the user" do

spec/controllers/users_controller_spec.rb

@@ -13,7 +13,7 @@
   describe "POST #create" do
     subject { post :create, params: { user: user_params } }
     let(:user_params) {
-      { username: "user1234", password: "password" }
+      { email: "[email protected]", name: "name", password: "password" }
     }
 
     it "redirects to the user path" do
@@ -24,21 +24,21 @@
       expect { subject }.to change { User.count }.by 1
     end
 
-    context "no username is provided" do
+    context "no email is provided" do
       let(:user_params) {
-        { username: nil, password: "password" }
+        { email: nil, name: "name", password: "password" }
       }
 
       it "renders the sign up form with an error" do
         expect(subject).to render_template(:new)
 
-        expect(flash.alert).to eq "Username can't be blank"
+        expect(flash.alert).to eq "Email can't be blank, Email is invalid"
       end
     end
 
     context "no password is provided" do
       let(:user_params) {
-        { username: "user1234", password: nil }
+        { email: "[email protected]", name: "user1234", password: nil }
       }
 
       it "renders the sign up form with an error" do

spec/factories/user.rb

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :user do
-    username { Faker::Name.unique.name }
+    name { Faker::Name.unique.name }
+    email { Faker::Internet.email }
     password { "password" }
   end
 end

spec/features/user_log_out_spec.rb

@@ -4,7 +4,7 @@
   include Helpers::FeatureAuthentication
 
   context "user is logged in" do
-    let(:user) { User.create!(username: "user1234", password: "password") }
+    let(:user) { create(:user) }
 
     before do
       sign_in(user)

spec/features/user_login_spec.rb

@@ -1,16 +1,16 @@
 require "rails_helper"
 
 feature "User login" do
-  let(:username) { "user1234" }
+  let(:email) { "[email protected]" }
   let(:password) { "password" }
 
   context "user provides valid login credentials" do
-    let!(:user) { User.create!(username: username, password: password) }
+    let!(:user) { create(:user, email: email, password: password) }
 
     it "redirects to the user's profile page" do
       visit login_path
 
-      fill_in :username, with: username
+      fill_in :email, with: email
       fill_in :password, with: password
 
       click_button "Log In"
@@ -23,7 +23,7 @@
     it "notifies the user" do
       visit login_path
 
-      fill_in :username, with: username
+      fill_in :email, with: email
       fill_in :password, with: password
 
       click_button "Log In"

spec/features/user_profile_spec.rb

@@ -4,7 +4,7 @@
   include Helpers::FeatureAuthentication
 
   context "user is logged in" do
-    let(:user) { User.create!(username: "user1234", password: "password") }
+    let(:user) { create(:user) }
     let!(:recipe1) {
       create(:recipe, user: user, instructions: "Mix & bake :)", notes: "notes on this recipe")
     }
@@ -18,7 +18,7 @@
 
     it "shows the user's profile" do
       expect(current_path).to eq user_path(user)
-      expect(page).to have_text "Welcome, #{user.username}!"
+      expect(page).to have_text "Welcome, #{user.name}!"
 
       expect(page).to have_text "Recipes"
       expect(page).to have_link recipe1.name

spec/features/user_sign_up_spec.rb

@@ -1,7 +1,8 @@
 require "rails_helper"
 
 feature "User sign up" do
-  let(:username) { "user1234" }
+  let(:email) { "[email protected]" }
+  let(:name)  { "name" }
 
   def click_submit
     click_button "Create account"
@@ -12,14 +13,16 @@ def click_submit
 
     expect(page).to have_text "Create an account"
 
-    fill_in "user_username", with: username
+    fill_in "user_name", with: name
+    fill_in "user_email", with: email
     fill_in "user_password", with: "securepassword"
 
     expect { click_submit }.to change { User.count }.by 1
 
     new_user = User.last
 
-    expect(new_user.username).to eq username
+    expect(new_user.name).to eq name
+    expect(new_user.email).to eq email
     expect(new_user.password_digest).to_not be nil
     expect(current_path).to eq user_path(new_user)
   end
@@ -28,38 +31,41 @@ def click_submit
     it "does not allow the user to submit the form" do
       visit new_user_path
 
-      fill_in "user_username", with: username
+      fill_in "user_email", with: email
+      fill_in "user_name", with: name
       click_submit
 
       expect(page).to have_text "Password can't be blank"
     end
   end
 
-  context "no username is provided" do
+  context "no email is provided" do
     it "does not allow the user to submit the form" do
       visit new_user_path
 
+      fill_in "user_name", with: name
       fill_in "user_password", with: "password"
       click_submit
 
-      expect(page).to have_text "Username can't be blank"
+      expect(page).to have_text "Email can't be blank"
     end
   end
 
-  context "username has already been taken" do
+  context "email has already been taken" do
     before do
-      User.create!(username: username, password: "password")
+      create(:user, email: email)
     end
 
-    it "prompts the user to choose another username" do
+    it "prompts the user to choose another email" do
       visit new_user_path
 
-      fill_in "user_username", with: username
+      fill_in "user_name", with: name
+      fill_in "user_email", with: email
       fill_in "user_password", with: "securepassword"
 
       click_submit
 
-      expect(page).to have_text "Username \"#{username}\" is already taken. Please choose another!"
+      expect(page).to have_text "An account with that email has already been created."
     end
   end
 end

spec/support/helpers/authentication.rb

@@ -3,7 +3,7 @@ module FeatureAuthentication
     def sign_in(user)
       visit login_path
 
-      fill_in :username, with: user.username
+      fill_in :email, with: user.email
       fill_in :password, with: user.password
 
       click_button "Log In"