hook.settings['account_email'],
+ 'X-USER-TOKEN' => hook.settings['access_token'],
+ 'Content-Type' => 'application/json'
+ }
+
+ body = {
+ message: message_content,
+ previous_messages: previous_messages
+ }
+
+ response = HTTParty.post(url, headers: headers, body: body.to_json)
+ response.parsed_response['message']
+ end
+
+ def previous_messages
+ previous_messages = []
+ conversation.messages.where(message_type: [:outgoing, :incoming]).where(private: false).offset(1).find_each do |message|
+ next if message.content_type != 'text'
+
+ role = determine_role(message)
+ previous_messages << { message: message.content, type: role }
+ end
+ previous_messages
+ end
+
+ def determine_role(message)
+ message.message_type == 'incoming' ? 'User' : 'Bot'
+ end
+end
diff --git a/lib/integrations/dialogflow/processor_service.rb b/lib/integrations/dialogflow/processor_service.rb
index 103ef05c5..f3962a66c 100644
--- a/lib/integrations/dialogflow/processor_service.rb
+++ b/lib/integrations/dialogflow/processor_service.rb
@@ -14,13 +14,13 @@ class Integrations::Dialogflow::ProcessorService < Integrations::BotProcessorSer
message.content
end
- def get_response(session_id, message)
+ def get_response(session_id, message_content)
if hook.settings['credentials'].blank?
Rails.logger.warn "Account: #{hook.try(:account_id)} Hook: #{hook.id} credentials are not present." && return
end
configure_dialogflow_client_defaults
- detect_intent(session_id, message)
+ detect_intent(session_id, message_content)
rescue Google::Cloud::PermissionDeniedError => e
Rails.logger.warn "DialogFlow Error: (account-#{hook.try(:account_id)}, hook-#{hook.id}) #{e.message}"
hook.prompt_reauthorization!
diff --git a/public/dashboard/images/integrations/captain-dark.png b/public/dashboard/images/integrations/captain-dark.png
new file mode 100644
index 000000000..edf8029d9
Binary files /dev/null and b/public/dashboard/images/integrations/captain-dark.png differ
diff --git a/public/dashboard/images/integrations/captain.png b/public/dashboard/images/integrations/captain.png
new file mode 100644
index 000000000..3141160f4
Binary files /dev/null and b/public/dashboard/images/integrations/captain.png differ
diff --git a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
index 43735046e..8662a5006 100644
--- a/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/apps_controller_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe 'Integration Apps API', type: :request do
let(:admin) { create(:user, account: account, role: :administrator) }
it 'returns all active apps without sensitive information if the user is an agent' do
- first_app = Integrations::App.all.find(&:active?)
+ first_app = Integrations::App.all.find { |app| app.active?(account) }
get api_v1_account_integrations_apps_url(account),
headers: agent.create_new_auth_token,
as: :json
@@ -41,7 +41,7 @@ RSpec.describe 'Integration Apps API', type: :request do
end
it 'returns all active apps with sensitive information if user is an admin' do
- first_app = Integrations::App.all.find(&:active?)
+ first_app = Integrations::App.all.find { |app| app.active?(account) }
get api_v1_account_integrations_apps_url(account),
headers: admin.create_new_auth_token,
as: :json
diff --git a/spec/models/integrations/app_spec.rb b/spec/models/integrations/app_spec.rb
index 703069349..b9652ff89 100644
--- a/spec/models/integrations/app_spec.rb
+++ b/spec/models/integrations/app_spec.rb
@@ -5,10 +5,6 @@ RSpec.describe Integrations::App do
let(:app) { apps.find(id: app_name) }
let(:account) { create(:account) }
- before do
- allow(Current).to receive(:account).and_return(account)
- end
-
describe '#name' do
let(:app_name) { 'slack' }
@@ -28,6 +24,10 @@ RSpec.describe Integrations::App do
describe '#action' do
let(:app_name) { 'slack' }
+ before do
+ allow(Current).to receive(:account).and_return(account)
+ end
+
context 'when the app is slack' do
it 'returns the action URL with client_id and redirect_uri' do
with_modified_env SLACK_CLIENT_ID: 'dummy_client_id' do
@@ -46,7 +46,7 @@ RSpec.describe Integrations::App do
context 'when the app is slack' do
it 'returns true if SLACK_CLIENT_SECRET is present' do
with_modified_env SLACK_CLIENT_SECRET: 'random_secret' do
- expect(app.active?).to be true
+ expect(app.active?(account)).to be true
end
end
end
@@ -55,14 +55,14 @@ RSpec.describe Integrations::App do
let(:app_name) { 'linear' }
it 'returns true if the linear integration feature is disabled' do
- expect(app.active?).to be false
+ expect(app.active?(account)).to be false
end
it 'returns false if the linear integration feature is enabled' do
account.enable_features('linear_integration')
account.save!
- expect(app.active?).to be true
+ expect(app.active?(account)).to be true
end
end
@@ -70,7 +70,7 @@ RSpec.describe Integrations::App do
let(:app_name) { 'webhook' }
it 'returns true' do
- expect(app.active?).to be true
+ expect(app.active?(account)).to be true
end
end
end