fixed lint issues

Author: LeslieJAnderson

app-rails/app/controllers/users/passwords_controller.rb

@@ -3,6 +3,18 @@
 class Users::PasswordsController < ApplicationController
   skip_after_action :verify_authorized
 
+  def auth_service
+    self.class.auth_service || AuthService.new
+  end
+
+  def self.auth_service
+    @auth_service
+  end
+
+  def self.auth_service=(service)
+    @auth_service = service
+  end
+
   def forgot
     @form = Users::ForgotPasswordForm.new
   end

app-rails/app/controllers/users/registrations_controller.rb

@@ -4,6 +4,18 @@ class Users::RegistrationsController < ApplicationController
   layout "users"
   skip_after_action :verify_authorized
 
+  def auth_service
+    self.class.auth_service || AuthService.new
+  end
+
+  def self.auth_service
+    @auth_service
+  end
+
+  def self.auth_service=(service)
+    @auth_service = service
+  end
+
   def new
     @form = Users::RegistrationForm.new()
     render :new

app-rails/app/controllers/users/sessions_controller.rb

@@ -4,6 +4,18 @@ class Users::SessionsController < Devise::SessionsController
   layout "users"
   skip_after_action :verify_authorized
 
+  def auth_service
+    self.class.auth_service || AuthService.new
+  end
+
+  def self.auth_service
+    @auth_service
+  end
+
+  def self.auth_service=(service)
+    @auth_service = service
+  end
+
   def new
     @form = Users::NewSessionForm.new
   end

app-rails/spec/controllers/users/registrations_controller_spec.rb

@@ -57,7 +57,6 @@
 
       expect(response.status).to eq(422)
     end
-
   end
 
   describe "GET new_account_verification" do

app-rails/spec/controllers/users/sessions_controller_spec.rb

@@ -93,7 +93,6 @@
       expect(session[:challenge_email]).to eq("mfa@example.com")
       expect(response).to redirect_to(session_challenge_path)
     end
-
   end
 
   describe "GET challenge" do

app-rails/spec/requests/spam_traps_spec.rb

@@ -1,67 +1,73 @@
-RSpec.describe "Spam trap protection for public forms", type: :request do
-  before do
-    allow_any_instance_of(Users::PasswordsController).to receive(:auth_service).and_return(
-      AuthService.new(Auth::MockAdapter.new)
-    )
-  end
 
-  forms = [
-    {
-      name: "Password reset instructions",
-      path: "/users/forgot-password",
-      param_key: :users_forgot_password_form,
-      valid_params: {
-        email: "UsernameDoesntExistForSure@example.com"
-      }
-    },
-    {
-      name: "Password confirm reset",
-      path: "/users/reset-password",
-      param_key: :users_reset_password_form,
-      valid_params: {
-        email: "testIsANewUser@example.com",
-        code: "123456",
-        password: "aLongPassword123"
-      }
-    },
-    {
-      name: "Registration",
-      path: "/users/registrations",
-      param_key: :users_registration_form,
-      valid_params: {
-        email: "evenneweruser@example.com",
-        password: "aLongPassword123"
-      }
-    },
-    {
-      name: "Login",
-      path: "/users/sign_in",
-      param_key: :users_new_session_form,
-      valid_params: {
-        email: "test@example.com",
-        password: "password"
-      }
-    }
-  ]
 
-  forms.each do |form|
-    describe "#{form[:name]} form" do
-      let(:spam_params) do
-        {
-          form[:param_key] => form[:valid_params].merge(spam_trap: "I am a bot")
-        }
-      end
 
-      let(:valid_params) do
-        {
-          form[:param_key] => form[:valid_params]
+
+
+  RSpec.describe "Spam trap protection for public forms", type: :request do
+    before do
+      Users::PasswordsController.auth_service = AuthService.new(Auth::MockAdapter.new)
+      Users::RegistrationsController.auth_service = AuthService.new(Auth::MockAdapter.new)
+      Users::SessionsController.auth_service = AuthService.new(Auth::MockAdapter.new(uid_generator: -> { "mock-uid" }))
+    end
+
+    after do
+      # Clean up so this doesn't leak across tests
+      Users::PasswordsController.auth_service = nil
+      Users::RegistrationsController.auth_service = nil
+      Users::SessionsController.auth_service = nil
+    end
+
+    forms = [
+      {
+        name: "Password reset instructions",
+        path: "/users/forgot-password",
+        param_key: :users_forgot_password_form,
+        valid_params: {
+          email: "UsernameDoesntExistForSure@example.com"
         }
-      end
+      },
+      {
+        name: "Password confirm reset",
+        path: "/users/reset-password",
+        param_key: :users_reset_password_form,
+        valid_params: {
+          email: "testIsANewUser@example.com",
+          code: "123456",
+          password: "aLongPassword123"
+        }
+      },
+      {
+        name: "Registration",
+        path: "/users/registrations",
+        param_key: :users_registration_form,
+        valid_params: {
+          email: "evenneweruser@example.com",
+          password: "aLongPassword123"
+        }
+      },
+      {
+        name: "Login",
+        path: "/users/sign_in",
+        param_key: :users_new_session_form,
+        valid_params: {
+          email: "test@example.com",
+          password: "password"
+        }
+      }
+    ]
+
+    forms.each do |form|
+      describe "#{form[:name]} form" do
+        let(:spam_params) do
+          {
+            form[:param_key] => form[:valid_params].merge(spam_trap: "I am a bot")
+          }
+        end
 
-      it "rejects spam submissions" do
-        post form[:path], params: spam_params
-        expect(response).to have_http_status(422), "Expected 422 for #{form[:name]} form, but got #{response.status}"
+        it "rejects spam submissions" do
+          post form[:path], params: spam_params
+          expect(response).to have_http_status(422), "Expected 422 for #{form[:name]} form, but got #{response.status}"
+        end
       end
     end
   end
-end