Merge branch '8012labs-bot-info'

Author: kmrshntr

lib/omniauth/strategies/slack.rb

@@ -53,7 +53,8 @@ class Slack < OmniAuth::Strategies::OAuth2
       extra do
         hash = {
           raw_info: raw_info,
-          web_hook_info: web_hook_info
+          web_hook_info: web_hook_info,
+          bot_info: bot_info
         }
 
         unless skip_info?
@@ -87,12 +88,24 @@ def web_hook_info
         access_token.params['incoming_webhook']
       end
 
+      def bot_info
+        return {} unless bot_allowed?
+        access_token.params['bot']
+      end
+
       def incoming_webhook_allowed?
         return false unless options['scope']
         webhooks_scopes = ['incoming-webhook']
         scopes = options['scope'].split(',')
         (scopes & webhooks_scopes).any?
       end
+
+      def bot_allowed?
+        return false unless options['scope']
+        bot_scopes = ['bot']
+        scopes = options['scope'].split(',')
+        (scopes & bot_scopes).any?
+      end
     end
   end
 end

test/test.rb

@@ -134,7 +134,7 @@ class SkipInfoTest < StrategyTestCase
     @options = { skip_info: true }
     strategy.stubs(:raw_info).returns({})
     strategy.stubs(:webhook_info).returns({})
-    assert_equal %w[raw_info web_hook_info], strategy.extra.keys.map(&:to_s)
+    assert_equal %w[raw_info web_hook_info bot_info], strategy.extra.keys.map(&:to_s)
   end
 
 end