Add autodiscovery exception handling to ExchangeController

This commit is contained in:
Ryan Lue 2018-07-11 11:01:36 +08:00
parent d02edbfc3b
commit 2e4b7128f1
2 changed files with 24 additions and 4 deletions

View file

@ -16,9 +16,11 @@ class Integration::ExchangeController < ApplicationController
client.http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE client.http.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
end end
{ begin
endpoint: client.try(:autodiscover).try(:ews_url), { endpoint: client.autodiscover&.ews_url }
} rescue Errno::EADDRNOTAVAIL
{}
end
end end
end end

View file

@ -12,7 +12,8 @@ RSpec.describe 'Exchange integration endpoint', type: :request do
end end
describe 'EWS folder retrieval' do describe 'EWS folder retrieval' do
context 'when no folders found' do # see https://github.com/zammad/zammad/issues/1802
context 'when no folders found (#1802)' do
let(:empty_folder_list) { { folders: {} } } let(:empty_folder_list) { { folders: {} } }
it 'responds with an error message' do it 'responds with an error message' do
@ -25,4 +26,21 @@ RSpec.describe 'Exchange integration endpoint', type: :request do
end end
end end
end end
describe 'autodiscovery' do
# see https://github.com/zammad/zammad/issues/2065
context 'when Autodiscover gem raises Errno::EADDRNOTAVAIL (#2065)' do
let(:client) { instance_double('Autodiscover::Client') }
it 'rescues and responds with an empty hash (to proceed to manual configuration)' do
allow(Autodiscover::Client).to receive(:new).with(any_args).and_return(client)
allow(client).to receive(:autodiscover).and_raise(Errno::EADDRNOTAVAIL)
post api_v1_integration_exchange_autodiscover_path,
params: {}, as: :json
expect(json_response).to eq('result' => 'ok')
end
end
end
end end