Reduce number of roles queries for the admin controller (#631)

app/controllers/admins_controller.rb

@@ -162,7 +162,7 @@ class AdminsController < ApplicationController
   private
 
   def find_user
-    @user = User.find_by!(uid: params[:user_uid])
+    @user = User.where(uid: params[:user_uid]).includes(:roles).first
   end
 
   def find_setting
@@ -176,10 +176,10 @@ class AdminsController < ApplicationController
 
   # Gets the list of users based on your configuration
   def user_list
-    initial_list = if current_user.has_role? :super_admin
+    initial_list = if current_user.has_cached_role? :super_admin
-      User.where.not(id: current_user.id)
+      User.where.not(id: current_user.id).includes(:roles)
     else
-      User.without_role(:super_admin).where.not(id: current_user.id)
+      User.without_role(:super_admin).where.not(id: current_user.id).includes(:roles)
     end
 
     list = @role.present? ? initial_list.with_role(@role.to_sym) : initial_list

app/controllers/application_controller.rb

@@ -116,7 +116,7 @@ class ApplicationController < ActionController::Base
 
   # Checks to make sure that the admin has changed his password from the default
   def check_admin_password
-    if current_user&.has_role?(:admin) && current_user&.greenlight_account? &&
+    if current_user&.has_cached_role?(:admin) && current_user&.greenlight_account? &&
        current_user&.authenticate(Rails.configuration.admin_password_default)
 
       flash.now[:alert] = I18n.t("default_admin",
@@ -156,10 +156,10 @@ class ApplicationController < ActionController::Base
 
   # Checks if the user is banned and logs him out if he is
   def check_user_role
-    if current_user&.has_role? :denied
+    if current_user&.has_cached_role? :denied
       session.delete(:user_id)
       redirect_to root_path, flash: { alert: I18n.t("registration.banned.fail") }
-    elsif current_user&.has_role? :pending
+    elsif current_user&.has_cached_role? :pending
       session.delete(:user_id)
       redirect_to root_path, flash: { alert: I18n.t("registration.approval.fail") }
     end

app/controllers/rooms_controller.rb

@@ -274,7 +274,7 @@ class RoomsController < ApplicationController
   end
 
   def verify_user_not_admin
-    redirect_to admins_path if current_user && current_user&.has_role?(:super_admin)
+    redirect_to admins_path if current_user && current_user&.has_cached_role?(:super_admin)
   end
 
   def auth_required
@@ -287,7 +287,7 @@ class RoomsController < ApplicationController
 
     # Does not apply to admin
     # 15+ option is used as unlimited
-    return false if current_user&.has_role?(:admin) || limit == 15
+    return false if current_user&.has_cached_role?(:admin) || limit == 15
 
     current_user.rooms.count >= limit
   end

app/controllers/users_controller.rb

@@ -185,7 +185,7 @@ class UsersController < ApplicationController
   private
 
   def find_user
-    @user = User.find_by!(uid: params[:user_uid])
+    @user = User.where(uid: params[:user_uid]).includes(:roles).first
   end
 
   def ensure_unauthenticated

app/helpers/application_helper.rb

@@ -106,7 +106,7 @@ module ApplicationHelper
   # Returns the page that the logo redirects to when clicked on
   def home_page
     return root_path unless current_user
-    return admins_path if current_user.has_role? :super_admin
+    return admins_path if current_user.has_cached_role? :super_admin
     current_user.main_room
   end
 end

app/helpers/rooms_helper.rb

@@ -37,7 +37,7 @@ module RoomsHelper
 
     # Does not apply to admin or users that aren't signed in
     # 15+ option is used as unlimited
-    return false if current_user&.has_role?(:admin) || limit == 15
+    return false if current_user&.has_cached_role?(:admin) || limit == 15
 
     current_user.rooms.length >= limit
   end
@@ -46,7 +46,7 @@ module RoomsHelper
     # Get how many rooms need to be deleted to reach allowed room number
     limit = Setting.find_or_create_by!(provider: user_settings_provider).get_value("Room Limit").to_i
 
-    return false if current_user&.has_role?(:admin) || limit == 15
+    return false if current_user&.has_cached_role?(:admin) || limit == 15
 
     @diff = current_user.rooms.count - limit
     @diff.positive? && current_user.rooms.pluck(:id).index(room.id) + 1 > limit

app/helpers/sessions_helper.rb

@@ -61,7 +61,7 @@ module SessionsHelper
 
   # Retrieves the current user.
   def current_user
-    @current_user ||= User.find_by(id: session[:user_id])
+    @current_user ||= User.where(id: session[:user_id]).includes(:roles).first
   end
 
   def generate_checksum(user_domain, redirect_url, secret)

app/helpers/theming_helper.rb

@@ -31,7 +31,7 @@ module ThemingHelper
 
   # Returns the user's provider in the settings context
   def user_settings_provider
-    if Rails.configuration.loadbalanced_configuration && current_user && !current_user&.has_role?(:super_admin)
+    if Rails.configuration.loadbalanced_configuration && current_user && !current_user&.has_cached_role?(:super_admin)
       current_user.provider
     elsif Rails.configuration.loadbalanced_configuration
       @user_domain

app/models/user.rb

@@ -214,13 +214,17 @@ class User < ApplicationRecord
 
   def admin_of?(user)
     if Rails.configuration.loadbalanced_configuration
-      if has_role? :super_admin
+      # Pulls in the user roles if they weren't request in the original request
+      # So the has_cached_role? doesn't always return false
+      user.roles
+      if has_cached_role? :super_admin
         id != user.id
       else
-        (has_role? :admin) && (id != user.id) && (provider == user.provider) && (!user.has_role? :super_admin)
+        (has_cached_role? :admin) && (id != user.id) && (provider == user.provider) &&
+          (!user.has_cached_role? :super_admin)
       end
     else
-      ((has_role? :admin) || (has_role? :super_admin)) && (id != user.id)
+      ((has_cached_role? :admin) || (has_cached_role? :super_admin)) && (id != user.id)
     end
   end
 

app/views/shared/_header.html.erb

@@ -23,7 +23,7 @@
       <div class="d-flex ml-auto">
         <% if current_user %>
 
-          <% if current_user.has_role? :super_admin %>
+          <% if current_user.has_cached_role? :super_admin %>
             <% admins_page = params[:controller] == "admins" && params[:action] == "index" ? "active" : "" %>
             <%= link_to admins_path, class: "px-3 mx-1 mt-1 header-nav #{admins_page}" do %>
               <i class="fas fa-home pr-1 "></i> <%= t("header.dropdown.home") %>
@@ -56,7 +56,7 @@
               <%= link_to edit_user_path(current_user), class: "dropdown-item"  do %>
                 <i class="dropdown-icon fas fa-id-card mr-3"></i><%= t("header.dropdown.settings") %>
               <% end %>
-              <% if current_user.has_role? :admin %>
+              <% if current_user.has_cached_role? :admin %>
                 <%= link_to admins_path, class: "dropdown-item" do %>
                   <i class="dropdown-icon fas fa-user-tie mr-3"></i><%= t("header.dropdown.account_settings") %>
                 <% end %>