fix: Current.user nil issue when using access tokens (#2012)

2021-03-29 23:26:20 +05:30
parent 24fea5fbe0
commit 6bb026621d
5 changed files with 8 additions and 5 deletions
--- a/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
+++ b/app/controllers/api/v1/accounts/contacts/conversations_controller.rb
@@ -8,10 +8,10 @@ class Api::V1::Accounts::Contacts::ConversationsController < Api::V1::Accounts::
  private

  def inbox_ids
-    if current_user.administrator?
+    if Current.user.administrator?
      Current.account.inboxes.pluck(:id)
-    elsif current_user.agent?
-      current_user.assigned_inboxes.pluck(:id)
+    elsif Current.user.agent?
+      Current.user.assigned_inboxes.pluck(:id)
    else
      []
    end