Sojan JoseandGitHub
eae9841eb4
Token-authenticated requests to Agent Bots, Labels, and affected Captain endpoints return normal responses again. The regression was caused by duplicate `current_account` callbacks in subclasses moving account resolution behind the API entitlement check, leaving `Current.account` unset. ## Closes - https://linear.app/chatwoot/issue/CW-7641/5xx-errors-in-agent-bot-apis ## How to reproduce 1. Send `GET /api/v1/accounts/:account_id/agent_bots` with a valid administrator API access token. 2. Observe a `500` from `validate_token_api_access` because `Current.account` is `nil`. 3. With this change, account resolution runs in the base-controller order and the request succeeds. ## What changed - Removed redundant `current_account` callbacks from account-scoped controllers that already inherit the callback from `Api::V1::Accounts::BaseController`. - Kept the standalone direct-upload controller callback unchanged. - Added regression coverage for administrator API-token access to Agent Bots.
55 lines
1.3 KiB
Ruby
55 lines
1.3 KiB
Ruby
class Api::V1::Accounts::AgentBotsController < Api::V1::Accounts::BaseController
|
|
before_action :check_authorization
|
|
before_action :agent_bot, except: [:index, :create]
|
|
|
|
def index
|
|
@agent_bots = AgentBot.accessible_to(Current.account)
|
|
end
|
|
|
|
def show; end
|
|
|
|
def create
|
|
@agent_bot = Current.account.agent_bots.create!(permitted_params.except(:avatar_url))
|
|
process_avatar_from_url
|
|
end
|
|
|
|
def update
|
|
@agent_bot.update!(permitted_params.except(:avatar_url))
|
|
process_avatar_from_url
|
|
end
|
|
|
|
def avatar
|
|
@agent_bot.avatar.purge if @agent_bot.avatar.attached?
|
|
@agent_bot
|
|
end
|
|
|
|
def destroy
|
|
@agent_bot.destroy!
|
|
head :ok
|
|
end
|
|
|
|
def reset_access_token
|
|
@agent_bot.access_token.regenerate_token
|
|
@agent_bot.reload
|
|
end
|
|
|
|
def reset_secret
|
|
@agent_bot.reset_secret!
|
|
end
|
|
|
|
private
|
|
|
|
def agent_bot
|
|
@agent_bot = AgentBot.accessible_to(Current.account).find(params[:id]) if params[:action] == 'show'
|
|
@agent_bot ||= Current.account.agent_bots.find(params[:id])
|
|
end
|
|
|
|
def permitted_params
|
|
params.permit(:name, :description, :outgoing_url, :avatar, :avatar_url, :bot_type, bot_config: {})
|
|
end
|
|
|
|
def process_avatar_from_url
|
|
::Avatar::AvatarFromUrlJob.perform_later(@agent_bot, params[:avatar_url]) if params[:avatar_url].present?
|
|
end
|
|
end
|