gitlab-mail_room 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e9602ef5d0f53b51c947485678b32f45b0d6099a2b9e10dea153358bc5023c4
-  data.tar.gz: 05203d73f36e129d0f463537d2be619181c804a60aacbdf58d6a12ca6dbf8392
+  metadata.gz: d67e38380fdc5833ee32a9cacee0894a2f9533b869ada45847156a7d49e0130b
+  data.tar.gz: 51c4d4449a80f38d06b99d3fd0f62c9ddf3760f3f55ec7611887ab9e583dc77a
 SHA512:
-  metadata.gz: b2860a2390178f2862d0ac3f139f1330e9502cfab0ea06d850feef7212c6575c0b97eddda0b958ad274038a819261d1e2984997a52b7e54e6c6b9d5707f6c51c
-  data.tar.gz: 5b5f63868bfee8235d4be4f56e62d5d83be90ad3faa8dfa99776720176133de725defb143757058eccd32daee8ef75505560ee91523cc27c0876f3b2a60941cb
+  metadata.gz: d52fb679aa2b3395e91d4d0f055fc5fb7e709495c5172148a1439d2472ea45a47115824dcf2717aaaa7312679ef48614007ffd4d8d4358e671bb40b037177d72
+  data.tar.gz: a4e43c65a7bd5561e2731a0056299f4c2f68c31c4854a91291f3d47874bccbefe9048f4872aef7a82750a3e4afdad4c7ac59e0c79c667bbc1b83006c35f2440a

data/.gitlab/issue_templates/Default.md

@@ -0,0 +1,9 @@
+Please read me!
+
+This repository supports our packaged release of `mail_room` that ships with GitLab. We strive to diverge as little as possible from the canonical upstream at https://www.github.com/tpitale/mail_room. If we do diverge, our patches are sent upstream for review and we carry them here to support the GitLab application.
+
+You can raise an issue here if you're having an issue *specifically in the context of a GitLab installation*.
+
+Otherwise, please direct any issues upstream to https://www.github.com/tpitale/mail_room.
+
+Thank you for contributing!

data/.gitlab-ci.yml

@@ -24,3 +24,6 @@ rspec:
     matrix:
       - RUBY_VERSION: [ "2.5", "2.6", "2.7", "3.0" ]
   <<: *test
+
+include:
+  - template: Security/Dependency-Scanning.gitlab-ci.yml

data/.rubocop_todo.yml

@@ -1,13 +1,13 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-04-26 06:46:39 UTC using RuboCop version 1.11.0.
+# on 2022-03-15 06:29:40 UTC using RuboCop version 1.26.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation, Include.
 # Include: **/*.gemspec
 Gemspec/OrderedDependencies:
@@ -21,15 +21,15 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'mail_room.gemspec'
 
-# Offense count: 4
-# Cop supports --auto-correct.
+# Offense count: 5
+# This cop supports safe auto-correction (--auto-correct).
 Layout/BlockEndNewline:
   Exclude:
     - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
 # SupportedStyles: case, end
 Layout/CaseIndentation:
@@ -37,13 +37,13 @@ Layout/CaseIndentation:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Layout/EmptyLineAfterMagicComment:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: around, only_before
 Layout/EmptyLinesAroundAccessModifier:
@@ -52,7 +52,7 @@ Layout/EmptyLinesAroundAccessModifier:
     - 'lib/mail_room/delivery/que.rb'
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, no_empty_lines
 Layout/EmptyLinesAroundBlockBody:
@@ -62,15 +62,15 @@ Layout/EmptyLinesAroundBlockBody:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
 Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 13
-# Cop supports --auto-correct.
+# Offense count: 15
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: special_inside_parentheses, consistent, align_braces
 Layout/FirstHashElementIndentation:
@@ -80,7 +80,7 @@ Layout/FirstHashElementIndentation:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
 # SupportedHashRocketStyles: key, separator, table
 # SupportedColonStyles: key, separator, table
