GRN2-180: First stages of refactoring code for v2.4 (#748)

* Email rescues and authenticator concern

* Application controller and helper clean up

* Moved controller code out of helpers

* More helper and email clean up

* Cleaned up remaining helpers and create omniauth_options

* Controller code clean up

* restructured views structure

* Restructured role code

* Restructured profile and code clean up

* Master merge

* Added bbb server concern to deal with bbb calls

* Bug fixes and changes after changes

* rspec

* More rubocop fixes

app/mailers/user_mailer.rb

@@ -18,74 +18,83 @@
 
 class UserMailer < ApplicationMailer
   include ApplicationHelper
+  include ThemingHelper
 
   default from: Rails.configuration.smtp_sender
 
-  def verify_email(user, url, image, color)
+  def verify_email(user, url, settings)
+    @settings = settings
     @user = user
     @url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
     mail(to: @user.email, subject: t('landing.welcome'))
   end
 
-  def password_reset(user, url, image, color)
+  def password_reset(user, url, settings)
+    @settings = settings
     @user = user
     @url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
     mail to: user.email, subject: t('reset_password.subtitle')
   end
 
-  def user_promoted(user, role, url, image, color)
+  def user_promoted(user, role, url, settings)
+    @settings = settings
     @url = url
     @admin_url = url + "admins"
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
     @role = translated_role_name(role)
     mail to: user.email, subject: t('mailer.user.promoted.subtitle', role: translated_role_name(role))
   end
 
-  def user_demoted(user, role, url, image, color)
+  def user_demoted(user, role, url, settings)
+    @settings = settings
     @url = url
     @root_url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
     @role = translated_role_name(role)
     mail to: user.email, subject: t('mailer.user.demoted.subtitle', role: translated_role_name(role))
   end
 
-  def invite_email(name, email, url, image, color)
+  def invite_email(name, email, url, settings)
+    @settings = settings
     @name = name
     @email = email
     @url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
     mail to: email, subject: t('mailer.user.invite.subject')
   end
 
-  def approve_user(user, url, image, color)
+  def approve_user(user, url, settings)
+    @settings = settings
     @user = user
     @url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
     mail to: user.email, subject: t('mailer.user.approve.subject')
   end
 
-  def approval_user_signup(user, url, image, color, admin_emails)
+  def approval_user_signup(user, url, admin_emails, settings)
+    @settings = settings
     @user = user
     @url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
 
     mail to: admin_emails, subject: t('mailer.user.approve.signup.subject')
   end
 
-  def invite_user_signup(user, url, image, color, admin_emails)
+  def invite_user_signup(user, url, admin_emails, settings)
+    @settings = settings
     @user = user
     @url = url
-    @image = image
-    @color = color
+    @image = logo_image
+    @color = user_color
 
     mail to: admin_emails, subject: t('mailer.user.invite.signup.subject')
   end