Added valid until text to invite email (#2599)

app/controllers/admins_controller.rb

@@ -145,7 +145,7 @@ class AdminsController < ApplicationController
     emails.each do |email|
       invitation = create_or_update_invite(email)
 
-      send_invitation_email(current_user.name, email, invitation.invite_token)
+      send_invitation_email(current_user.name, email, invitation)
     end
 
     redirect_back fallback_location: admins_path

app/controllers/concerns/emailer.rb

@@ -70,11 +70,11 @@ module Emailer
   end
 
   # Sends inivitation to join
-  def send_invitation_email(name, email, token)
+  def send_invitation_email(name, email, invite)
     begin
       return unless Rails.configuration.enable_email_verification
 
-      UserMailer.invite_email(name, email, invitation_link(token), @settings).deliver_now
+      UserMailer.invite_email(name, email, invite.updated_at, invitation_link(invite.invite_token), @settings).deliver_now
     rescue => e
       logger.error "Support: Error in email delivery: #{e}"
       flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))

app/controllers/sessions_controller.rb

@@ -88,7 +88,10 @@ class SessionsController < ApplicationController
       # Check that the user is a Greenlight account
       return redirect_to(root_path, alert: I18n.t("invalid_login_method")) unless user.greenlight_account?
       # Check that the user has verified their account
-      return redirect_to(account_activation_path(digest: user.activation_digest)) unless user.activated?
+      unless user.activated?
+        user.create_activation_token
+        return redirect_to(account_activation_path(digest: user.activation_digest))
+      end
     end
 
     login(user)