Skip to content

Commit 7e15f32

Browse files
sarkensarken
authored
AO3-6666 Revert AO3-6609 invitation resending (otwcode#4689) (otwcode#4685) (otwcode#4648) (otwcode#4710)
* Revert "AO3-6609 Fix status check of old invites without sent_at (otwcode#4689)" This reverts commit 1f9e339. * Revert "AO3-6609 Visual fixes for invitation status (otwcode#4685)" This reverts commit 69f97e0. * Revert "AO3-6609 Allow users to resend invitations (otwcode#4648)" This reverts commit 6c30419.
1 parent 9ce7f82 commit 7e15f32

16 files changed

+43
-255
lines changed

‎app/controllers/invite_requests_controller.rb

+4-27
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,17 @@ def index
99
# GET /invite_requests/1
1010
def show
1111
@invite_request = InviteRequest.find_by(email: params[:email])
12-
13-
if @invite_request.present?
14-
@position_in_queue = @invite_request.position
15-
else
16-
@invitation = Invitation.unredeemed.from_queue.find_by(invitee_email: params[:email])
12+
@position_in_queue = @invite_request.position if @invite_request.present?
13+
unless (request.xml_http_request?) || @invite_request
14+
flash[:error] = "You can search for the email address you signed up with below. If you can't find it, your invitation may have already been emailed to that address; please check your email spam folder as your spam filters may have placed it there."
15+
redirect_to status_invite_requests_path and return
1716
end
18-
1917
respond_to do |format|
2018
format.html
2119
format.js
2220
end
2321
end
2422

25-
def resend
26-
@invitation = Invitation.unredeemed.from_queue.find_by(invitee_email: params[:email])
27-
28-
if @invitation.nil?
29-
flash[:error] = t("invite_requests.resend.not_found")
30-
elsif !@invitation.can_resend?
31-
flash[:error] = t("invite_requests.resend.not_yet",
32-
count: ArchiveConfig.HOURS_BEFORE_RESEND_INVITATION)
33-
else
34-
@invitation.send_and_set_date(resend: true)
35-
36-
if @invitation.errors.any?
37-
flash[:error] = @invitation.errors.full_messages.first
38-
else
39-
flash[:notice] = t("invite_requests.resend.success", email: @invitation.invitee_email)
40-
end
41-
end
42-
43-
redirect_to status_invite_requests_path
44-
end
45-
4623
# POST /invite_requests
4724
def create
4825
unless AdminSetting.current.invite_from_queue_enabled?

‎app/models/invitation.rb

+21-33
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ def recipient_is_not_registered
1919
scope :unsent, -> { where(invitee_email: nil, redeemed_at: nil) }
2020
scope :unredeemed, -> { where('invitee_email IS NOT NULL and redeemed_at IS NULL') }
2121
scope :redeemed, -> { where('redeemed_at IS NOT NULL') }
22-
scope :from_queue, -> { where(external_author: nil).where(creator_type: [nil, "Admin"]) }
2322

2423
before_validation :generate_token, on: :create
25-
after_save :send_and_set_date, if: :saved_change_to_invitee_email?
24+
after_save :send_and_set_date
2625
after_save :adjust_user_invite_status
2726

2827
#Create a certain number of invitations for all valid users
@@ -55,41 +54,30 @@ def mark_as_redeemed(user=nil)
5554
save
5655
end
5756

58-
def send_and_set_date(resend: false)
59-
return if invitee_email.blank?
60-
61-
if self.external_author
62-
archivist = self.external_author.external_creatorships.collect(&:archivist).collect(&:login).uniq.join(", ")
63-
# send invite synchronously for now -- this should now work delayed but just to be safe
64-
UserMailer.invitation_to_claim(self.id, archivist).deliver_now
65-
else
66-
# send invitations actively sent by a user synchronously to avoid delays
67-
UserMailer.invitation(self.id).deliver_now
68-
end
69-
70-
# Skip callbacks within after_save by using update_column to avoid a callback loop
71-
if resend
72-
attrs = { resent_at: Time.current }
73-
# This applies to old invites when AO3-6094 wasn't fixed.
74-
attrs[:sent_at] = self.created_at if self.sent_at.nil?
75-
self.update_columns(attrs)
76-
else
77-
self.update_column(:sent_at, Time.current)
78-
end
79-
rescue StandardError => e
80-
errors.add(:base, :notification_could_not_be_sent, error: e.message)
81-
end
57+
private
8258

83-
def can_resend?
84-
# created_at fallback is a vestige of the already fixed AO3-6094.
85-
checked_date = self.resent_at || self.sent_at || self.created_at
86-
checked_date < ArchiveConfig.HOURS_BEFORE_RESEND_INVITATION.hours.ago
59+
def generate_token
60+
self.token = Digest::SHA1.hexdigest([Time.now, rand].join)
8761
end
8862

89-
private
63+
def send_and_set_date
64+
if self.saved_change_to_invitee_email? && !self.invitee_email.blank?
65+
begin
66+
if self.external_author
67+
archivist = self.external_author.external_creatorships.collect(&:archivist).collect(&:login).uniq.join(", ")
68+
# send invite synchronously for now -- this should now work delayed but just to be safe
69+
UserMailer.invitation_to_claim(self.id, archivist).deliver_now
70+
else
71+
# send invitations actively sent by a user synchronously to avoid delays
72+
UserMailer.invitation(self.id).deliver_now
73+
end
9074

91-
def generate_token
92-
self.token = Digest::SHA1.hexdigest([Time.current, rand].join)
75+
# Skip callbacks within after_save by using update_column to avoid a callback loop
76+
self.update_column(:sent_at, Time.now)
77+
rescue Exception => exception
78+
errors.add(:base, "Notification email could not be sent: #{exception.message}")
79+
end
80+
end
9381
end
9482

9583
#Update the user's out_of_invites status

‎app/views/invitations/_invitation.html.erb

-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424
<dd><%= invitation.created_at %></dd>
2525
<dt>Sent at</dt>
2626
<dd><%= invitation.sent_at %></dd>
27-
<dt>Last resent at</dt>
28-
<dd><%= invitation.resent_at %></dd>
2927
<dt>Redeemed at</dt>
3028
<dd><%= invitation.redeemed_at %></dd>
3129
</dl>

‎app/views/invite_requests/_invitation.html.erb

-28
This file was deleted.

‎app/views/invite_requests/_no_invitation.html.erb

-3
This file was deleted.

‎app/views/invite_requests/show.html.erb

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
<% if @invite_request %>
2-
<%= render "invite_request", invite_request: @invite_request %>
3-
<% elsif @invitation %>
4-
<%= render "invitation", invitation: @invitation %>
5-
<% else %>
6-
<%= render "no_invitation" %>
7-
<% end %>
1+
<%= render "invite_request", invite_request: @invite_request %>
82

93
<p>
10-
<%= t(".instructions_html", status_link: link_to("Invitation Request Status page", status_invite_requests_path)) %>
4+
<%= ts("To check on the status of your invitation, go to the %{status_page} and enter your email in the space provided!", status_page: link_to("Invitation Request Status page", status_invite_requests_path)).html_safe %>
115
</p>

‎app/views/invite_requests/show.js.erb

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,5 @@
11
<% if @invite_request %>
22
$j("#invite-status").html("<%= escape_javascript(render "invite_requests/invite_request", invite_request: @invite_request) %>");
3-
<% elsif @invitation %>
4-
$j("#invite-status").html("<%= escape_javascript(render "invitation", invitation: @invitation) %>");
5-
6-
<%# Correct heading size for JavaScript display %>
7-
$j(document).ready(function(){
8-
$j('#invite-heading').replaceWith(function () {
9-
return '<h3 class="heading">' + $j(this).html() + "</h3>";
10-
});
11-
})
123
<% else %>
13-
$j("#invite-status").html("<%= escape_javascript(render "no_invitation") %>");
4+
$j("#invite-status").html("<p>Sorry, we can't find the email address you entered. If you had used it to join our invitation queue, it's possible that your invitation may have already been emailed to you; please check your spam folder, as your spam filters may have placed it there.</p>");
145
<% end %>

‎config/config.yml

-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ DELIMITER_FOR_OUTPUT: ', '
7878
INVITE_FROM_QUEUE_ENABLED: true
7979
INVITE_FROM_QUEUE_NUMBER: 10
8080
INVITE_FROM_QUEUE_FREQUENCY: 7
81-
82-
HOURS_BEFORE_RESEND_INVITATION: 24
8381
# this is whether or not people without invitations can create accounts
8482
ACCOUNT_CREATION_ENABLED: false
8583
DAYS_TO_PURGE_UNACTIVATED: 7

‎config/locales/controllers/en.yml

-5
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@ en:
6161
error: Sorry, that comment could not be unhidden.
6262
permission_denied: Sorry, you don't have permission to unhide that comment.
6363
success: Comment successfully unhidden!
64-
invite_requests:
65-
resend:
66-
not_found: Could not find an invitation associated with that email.
67-
not_yet: You cannot resend an invitation that was sent in the last %{count} hours.
68-
success: Invitation resent to %{email}.
6964
kudos:
7065
create:
7166
success: Thank you for leaving kudos!

‎config/locales/models/en.yml

-5
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,6 @@ en:
115115
attributes:
116116
user_defined_tags_count:
117117
at_most: must not add up to more than %{count}. You have entered %{value} of these tags, so you must remove %{diff} of them.
118-
invitation:
119-
attributes:
120-
base:
121-
format: "%{message}"
122-
notification_could_not_be_sent: 'Notification email could not be sent: %{error}'
123118
kudo:
124119
attributes:
125120
commentable:

‎config/locales/views/en.yml

-21
Original file line numberDiff line numberDiff line change
@@ -516,31 +516,10 @@ en:
516516
invitation:
517517
email_address_label: Enter an email address
518518
invite_requests:
519-
invitation:
520-
after_cooldown_period:
521-
not_resent:
522-
one: Because your invitation was sent more than an hour ago, you can have your invitation resent.
523-
other: Because your invitation was sent more than %{count} hours ago, you can have your invitation resent.
524-
resent_html:
525-
one: Because your invitation was resent more than an hour ago, you can have your invitation resent again, or you may want to %{contact_support_link}.
526-
other: Because your invitation was resent more than %{count} hours ago, you can have your invitation resent again, or you may want to %{contact_support_link}.
527-
before_cooldown_period:
528-
one: If it has been more than an hour since you should have received your invitation, but you have not received it after checking your spam folder, you can visit this page to resend the invitation.
529-
other: If it has been more than %{count} hours since you should have received your invitation, but you have not received it after checking your spam folder, you can visit this page to resend the invitation.
530-
contact_support: contact Support
531-
info:
532-
not_resent: Your invitation was emailed to this address on %{sent_at}. If you can't find it, please check your email spam folder as your spam filters may have placed it there.
533-
resent: Your invitation was emailed to this address on %{sent_at} and resent on %{resent_at}. If you can't find it, please check your email spam folder as your spam filters may have placed it there.
534-
resend_button: Resend Invitation
535-
title: Invitation Status for %{email}
536519
invite_request:
537520
date: 'At our current rate, you should receive an invitation on or around: %{date}.'
538521
position_html: You are currently number %{position} on our waiting list!
539522
title: Invitation Status for %{email}
540-
no_invitation:
541-
email_not_found: Sorry, we can't find the email address you entered.
542-
show:
543-
instructions_html: To check on the status of your invitation, go to the %{status_link} and enter your email in the space provided.
544523
kudos:
545524
guest_header:
546525
one: "%{count} guest has also left kudos"

‎config/routes.rb

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
collection do
8282
get :manage
8383
get :status
84-
post :resend
8584
end
8685
end
8786

‎db/migrate/20231027172035_add_resent_at_to_invitations.rb

-7
This file was deleted.

‎features/other_a/invite_queue.feature

+2-28
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Feature: Invite queue management
5757
# check your place in the queue - invalid address
5858
When I check how long "[email protected]" will have to wait in the invite request queue
5959
Then I should see "Invitation Request Status"
60-
And I should see "Sorry, we can't find the email address you entered."
60+
And I should see "If you can't find it, your invitation may have already been emailed to that address; please check your email spam folder as your spam filters may have placed it there."
6161
And I should not see "You are currently number"
6262

6363
# check your place in the queue - correct address
@@ -98,7 +98,7 @@ Feature: Invite queue management
9898
Then 1 email should be delivered to test@archiveofourown.org
9999
When I check how long "[email protected]" will have to wait in the invite request queue
100100
Then I should see "Invitation Request Status"
101-
And I should see "If you can't find it, please check your email spam folder as your spam filters may have placed it there."
101+
And I should see "If you can't find it, your invitation may have already been emailed to that address;"
102102

103103
# invite can be used
104104
When I am logged in as an admin
@@ -155,29 +155,3 @@ Feature: Invite queue management
155155
And I fill in "invite_request_email" with "[email protected]"
156156
And I press "Add me to the list"
157157
Then I should see "Email is already being used by an account holder."
158-
159-
Scenario: Users can resend their invitation after enough time has passed
160-
Given account creation is enabled
161-
And the invitation queue is enabled
162-
And account creation requires an invitation
163-
And the invite_from_queue_at is yesterday
164-
And an invitation request for "[email protected]"
165-
When the scheduled check_invite_queue job is run
166-
Then 1 email should be delivered to invitee@example.org
167-
168-
When I check how long "[email protected]" will have to wait in the invite request queue
169-
Then I should see "Invitation Request Status"
170-
And I should see "If you can't find it, please check your email spam folder as your spam filters may have placed it there."
171-
And I should not see "Because your invitation was sent more than 24 hours ago, you can have your invitation resent."
172-
And I should not see a "Resend Invitation" button
173-
174-
When all emails have been delivered
175-
And it is currently 25 hours from now
176-
And I check how long "[email protected]" will have to wait in the invite request queue
177-
Then I should see "Invitation Request Status"
178-
And I should see "If you can't find it, please check your email spam folder as your spam filters may have placed it there."
179-
And I should see "Because your invitation was sent more than 24 hours ago, you can have your invitation resent."
180-
And I should see a "Resend Invitation" button
181-
182-
When I press "Resend Invitation"
183-
Then 1 email should be delivered to invitee@example.org

‎spec/controllers/invite_requests_controller_spec.rb

+13-38
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,21 @@
1717

1818
describe "GET #show" do
1919
context "when given invalid emails" do
20-
it "renders" do
21-
get :show, params: { email: "[email protected]" }
22-
expect(response).to render_template("show")
20+
it "redirects to index with error" do
21+
message = "You can search for the email address you signed up with below. If you can't find it, your invitation may have already been emailed to that address; please check your email spam folder as your spam filters may have placed it there."
22+
get :show, params: { id: 0 }
23+
it_redirects_to_with_error(status_invite_requests_path, message)
24+
expect(assigns(:invite_request)).to be_nil
25+
get :show, params: { id: 0, email: "[email protected]" }
26+
it_redirects_to_with_error(status_invite_requests_path, message)
2327
expect(assigns(:invite_request)).to be_nil
2428
end
2529

2630
it "renders for an ajax call" do
27-
get :show, params: { email: "[email protected]" }, xhr: true
31+
get :show, params: { id: 0 }, xhr: true
32+
expect(response).to render_template("show")
33+
expect(assigns(:invite_request)).to be_nil
34+
get :show, params: { id: 0, email: "[email protected]" }, xhr: true
2835
expect(response).to render_template("show")
2936
expect(assigns(:invite_request)).to be_nil
3037
end
@@ -34,51 +41,19 @@
3441
let(:invite_request) { create(:invite_request) }
3542

3643
it "renders" do
37-
get :show, params: { email: invite_request.email }
44+
get :show, params: { id: 0, email: invite_request.email }
3845
expect(response).to render_template("show")
3946
expect(assigns(:invite_request)).to eq(invite_request)
4047
end
4148

4249
it "renders for an ajax call" do
43-
get :show, params: { email: invite_request.email }, xhr: true
50+
get :show, params: { id: 0, email: invite_request.email }, xhr: true
4451
expect(response).to render_template("show")
4552
expect(assigns(:invite_request)).to eq(invite_request)
4653
end
4754
end
4855
end
4956

50-
describe "POST #resend" do
51-
context "when the email doesn't match any invitations" do
52-
it "redirects with an error" do
53-
post :resend, params: { email: "[email protected]" }
54-
it_redirects_to_with_error(status_invite_requests_path,
55-
"Could not find an invitation associated with that email.")
56-
end
57-
end
58-
59-
context "when the invitation is too recent" do
60-
let(:invitation) { create(:invitation) }
61-
62-
it "redirects with an error" do
63-
post :resend, params: { email: invitation.invitee_email }
64-
it_redirects_to_with_error(status_invite_requests_path,
65-
"You cannot resend an invitation that was sent in the last 24 hours.")
66-
end
67-
end
68-
69-
context "when the email and time are valid" do
70-
let!(:invitation) { create(:invitation) }
71-
72-
it "redirects with a success message" do
73-
travel_to((1 + ArchiveConfig.HOURS_BEFORE_RESEND_INVITATION).hours.from_now)
74-
post :resend, params: { email: invitation.invitee_email }
75-
76-
it_redirects_to_with_notice(status_invite_requests_path,
77-
"Invitation resent to #{invitation.invitee_email}.")
78-
end
79-
end
80-
end
81-
8257
describe "POST #create" do
8358
it "redirects to index with error given invalid emails" do
8459
post :create, params: { invite_request: { email: "wat" } }

0 commit comments

Comments
 (0)