@@ -90,22 +90,22 @@ Layout/HashAlignment:
     - 'lib/mail_room/delivery/sidekiq.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowDoxygenCommentStyle, AllowGemfileRubyComment.
 Layout/LeadingCommentSpace:
   Exclude:
     - 'lib/mail_room/mailbox.rb'
     - 'spec/lib/arbitration/redis_spec.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
+# Offense count: 5
+# This cop supports safe auto-correction (--auto-correct).
 Layout/MultilineBlockLayout:
   Exclude:
     - 'spec/lib/delivery/postback_spec.rb'
     - 'spec/lib/delivery/que_spec.rb'
 
 # Offense count: 3
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: space, no_space
 Layout/SpaceAroundEqualsInParameterDefault:
@@ -115,14 +115,14 @@ Layout/SpaceAroundEqualsInParameterDefault:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Layout/SpaceAroundKeyword:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowForAlignment, EnforcedStyleForExponentOperator.
 # SupportedStylesForExponentOperator: space, no_space
 Layout/SpaceAroundOperators:
@@ -131,7 +131,7 @@ Layout/SpaceAroundOperators:
     - 'spec/lib/arbitration/redis_spec.rb'
 
 # Offense count: 7
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
@@ -141,8 +141,8 @@ Layout/SpaceBeforeBlockBraces:
     - 'spec/lib/crash_handler_spec.rb'
     - 'spec/lib/mailbox_spec.rb'
 
-# Offense count: 50
-# Cop supports --auto-correct.
+# Offense count: 51
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
@@ -158,43 +158,41 @@ Layout/SpaceInsideBlockBraces:
     - 'spec/lib/imap/connection_spec.rb'
     - 'spec/lib/mailbox_watcher_spec.rb'
 
-# Offense count: 34
-# Cop supports --auto-correct.
+# Offense count: 32
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
   Exclude:
-    - 'lib/mail_room/arbitration/redis.rb'
     - 'lib/mail_room/mailbox.rb'
     - 'spec/lib/cli_spec.rb'
     - 'spec/lib/mailbox_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, no_space
+# SupportedStyles: space, compact, no_space
 Layout/SpaceInsideParens:
   Exclude:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: final_newline, final_blank_line
 Layout/TrailingEmptyLines:
   Exclude:
     - 'spec/lib/delivery/letter_opener_spec.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
+# Offense count: 4
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
     - 'lib/mail_room/imap.rb'
     - 'spec/lib/coordinator_spec.rb'
-    - 'spec/lib/delivery/postback_spec.rb'
 
 # Offense count: 5
 # Configuration parameters: AllowedMethods.
@@ -209,27 +207,27 @@ Lint/RescueException:
     - 'lib/mail_room/cli.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 4
+# Offense count: 5
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 27
 
-# Offense count: 27
+# Offense count: 32
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
-  Max: 145
+  Max: 198
 
 # Offense count: 3
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 151
+  Max: 169
 
 # Offense count: 1
 # Configuration parameters: IgnoredMethods.
@@ -252,29 +250,21 @@ Naming/AccessorMethodName:
     - 'lib/mail_room/configuration.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Security/YAMLLoad:
   Exclude:
     - 'lib/mail_room/configuration.rb'
 
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, AllowModifiersOnSymbols.
-# SupportedStyles: inline, group
-Style/AccessModifierDeclarations:
-  Exclude:
-    - 'lib/mail_room/arbitration.rb'
-    - 'lib/mail_room/delivery.rb'
-
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: prefer_alias, prefer_alias_method
 Style/Alias:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
 
-# Offense count: 14
-# Cop supports --auto-correct.
+# Offense count: 16
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
 # SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
 # ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
@@ -288,6 +278,7 @@ Style/BlockDelimiters:
     - 'spec/lib/delivery/sidekiq_spec.rb'
 
 # Offense count: 12
+# Configuration parameters: AllowedConstants.
 Style/Documentation:
   Exclude:
     - 'spec/**/*'
@@ -306,7 +297,7 @@ Style/Documentation:
     - 'lib/mail_room/microsoft_graph/connection.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: compact, expanded
 Style/EmptyMethod:
