Merge pull request #2529 from mroderick/fix/find-by-nil-errors-v2

fix: use find_by! to return 404 for invalid tokens

Author: mroderick

app/controllers/admin/events_controller.rb

@@ -67,7 +67,7 @@ def attendees_emails
   private
 
   def set_event
-    @original_event = Event.find_by(slug: params[:id])
+    @original_event = Event.find_by!(slug: params[:id])
     @event = EventPresenter.new(@original_event)
   end
 

app/controllers/admin/invitations_controller.rb

@@ -73,7 +73,7 @@ def update_to_not_attending
   end
 
   def set_invitation
-    @invitation = @workshop.invitations.find_by(token: invitation_id)
+    @invitation = @workshop.invitations.find_by!(token: invitation_id)
   end
 
   def invitation_id

app/controllers/admin/meeting_invitations_controller.rb

@@ -34,7 +34,7 @@ def create
   private
 
   def set_invitation
-    @invitation = MeetingInvitation.find_by(token: id)
+    @invitation = MeetingInvitation.find_by!(token: id)
   end
 
   def id

app/controllers/admin/meetings_controller.rb

@@ -54,7 +54,7 @@ def invite
   private
 
   def set_meeting
-    @meeting = Meeting.find_by(slug: slug)
+    @meeting = Meeting.find_by!(slug: slug)
   end
 
   def slug

app/controllers/concerns/workshop_invitation_concerns.rb

@@ -23,7 +23,7 @@ def back_with_message(message)
     end
 
     def set_invitation
-      @invitation = WorkshopInvitation.find_by(token: token)
+      @invitation = WorkshopInvitation.find_by!(token: token)
     end
   end
 end

app/controllers/contact_preferences_controller.rb

@@ -8,7 +8,7 @@ def show
   end
 
   def update
-    contact = Contact.find_by(token: contact_preferences[:token])
+    contact = Contact.find_by!(token: contact_preferences[:token])
     contact.update(mailing_list_consent: mailing_list_consent)
     audit_contact_subscription(contact)
 

app/controllers/events_controller.rb

@@ -68,7 +68,7 @@ def find_invitation_and_redirect_to_event(role)
   end
 
   def set_event
-    @event = Event.find_by(slug: params[:event_id])
+    @event = Event.find_by!(slug: params[:event_id])
   end
 
   def fetch_upcoming_events

app/controllers/feedback_controller.rb

@@ -19,7 +19,7 @@ def submit
 
       redirect_to root_path
     else
-      feedback_request = FeedbackRequest.find_by(token: params[:id], submited: false)
+      feedback_request = FeedbackRequest.find_by!(token: params[:id], submited: false)
       set_coaches(feedback_request.workshop)
 
       @workshop = feedback_request.workshop

app/controllers/invitations_controller.rb

@@ -77,7 +77,7 @@ def rsvp_meeting
   end
 
   def cancel_meeting
-    @invitation = MeetingInvitation.find_by(token: params[:token])
+    @invitation = MeetingInvitation.find_by!(token: params[:token])
 
     @invitation.update_attribute(:attending, false)