Merge pull request #16 from calebowens/finish-login-and-register-controllers

Fix loging in and registering

Author: Caleb-T-Owens

app/common/has_errors.rb

@@ -18,12 +18,4 @@ def template
   def errors_for(attribute)
     Errors.new(messages: errors.full_messages_for(attribute))
   end
-
-  def validations_passed?
-    errors.blank?
-  end
-
-  def validations_failed?
-    errors.any?
-  end
 end

app/features/authentication/pages/login_controller.rb

@@ -12,13 +12,17 @@ class FormObject
     validates_presence_of :email
     validates_presence_of :password
 
+    validate :ensure_user_exists # Must run last for security
+
     def user
       @user ||= User.from_login_details(email:, password:)
     end
 
     def ensure_user_exists
+      return unless errors.blank?
+
       if user.nil?
-        errors.add :email, :no_user, message: "The email and password provided did not match our records"
+        errors.add :email, :no_user, message: "and password provided did not match our records"
       end
     end
   end
@@ -58,11 +62,7 @@ def view
   def submit
     ViewContext.form_object = FormObject.new(user_params)
 
-    if ViewContext.form_object.validations_passed?
-      ViewContext.form_object.ensure_user_exists
-    end
-
-    if ViewContext.form_object.validations_passed?
+    if ViewContext.form_object.valid?
       ViewContext.form_object.user.add_to_session(session)
 
       redirect_to dashboard_home_path, status: :see_other

app/features/authentication/pages/register_controller.rb

@@ -9,33 +9,50 @@ class FormObject
 
     attr_accessor :email, :password, :confirm_password
 
-    validates :email, presence: true
+    validates :email, presence: true, email_format: { message: "formatted incorrectly" }
     validates :password, presence: true, length: {minimum: 8, maximum: 64}
-    validates :confirm_password, presence: true, comparison: {equal_to: -> { password }}
+    validates :confirm_password, presence: true
+    validate :ensure_confirm_password_equals_password
+
+    validate :ensure_no_user_with_details # Must run last for security
+
+    def ensure_no_user_with_details
+      return unless errors.blank?
+
+      if User.exists_with_email?(email)
+        errors.add :email, :email_used, message: "is already taken"
+      end
+    end
+
+    def ensure_confirm_password_equals_password
+      if confirm_password != password
+        errors.add :confirm_password, :not_password, message: "must match password"
+      end
+    end
   end
 
-  class View
+  class View < ApplicationView
     def template
       h1 { "Create a user" }
 
       render Form
     end
   end
 
-  class Form
+  class Form < ApplicationView
     def template
-      form_with(url: authentication_register_path, id: "register") do |f|
+      form_with(model: ViewContext.form_object, url: authentication_register_path, id: "register") do |f|
         f.label :email, "Email"
-        f.text_field :email, value: @submission[:email]
-        render @submission.errors_for(:email)
+        f.text_field :email
+        render ViewContext.form_object.errors_for(:email)
 
         f.label :password, "Password"
         f.password_field :password
-        render @submission.errors_for(:password)
+        render ViewContext.form_object.errors_for(:password)
 
         f.label :confirm_password, "Confirm Password"
         f.password_field :confirm_password
-        render @submission.errors_for(:confirm_password)
+        render ViewContext.form_object.errors_for(:confirm_password)
 
         f.submit "Register"
       end
@@ -53,11 +70,8 @@ def view
   def submit
     ViewContext.form_object = FormObject.new(user_params)
 
-    if ViewContext.form_object.validations_passed?
-    end
-
-    if ViewContext.form_object.validations_passed?
-      user = User.create!(email: submission[:email], password: submission[:password])
+    if ViewContext.form_object.valid?
+      user = User.create!(email: ViewContext.form_object.password, password: ViewContext.form_object.password)
 
       user.add_to_session session
 
@@ -72,7 +86,7 @@ def submit
   end
 
   def user_params
-    params.permit(
+    params.require(:authentication_pages_register_controller_form_object).permit(
       :email,
       :password,
       :confirm_password

app/javascript/application.js

@@ -2,12 +2,6 @@
 import "@hotwired/turbo-rails"
 import Alpine from "alpinejs"
 import * as Routes from "routes"
-import tippy from 'tippy.js'
-import "./othertest.js"
-
-tippy('#tippy', {
-    content: 'My tooltip!'
-});
 
 Alpine.data("notificationController", (initialNotices = []) => ({
     notices: [],

app/javascript/othertest.js

@@ -18,8 +18,8 @@
       get "/login", to: "login#view"
       post "/login", to: "login#submit"
 
-      get "/register", to: "register#handle"
-      post "/register", to: "register_submit#handle"
+      get "/register", to: "register#view"
+      post "/register", to: "register#submit"
       delete "/logout", to: "logout#handle"
     end
   end