@@ -315,27 +306,27 @@ Style/EmptyMethod:
     - 'lib/mail_room/delivery/noop.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/Encoding:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/ExpandPathArguments:
   Exclude:
     - 'mail_room.gemspec'
     - 'spec/spec_helper.rb'
 
-# Offense count: 38
-# Cop supports --auto-correct.
+# Offense count: 39
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/GlobalStdStream:
   Exclude:
     - 'lib/mail_room/crash_handler.rb'
@@ -352,21 +343,22 @@ Style/GuardClause:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
 # SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
+# SupportedShorthandSyntax: always, never, either
 Style/HashSyntax:
   Exclude:
     - 'spec/lib/microsoft_graph/connection_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/IfUnlessModifier:
   Exclude:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: literals, strict
 Style/MutableConstant:
@@ -377,7 +369,7 @@ Style/MutableConstant:
     - 'spec/spec_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe auto-correction (--auto-correct-all).
 # Configuration parameters: EnforcedStyle, IgnoredMethods.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
@@ -386,7 +378,7 @@ Style/NumericPredicate:
     - 'lib/mail_room/imap/connection.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports unsafe auto-correction (--auto-correct-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: short, verbose
 Style/PreferredHashMethods:
@@ -395,7 +387,7 @@ Style/PreferredHashMethods:
     - 'lib/mail_room/mailbox.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, AllowedCompactTypes.
 # SupportedStyles: compact, exploded
 Style/RaiseArgs:
@@ -403,13 +395,13 @@ Style/RaiseArgs:
     - 'lib/mail_room/logger/structured.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/RedundantPercentQ:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 7
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/RedundantSelf:
   Exclude:
     - 'lib/mail_room/configuration.rb'
@@ -418,7 +410,7 @@ Style/RedundantSelf:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: implicit, explicit
 Style/RescueStandardError:
@@ -426,7 +418,7 @@ Style/RescueStandardError:
     - 'lib/mail_room/configuration.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:
@@ -434,28 +426,29 @@ Style/SafeNavigation:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: RequireEnglish, EnforcedStyle.
 # SupportedStyles: use_perl_names, use_english_names
 Style/SpecialGlobalVars:
   Exclude:
     - 'mail_room.gemspec'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe auto-correction (--auto-correct-all).
+# Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'lib/mail_room/logger/structured.rb'
 
-# Offense count: 135
-# Cop supports --auto-correct.
+# Offense count: 140
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, ConsistentQuotesInMultiline.
 # SupportedStyles: single_quotes, double_quotes
 Style/StringLiterals:
   Enabled: false
 
 # Offense count: 4
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle, MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
@@ -464,7 +457,7 @@ Style/SymbolArray:
     - 'spec/lib/logger/structured_spec.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyleForMultiline.
 # SupportedStylesForMultiline: comma, consistent_comma, no_comma
 Style/TrailingCommaInHashLiteral:
@@ -473,29 +466,29 @@ Style/TrailingCommaInHashLiteral:
     - 'spec/spec_helper.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/WhileUntilDo:
   Exclude:
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 Style/WhileUntilModifier:
   Exclude:
     - 'lib/mail_room/coordinator.rb'
     - 'lib/mail_room/mailbox_watcher.rb'
 
 # Offense count: 3
-# Cop supports --auto-correct.
+# This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: WordRegex.
 # SupportedStyles: percent, brackets
 Style/WordArray:
   EnforcedStyle: percent
   MinSize: 3
 
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Offense count: 7
+# This cop supports safe auto-correction (--auto-correct).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 177

data/README.md

