Merge pull request #158 from tpitale/allow-hash-shorthand

Allow either shorthand for hashes
tpitale · Nov 1, 2023 · 4502746 · 4502746
2 parents 1efeffd + e42cf8b
commit 4502746
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,3 +3,4 @@ inherit_from: .rubocop_todo.yml
 Style/HashSyntax:
   Enabled: true
   EnforcedStyle: ruby19_no_mixed_keys
+  EnforcedShorthandSyntax: either
diff --git a/lib/mail_room/delivery/postback.rb b/lib/mail_room/delivery/postback.rb
@@ -73,18 +73,7 @@ def deliver(message)
         if @delivery_options.token_auth?
           connection.token_auth @delivery_options.token
         elsif @delivery_options.basic_auth?
-          if defined?(connection.basic_auth)
-            connection.basic_auth(
-              @delivery_options.username,
-              @delivery_options.password
-            )
-          else
-            connection.request(
-              :authorization, :basic, 
-              @delivery_options.username,
-              @delivery_options.password
-            )
-          end
+          config_basic_auth(connection)
         end
 
         connection.post do |request|
@@ -111,6 +100,21 @@ def config_request_jwt_auth(request)
 
         request.headers[@delivery_options.jwt.header] = @delivery_options.jwt.token
       end
+
+      def config_basic_auth(connection)
+        if defined?(connection.basic_auth)
+          connection.basic_auth(
+            @delivery_options.username,
+            @delivery_options.password
+          )
+        else
+          connection.request(
+            :authorization, :basic,
+            @delivery_options.username,
+            @delivery_options.password
+          )
+        end
+      end
     end
   end
 end