Skip to content

Commit

Permalink
Fixes #3971 - Exchange integration requires OAuth instead of basic au…
Browse files Browse the repository at this point in the history
…thentication.

Co-authored-by: Rolf Schmidt <rolf.schmidt@zammad.com>
Co-authored-by: Florian Liebe <fl@zammad.com>
  • Loading branch information
fliebe92 and rolfschmidt committed Dec 16, 2022
1 parent 50103cf commit 970f2ad
Show file tree
Hide file tree
Showing 21 changed files with 978 additions and 166 deletions.
12 changes: 12 additions & 0 deletions .rubocop/todo.yml
Expand Up @@ -266,6 +266,7 @@ Metrics/AbcSize:
- 'lib/external_credential/facebook.rb'
- 'lib/external_credential/google.rb'
- 'lib/external_credential/microsoft365.rb'
- 'lib/external_credential/exchange.rb'
- 'lib/external_credential/twitter.rb'
- 'lib/facebook.rb'
- 'lib/fill_db.rb'
Expand Down Expand Up @@ -299,6 +300,7 @@ Metrics/AbcSize:
- 'lib/secure_mailing/smime/retry.rb'
- 'lib/sequencer.rb'
- 'lib/sequencer/state.rb'
- 'lib/sequencer/unit/exchange/connection.rb'
- 'lib/sequencer/unit/exchange/folders/id_path_map.rb'
- 'lib/sequencer/unit/import/common/model/associations/extract.rb'
- 'lib/sequencer/unit/import/exchange/attribute_examples.rb'
Expand Down Expand Up @@ -409,6 +411,7 @@ Metrics/BlockLength:
- 'lib/report/ticket_moved.rb'
- 'lib/report/ticket_reopened.rb'
- 'lib/search_index_backend.rb'
- 'lib/sequencer/unit/exchange/connection.rb'
- 'lib/sessions.rb'
- 'lib/sessions/backend/ticket_overview_list.rb'
- 'lib/sessions/client.rb'
Expand Down Expand Up @@ -598,6 +601,7 @@ Metrics/CyclomaticComplexity:
- 'lib/external_credential/facebook.rb'
- 'lib/external_credential/google.rb'
- 'lib/external_credential/microsoft365.rb'
- 'lib/external_credential/exchange.rb'
- 'lib/external_credential/twitter.rb'
- 'lib/facebook.rb'
- 'lib/fill_db.rb'
Expand All @@ -617,6 +621,7 @@ Metrics/CyclomaticComplexity:
- 'lib/report/ticket_reopened.rb'
- 'lib/search_index_backend.rb'
- 'lib/secure_mailing/smime/incoming.rb'
- 'lib/sequencer/unit/exchange/connection.rb'
- 'lib/sequencer/unit/import/zendesk/sub_sequence/base.rb'
- 'lib/service/geo_ip/zammad.rb'
- 'lib/session_helper/collection_base.rb'
Expand Down Expand Up @@ -819,6 +824,7 @@ Metrics/PerceivedComplexity:
- 'lib/external_credential/facebook.rb'
- 'lib/external_credential/google.rb'
- 'lib/external_credential/microsoft365.rb'
- 'lib/external_credential/exchange.rb'
- 'lib/external_credential/twitter.rb'
- 'lib/facebook.rb'
- 'lib/fill_db.rb'
Expand All @@ -837,6 +843,7 @@ Metrics/PerceivedComplexity:
- 'lib/report/ticket_reopened.rb'
- 'lib/search_index_backend.rb'
- 'lib/secure_mailing/smime/incoming.rb'
- 'lib/sequencer/unit/exchange/connection.rb'
- 'lib/service/geo_ip/zammad.rb'
- 'lib/session_helper/collection_base.rb'
- 'lib/session_helper/collection_ticket.rb'
Expand Down Expand Up @@ -912,10 +919,15 @@ Style/OptionalBooleanParameter:
- 'lib/external_credential/facebook.rb'
- 'lib/external_credential/google.rb'
- 'lib/external_credential/microsoft365.rb'
- 'lib/external_credential/exchange.rb'
- 'lib/external_credential/twitter.rb'
- 'lib/html_sanitizer.rb'
- 'lib/models.rb'
- 'lib/sessions/backend/ticket_overview_list.rb'
- 'lib/sessions/node.rb'
- 'spec/support/system_init_done.rb'
- 'test/browser_test_helper.rb'

Lint/MissingSuper:
Exclude:
- 'lib/sequencer/unit/exchange/connection.rb'
Expand Up @@ -129,7 +129,7 @@ class ChannelAccountOverview extends App.ControllerSubContent

if @error_code is 'AADSTS65004'
@error_code = undefined
new AdminConsentInfo(container: @container)
new App.AdminConsentInfo(container: @container)

show: (params) =>
for key, value of params
Expand Down Expand Up @@ -436,7 +436,7 @@ class AppConfig extends App.ControllerModal
@el.find('.alert').removeClass('hidden').text(data.error || __('App could not be verified.'))
)

class AdminConsentInfo extends App.ControllerModal
class App.AdminConsentInfo extends App.ControllerModal
buttonClose: true
small: true
buttonSubmit: __('Close')
Expand Down

0 comments on commit 970f2ad

Please sign in to comment.