diff --git a/app/controllers/invites_controller.rb b/app/controllers/invites_controller.rb index 9caa9a1beb2..b7cf7b33fe1 100644 --- a/app/controllers/invites_controller.rb +++ b/app/controllers/invites_controller.rb @@ -228,9 +228,7 @@ class InvitesController < ApplicationController end user = invite.redeem(**attrs) - rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved => e - return render json: failed_json.merge(errors: e.record&.errors&.to_hash, message: I18n.t('invite.error_message')), status: 412 - rescue Invite::UserExists => e + rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, Invite::UserExists => e return render json: failed_json.merge(message: e.message), status: 412 end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index b17c72222b6..5d94936bd84 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -239,7 +239,6 @@ en:
Otherwise please Reset Password.
not_found_template_link: |The invitation to %{site_name} can no longer be redeemed. Please ask the person who invited you to send you a new invitation.
- error_message: "There was an error accepting invite. Please contact the site's administrator." user_exists: "There's no need to invite %{email}, they already have an account!" invalid_email: "%{email} isn't a valid email address." confirm_email: "You’re almost done! We sent an activation mail to your email address. Please follow the instructions in the mail to activate your account.
If it doesn’t arrive, check your spam folder.
" diff --git a/spec/requests/invites_controller_spec.rb b/spec/requests/invites_controller_spec.rb index f2001d53097..66840107057 100644 --- a/spec/requests/invites_controller_spec.rb +++ b/spec/requests/invites_controller_spec.rb @@ -443,7 +443,6 @@ describe InvitesController do it 'does not log in the user if there are validation errors' do put "/invites/show/#{invite.invite_key}.json", params: { password: 'password' } expect(response.status).to eq(412) - expect(response.parsed_body['errors']['password']).to be_present end it 'fails when local login is disabled and no external auth is configured' do