@@ -134,6 +134,8 @@ You will also need to install `faraday` or `letter_opener` if you use the `postb
       :client_id: ABCDE
       :client_secret: YOUR-SECRET-HERE
       :poll_interval: 60
+      :azure_ad_endpoint: https://login.microsoftonline.com
+      :graph_endpoint: https://graph.microsoft.com
     :delivery_method: sidekiq
     :delivery_options:
       :redis_url: redis://localhost:6379
@@ -232,6 +234,25 @@ Fill in `inbox_options` with these values:
 By default, MailRoom will poll for new messages every 60 seconds. `poll_interval` configures the number of
 seconds to poll. Setting the value to 0 or under will default to 60 seconds.
 
+### Alternative Azure cloud deployments
+
+MailRoom will default to using the standard Azure HTTPS endpoints. To
+configure MailRoom with Microsoft Cloud for US Government or other
+[national cloud deployments](https://docs.microsoft.com/en-us/graph/deployments), set
+the `azure_ad_endpoint` and `graph_endpoint` accordingly. For example,
+for Microsoft Cloud for US Government:
+
+```yaml
+    :inbox_method: microsoft_graph
+    :inbox_options:
+      :tenant_id: 12345
+      :client_id: ABCDE
+      :client_secret: YOUR-SECRET-HERE
+      :poll_interval: 60
+      :azure_ad_endpoint: https://login.microsoftonline.us
+      :graph_endpoint: https://graph.microsoft.us
+```
+
 ## delivery_method ##
 
 ### postback ###

data/lib/mail_room/microsoft_graph/connection.rb

@@ -6,7 +6,6 @@ require 'oauth2'
 module MailRoom
   module MicrosoftGraph
     class Connection < MailRoom::Connection
-      SCOPE = 'https://graph.microsoft.com/.default'
       NEXT_PAGE_KEY = '@odata.nextLink'
       DEFAULT_POLL_INTERVAL_S = 60
 
@@ -76,12 +75,12 @@ module MailRoom
       def setup
         @mailbox.logger.info({ context: @mailbox.context, action: 'Retrieving OAuth2 token...' })
 
-        @token = client.client_credentials.get_token({ scope: SCOPE })
+        @token = client.client_credentials.get_token({ scope: scope })
       end
 
       def client
         @client ||= OAuth2::Client.new(client_id, client_secret,
-                                       site: 'https://login.microsoftonline.com',
+                                       site: azure_ad_endpoint,
                                        authorize_url: "/#{tenant_id}/oauth2/v2.0/authorize",
                                        token_url: "/#{tenant_id}/oauth2/v2.0/token",
                                        auth_scheme: :basic_auth)
@@ -207,7 +206,7 @@ module MailRoom
       end
 
       def base_url
-        "https://graph.microsoft.com/v1.0/users/#{mailbox.email}/mailFolders/#{mailbox.name}/messages"
+        "#{graph_endpoint}/v1.0/users/#{mailbox.email}/mailFolders/#{mailbox.name}/messages"
       end
 
       def unread_messages_url
@@ -216,7 +215,7 @@ module MailRoom
 
       def msg_url(id)
         # Attempting to use the base_url fails with "The OData request is not supported"
-        "https://graph.microsoft.com/v1.0/users/#{mailbox.email}/messages/#{id}"
+        "#{graph_endpoint}/v1.0/users/#{mailbox.email}/messages/#{id}"
       end
 
       def rfc822_msg_url(id)
@@ -227,6 +226,18 @@ module MailRoom
       def log_exception(message, exception)
         @mailbox.logger.warn({ context: @mailbox.context, message: message, exception: exception.to_s })
       end
+
+      def scope
+        "#{graph_endpoint}/.default"
+      end
+
+      def graph_endpoint
+        inbox_options[:graph_endpoint] || 'https://graph.microsoft.com'
+      end
+
+      def azure_ad_endpoint
+        inbox_options[:azure_ad_endpoint] || 'https://login.microsoftonline.com'
+      end
     end
   end
 end

data/lib/mail_room/version.rb

@@ -1,4 +1,4 @@
 module MailRoom
   # Current version of gitlab-mail_room gem
-  VERSION = "0.0.19"
+  VERSION = "0.0.20"
 end

data/spec/lib/delivery/sidekiq_spec.rb

@@ -43,7 +43,6 @@ describe MailRoom::Delivery::Sidekiq do
           expect(raw_client.options[:url]).to eq(redis_url)
         end
 
-
         it 'connection has correct values' do
           expect(redis.connection[:host]).to eq('localhost')
           expect(redis.connection[:db]).to eq(4)

data/spec/lib/microsoft_graph/connection_spec.rb

@@ -14,8 +14,10 @@ describe MailRoom::MicrosoftGraph::Connection do
     }.merge(REQUIRED_MICROSOFT_GRAPH_DEFAULTS)
   end
   let(:mailbox) { build_mailbox(options) }
-  let(:base_url) { 'https://graph.microsoft.com/v1.0/users/user@example.com/mailFolders/inbox/messages' }
-  let(:message_base_url) { 'https://graph.microsoft.com/v1.0/users/user@example.com/messages' }
+  let(:graph_endpoint) { 'https://graph.microsoft.com' }
+  let(:azure_ad_endpoint) { 'https://login.microsoftonline.com' }
+  let(:base_url) { "#{graph_endpoint}/v1.0/users/user@example.com/mailFolders/inbox/messages" }
+  let(:message_base_url) { "#{graph_endpoint}/v1.0/users/user@example.com/messages" }
 
   let(:connection) { described_class.new(mailbox) }
   let(:uid) { 1 }
@@ -25,7 +27,7 @@ describe MailRoom::MicrosoftGraph::Connection do
   let(:unread_messages_body) { '' }
   let(:status) { 200 }
   let!(:stub_token) do
-    stub_request(:post, "https://login.microsoftonline.com/#{tenant_id}/oauth2/v2.0/token").to_return(
+    stub_request(:post, "#{azure_ad_endpoint}/#{tenant_id}/oauth2/v2.0/token").to_return(
       body: { 'access_token' => access_token, 'refresh_token' => refresh_token, 'expires_in' => expires_in }.to_json,
       headers: { 'Content-Type' => 'application/json' }
     )
@@ -102,7 +104,7 @@ describe MailRoom::MicrosoftGraph::Connection do
       end
     end
 
-    context 'with a single message' do
+    shared_examples 'with a single message' do
       let(:message_id) { SecureRandom.hex }
       let(:unread_messages_body) { { value: ['id' => message_id] } }
       let(:message_url) { "#{message_base_url}/#{message_id}" }
@@ -134,9 +136,38 @@ describe MailRoom::MicrosoftGraph::Connection do
       end
     end
 
+    context 'with default Azure settings' do
+      before do
+        puts options
+      end
+      it_behaves_like 'with a single message'
+    end
+
+    # https://docs.microsoft.com/en-us/graph/deployments
+    context 'with an alternative Azure deployment' do
+      let(:graph_endpoint) { 'https://graph.microsoft.us' }
+      let(:azure_ad_endpoint) { 'https://login.microsoftonline.us' }
+      let(:options) do
+        {
+          inbox_method: :microsoft_graph,
+          delete_after_delivery: true,
+          expunge_deleted: true,
+          inbox_options: {
+            tenant_id: '98776',
+            client_id: '12345',
+            client_secret: 'MY-SECRET',
+            graph_endpoint: 'https://graph.microsoft.us',
+            azure_ad_endpoint: 'https://login.microsoftonline.us'
+          }
+        }
+      end
+
+      it_behaves_like 'with a single message'
+    end
+
     context 'with multiple pages of messages' do
       let(:message_ids) { [SecureRandom.hex, SecureRandom.hex] }
-      let(:next_page_url) { 'https://graph.microsoft.com/v1.0/nextPage' }
+      let(:next_page_url) { "#{graph_endpoint}/v1.0/nextPage" }
       let(:unread_messages_body) { { value: ['id' => message_ids.first], '@odata.nextLink' => next_page_url } }
       let(:message_body) { 'hello world' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-mail_room
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Tony Pitale
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-20 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-imap
@@ -272,6 +272,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".gitlab/issue_templates/Default.md"
 - ".gitlab/issue_templates/Release.md"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
@@ -355,7 +356,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: mail_room will proxy email (gmail) from IMAP to a callback URL, logger, or