[TBT-453] Fix confirmation email expiry format (#352)

* TBT-453 Show remaining time in hours instead Date Time in UTC

* TBT-453 Fix Time usage syntax

* TBT-453 Fix Time usage syntax

* TBT-453 Test 1st solution

* TBT-453 Test 1st solution

* TBT-453 Apply 2nd solution

* TBT-453 Modify spec

* TBT-453 Modify spec

* TBT-453 Modify spec

* TBT-453 Removed unused import

---------

Co-authored-by: tonoyansergey-devt <ssergey.tonoyan@devtactics.net>

Author: tonoyansergey-devt

lib/travis/addons/user_confirmation/mailer/user_confirmation_mailer.rb

@@ -23,7 +23,11 @@ def account_activated(*params)
           def confirm_account(*params)
             receivers = params[0]
             options = params[1]
-            @owner, @confirmation_url, @token_valid_to = options.values_at(:owner, :confirmation_url, :token_valid_to)
+            @owner, @confirmation_url = options.values_at(:owner, :confirmation_url)
+
+            minutes_valid_for = ENV['CONFIRMATION_TOKEN_VALID_FOR'].to_i
+            minutes_valid_for = 0 if minutes_valid_for.negative?
+            @token_valid_to = minutes_valid_for == 1 ? '1 minute' : "#{minutes_valid_for} minutes"
             subject = 'Travis CI: Confirm your account.'
             mail(from: from, to: to(receivers), subject: subject,
                  template_path: 'user_confirmation_mailer')

lib/travis/addons/user_confirmation/mailer/views/user_confirmation_mailer/confirm_account.html.erb

@@ -6,6 +6,6 @@
     </p>
     <p><a id="account-activated-button" href="<%=@confirmation_url%>" target="_blank">Confirm your account</a></p>
     <br/>
-    <p>Note: you must confirm your account in order to run builds on Travis CI. The confirmation link will expire after <br><%= @token_valid_to %></p>
+    <p>Note: you must confirm your account in order to run builds on Travis CI. The confirmation link will expire after <%= @token_valid_to %></p>
   </td>
 </tr>

spec/addons/user_confirmation/mailer/user_confirmation_mailer_spec.rb

@@ -19,15 +19,15 @@
   end
 
   describe '#confirm_account' do
+    before { ENV['CONFIRMATION_TOKEN_VALID_FOR'] = '60' }
     let(:params) do
       {
         owner: { name: 'My Name' },
         confirmation_url: 'https://confirm.me.plx',
-        token_valid_to: '2021-02-08 14:14:14'
+        token_valid_to: (Time.now.utc + 60 * 60).strftime('%Y-%m-%d %H:%M:%S')
       }
     end
     subject(:mail) { described_class.confirm_account(recipients, **params) }
-
     it 'contains the right data' do
       expect(mail.to(recipients)).to eq(recipients)
       expect(mail.from).to eq(['no-reply@travis-ci.com'])
@@ -37,7 +37,7 @@
       expect(mail.body)
         .to match('<p><a id="account-activated-button" href="https://confirm.me.plx" target="_blank">Confirm your account</a></p>')
       expect(mail.body)
-        .to match('<p>Note: you must confirm your account in order to run builds on Travis CI. The confirmation link will expire after <br>2021-02-08 14:14:14</p>')
+        .to match('<p>Note: you must confirm your account in order to run builds on Travis CI. The confirmation link will expire after 60 minutes</p>')
     end
   end
 end