re-enabling auth for rx

app/controllers/concerns/mhv_controller_concerns.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+module MHVControllerConcerns
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :authorize
+    before_action :authenticate_client
+  end
+
+  def authorize
+    current_user&.can_access_mhv? || raise_access_denied
+  end
+
+  def authenticate_client
+    client.authenticate if client.session.expired?
+  end
+end

app/controllers/rx_controller.rb

@@ -3,28 +3,15 @@
 
 class RxController < ApplicationController
   include ActionController::Serialization
-
-  # Temporarily disabling authenticate from ApplicationController
-  skip_before_action :authenticate
-  # before_action :authorize_rx
-  before_action :authenticate_client
+  include MHVControllerConcerns
 
   protected
 
   def client
-    # @client ||= Rx::Client.new(session: { user_id: current_user.mhv_correlation_id })
-    @client ||= Rx::Client.new(session: { user_id: ENV['MHV_USER_ID'] })
+    @client ||= Rx::Client.new(session: { user_id: current_user.mhv_correlation_id })
   end
 
-  # def authorize_rx
-  #   current_user&.can_access_mhv? || raise_access_denied
-  # end
-
-  # def raise_access_denied
-  #   raise Common::Exceptions::Forbidden, detail: 'You do not have access to prescriptions'
-  # end
-
-  def authenticate_client
-    client.authenticate if client.session.expired?
+  def raise_access_denied
+    raise Common::Exceptions::Forbidden, detail: 'You do not have access to prescriptions'
   end
 end

app/controllers/sm_controller.rb

@@ -3,25 +3,15 @@
 
 class SMController < ApplicationController
   include ActionController::Serialization
-
-  before_action :authorize_sm
-  before_action :authenticate_client
+  include MHVControllerConcerns
 
   protected
 
   def client
     @client ||= SM::Client.new(session: { user_id: current_user.mhv_correlation_id })
   end
 
-  def authorize_sm
-    current_user&.can_access_mhv? || raise_access_denied
-  end
-
   def raise_access_denied
     raise Common::Exceptions::Forbidden, detail: 'You do not have access to messaging'
   end
-
-  def authenticate_client
-    client.authenticate if client.session.expired?
-  end
 end

spec/request/attachments_request_spec.rb

@@ -12,7 +12,7 @@
   let(:message_id) { 573_302 }
 
   before(:each) do
-    allow_any_instance_of(SMController).to receive(:client).and_return(authenticated_client)
+    allow(SM::Client).to receive(:new).and_return(authenticated_client)
     use_authenticated_current_user(current_user: current_user)
   end
 

spec/request/folders_request_spec.rb

@@ -11,7 +11,7 @@
   let(:inbox_id) { 0 }
 
   before(:each) do
-    allow_any_instance_of(SMController).to receive(:client).and_return(authenticated_client)
+    allow(SM::Client).to receive(:new).and_return(authenticated_client)
     use_authenticated_current_user(current_user: current_user)
   end
 

spec/request/message_drafts_request_spec.rb

@@ -14,7 +14,7 @@
   let(:params) { draft.slice(:category, :subject, :body, :recipient_id) }
 
   before(:each) do
-    allow_any_instance_of(SMController).to receive(:client).and_return(authenticated_client)
+    allow(SM::Client).to receive(:new).and_return(authenticated_client)
     use_authenticated_current_user(current_user: current_user)
   end
 

spec/request/messages_request_spec.rb

@@ -12,7 +12,7 @@
   let(:message_id) { 573_059 }
 
   before(:each) do
-    allow_any_instance_of(SMController).to receive(:client).and_return(authenticated_client)
+    allow(SM::Client).to receive(:new).and_return(authenticated_client)
     use_authenticated_current_user(current_user: current_user)
   end
 

spec/request/prescriptions_request_spec.rb

@@ -9,13 +9,14 @@
   let(:current_user) { build(:mhv_user) }
 
   before(:each) do
-    allow_any_instance_of(RxController).to receive(:client).and_return(authenticated_client)
+    allow(Rx::Client).to receive(:new).and_return(authenticated_client)
+    use_authenticated_current_user(current_user: current_user)
   end
 
   context 'forbidden user' do
     let(:current_user) { build(:user) }
 
-    xit 'raises access denied' do
+    it 'raises access denied' do
       get '/v0/prescriptions/13651310'
 
       expect(response).to have_http_status(:forbidden)

spec/request/triage_teams_request_spec.rb

@@ -9,7 +9,7 @@
   let(:current_user) { build(:mhv_user) }
 
   it 'responds to GET #index' do
-    allow_any_instance_of(SMController).to receive(:client).and_return(authenticated_client)
+    allow(SM::Client).to receive(:new).and_return(authenticated_client)
     use_authenticated_current_user(current_user: current_user)
 
     VCR.use_cassette('sm_client/triage_teams/gets_a_collection_of_triage_team_recipients') do