Merge pull request #2931 from bgeuken/auth_method

[api] Remove unused @auth_method accessor from application controller

src/api/app/controllers/application_controller.rb

@@ -34,7 +34,6 @@ class ApplicationController < ActionController::Base
            :extract_user_public,
            :require_login,
            :require_admin,
-           :auth_method,
            to: :authenticator
 
   def authenticator

src/api/app/controllers/person_controller.rb

@@ -160,7 +160,7 @@ def internal_register
     note = xml.elements["/unregisteredperson/note"].text if xml.elements["/unregisteredperson/note"]
     status = xml.elements["/unregisteredperson/state"].text if xml.elements["/unregisteredperson/status"]
 
-    if auth_method == :proxy
+    if authenticator.proxy_mode?
       if request.env['HTTP_X_USERNAME'].blank?
         raise ErrRegisterSave.new "Missing iChain header"
       end

src/api/lib/authenticator.rb

@@ -23,7 +23,7 @@ class AdminUserRequiredError < APIException
     setup('put_request_no_permission', 403)
   end
 
-  attr_reader :request, :session, :auth_method, :user_permissions, :http_user
+  attr_reader :request, :session, :user_permissions, :http_user
 
   def initialize(request, session)
     @request = request
@@ -32,13 +32,14 @@ def initialize(request, session)
     @user_permissions = nil
   end
 
+  def proxy_mode?
+    CONFIG['proxy_auth_mode'] == :on || CONFIG['ichain_mode'] == :on
+  end
+
   def extract_user
-    mode = CONFIG['proxy_auth_mode'] || CONFIG['ichain_mode'] || :basic
-    if mode == :on
+    if proxy_mode?
       extract_proxy_user
     else
-      @auth_method = :basic
-
       extract_basic_auth_user
 
       @http_user = User.find_with_credentials @login, @passwd if @login
@@ -80,7 +81,6 @@ def require_admin
   private
 
   def extract_proxy_user
-    @auth_method = :proxy
     proxy_user = request.env['HTTP_X_USERNAME']
     if proxy_user
       Rails.logger.info "iChain user extracted from header: #{proxy_user}"