Elements of AI email confirmation redirect

Author: nygrenh

app/controllers/users_controller.rb

@@ -80,8 +80,10 @@ def update
 
   def confirm_email
     token = VerificationToken.email.find_by!(user_id: params[:user_id], token: params[:id])
+    redirect_path = root_url
+    redirect_path = 'https://course.elementsofai.com' if params[:origin] == 'elements_of_ai'
     User.find(params[:user_id]).update!(email_verified: true)
-    redirect_to root_url, notice: 'Your email address has been verified!'
+    redirect_to redirect_path, notice: 'Your email address has been verified!'
   end
 
   def send_verification_email

app/mailers/user_mailer.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 class UserMailer < ActionMailer::Base
   def email_confirmation(user, origin = nil)
     @origin = origin
@@ -6,6 +8,10 @@ def email_confirmation(user, origin = nil)
     @url = base_url + confirm_email_path(@user.id, token.token)
     subject = "Confirm your mooc.fi account email address"
     subject = "#{origin}: #{subject}" if origin
+    if origin
+      origin_name = origin.downcase.tr(' ', '_').gsub(/[\.\/]/, '')
+      @url = @url + "?origin=#{CGI.escape(origin_name)}"
+    end
     mail(from: SiteSetting.value('emails')['from'], to: user.email, subject: subject)
   end