Remove hardcoded admin functionality

Author: steve-sullivan

app/controllers/proxy_borrower_admin_controller.rb

@@ -109,7 +109,7 @@ def init_form!; end
 
   # You shall not pass....unless you're an admin
   def require_admin!
-    @user_is_admin = current_user.any_role?(Role.proxyborrow_admin)
+    @user_is_admin = current_user.any_role?(Role.proxyborrow_admin, :framework_admin)
     redirect_to proxy_borrower_forms_path unless @user_is_admin
   end
 

app/controllers/proxy_borrower_forms_controller.rb

@@ -9,7 +9,7 @@ def index
     # I think I want to get the users role now... if they're in the DB
     # then I'll want to pass that info so they have the
     # admin link...otherwise, NO admin link!
-    @user_is_admin = current_user.any_role?(Role.proxyborrow_admin)
+    @user_is_admin = current_user.any_role?(Role.proxyborrow_admin, :framework_admin)
   end
 
   def dsp_form

app/controllers/reference_card_forms_controller.rb

@@ -85,7 +85,7 @@ def validate_recaptcha!
 
   def require_admin!
     authenticate!
-    @user_is_admin = current_user.role?(Role.stackpass_admin)
+    @user_is_admin = current_user.any_role?(Role.stackpass_admin, :framework_admin)
     raise Error::ForbiddenError unless @user_is_admin
   end
 end

app/controllers/stack_pass_admin_controller.rb

@@ -51,7 +51,7 @@ def init_form!; end
 
   # You shall not pass....unless you're an admin
   def require_admin!
-    @user_is_admin = current_user.any_role?(Role.stackpass_admin)
+    @user_is_admin = current_user.any_role?(Role.stackpass_admin, :framework_admin)
     redirect_to stack_pass_forms_path unless @user_is_admin
   end
 

app/controllers/stack_pass_forms_controller.rb

@@ -86,6 +86,6 @@ def validate_recaptcha!
   end
 
   def require_admin!
-    @user_is_admin = authenticate_with_role!(Role.stackpass_admin)
+    @user_is_admin = authenticate_with_role!(Role.stackpass_admin, :framework_admin)
   end
 end

app/controllers/stack_requests_controller.rb

@@ -8,7 +8,7 @@ class StackRequestsController < ApplicationController
   def forbidden; end
 
   def index
-    @user_is_admin = current_user.role?(Role.stackpass_admin)
+    @user_is_admin = current_user.any_role?(Role.stackpass_admin, :framework_admin)
   end
 
 end

app/helpers/field_builder.rb

@@ -1,6 +1,5 @@
 require 'action_view/helpers/tag_helper'
 
-# rubocop:disable Rails/HelperInstanceVariable
 class FieldBuilder
   attr_reader :tag_helper
   attr_reader :builder
@@ -109,4 +108,3 @@ def error_feedback_tag
     content_tag(:div, first_error, class: 'invalid-feedback')
   end
 end
-# rubocop:enable Rails/HelperInstanceVariable

app/models/framework_users.rb

@@ -21,18 +21,4 @@ class FrameworkUsers < ActiveRecord::Base
   validates :role,
             presence: true
 
-  class << self
-    # Hardcoded admins - so if for some reason all of the
-    # admins in the DB are deleted, we still have a way of
-    # getting in and managing things!
-    HARDCODED_ADMIN_UIDS = [
-      '7165',    # Lisa Weber
-      '1707532'  # Steve Sullivan
-    ].freeze
-
-    def hardcoded_admin?(uid)
-      HARDCODED_ADMIN_UIDS.include?(uid.to_s)
-    end
-  end
-
 end

app/models/user.rb

@@ -72,19 +72,8 @@ def primary_patron_record
     @primary_patron_record ||= find_primary_record
   end
 
-  # TODO: Unify this, faculty/staff checks, framework/alma admin checks
-  #       (and improve the design)
   def role?(role)
-    role_value =
-      if role.respond_to?(:role)
-        role.role
-      elsif role.respond_to?(:name)
-        role.name
-      else
-        role
-      end
-
-    role_name = role_value.to_sym
+    role_name = role_name_for(role)
 
     case role_name
     when :framework_admin
@@ -93,9 +82,6 @@ def role?(role)
       return true if alma_admin?
     end
 
-    # TODO: Remove this hackery!!!
-    return true if FrameworkUsers.hardcoded_admin?(uid)
-
     user = FrameworkUsers.find_by(lcasid: uid)
     return false unless user
 
@@ -124,4 +110,17 @@ def uid_patron_record
   def find_primary_record
     uid_patron_record
   end
+
+  def role_name_for(role)
+    role_value =
+      if role.respond_to?(:role)
+        role.role
+      elsif role.respond_to?(:name)
+        role.name
+      else
+        role
+      end
+
+    role_value.to_sym
+  end
 end

spec/calnet_helper.rb

@@ -2,8 +2,8 @@
 require 'alma_helper'
 
 module CalnetHelper
-  # Lisa Weber's UID, hard-coded in FrameworkUsers
-  STACK_REQUEST_ADMIN_UID = '7165'.freeze
+  # UID used for test authentication
+  TEST_UID = '7165'.freeze
 
   # Mocks a calnet login as the specified patron, and stubs the corresponding
   # Millennium patron dump file. Suitable for calling from a before() block.
@@ -31,7 +31,7 @@ def with_patron_login(patron_id)
     user = login_as_patron(patron_id)
     yield user
   rescue StandardError => e
-    puts "#{e}\n\t#{e.backtrace.join("\n\t")}" # rubocop:disable Rails/Output
+    puts "#{e}\n\t#{e.backtrace.join("\n\t")}"
     raise
   ensure
     logout!