feat(account invitation): some changes

app/controllers/accept_account_invitations_controller.rb

@@ -2,23 +2,20 @@
 
 class AcceptAccountInvitationsController < ApplicationController
   def show
-    return if user_signed_in? && the_invitation
+    return if user_signed_in?
 
-    session[:token] = ps[:token]
-    redirect_to new_user_session_url(email: the_invitation.email)
+    session[:after_sign_in_url] = request.fullpath
+    redirect_to new_user_session_url(email: AccountInvitation.find_by!(token: ps.fetch(:token)).email)
   end
 
   def update
     received_invitation.update!(accepted_at: Time.current)
+    redirect_to account_path(received_invitation.account_id)
   end
 
   private
 
   helper_method memoize def received_invitation
     AccountInvitation.unaccepted.for(current_user).find_by!(token: ps.fetch(:token))
   end
-
-  memoize def the_invitation
-    AccountInvitation.find_by!(token: ps.fetch(:token))
-  end
 end

app/controllers/users/sessions_controller.rb

@@ -10,11 +10,11 @@ def new
       end
     end
 
-    protected
+    private
 
     def after_sign_in_path_for(_resource)
-      if (token = session.delete(:token)).present?
-        return accept_account_invitation_path(token: token)
+      if (after_sign_in_url = session.delete(:after_sign_in_url)).present?
+        return after_sign_in_url
       end
 
       super

spec/controllers/accept_account_invitations_spec.rb

@@ -46,6 +46,7 @@
       subject
       expect(AccountInvitation.find(account_invitation.id).accepted_at).not_to be_nil
     end
-    it { is_expected.to have_http_status(204) }
+    it { is_expected.to have_http_status(302) }
+    it { is_expected.to redirect_to(account_path(account_invitation.account_id)) }
   end
 end