omniauth-slack 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f79b8e67dacdd3e9030fe66dd61bcbc78d1544da
-  data.tar.gz: d0026c7cab03f2fefc77828b67ac3e981939280b
+  metadata.gz: 02f23c3432e35d13d73b6a665cd2cd80283e1a2c
+  data.tar.gz: 6bbfd64ec1070fd5e722368b42630419b73fee93
 SHA512:
-  metadata.gz: 4cc4341e62ce85da1d4d7bed36f3e8f858851309e1812518466520b215ec86173413f50bcf161dba3e4c1a7b476f3fe1455248524b596bd68f34dd6f7c4dd187
-  data.tar.gz: ab19de0c2cb9cec37898cfb0f9a42cccf3f544a98ba954e29d651ee60f3f422e5d0c301f1eb06dca2d3c97fd8bbebdb4dfd2c753fd85ca00689ad14e62090028
+  metadata.gz: a5ab0900cc8112a8c0fe62007eb21e6f97f3bf91e0135a5d245f35975771949ec4d0b14f765fe861332d2f0cb499aaaf429eb58e72eaa466896902c91994e9c0
+  data.tar.gz: 13953b8a129bc1f52f911fa3a0c8f71d355b35034f9e0a8c5189561103f109c39ca1c28c1be57d27ddb4cac059fbee1be8e55d3adcca862894e767438fdab731

data/lib/omniauth-slack/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Slack
-    VERSION = "2.2.0"
+    VERSION = "2.3.0"
   end
 end

data/lib/omniauth/strategies/slack.rb

@@ -1,4 +1,6 @@
 require 'omniauth/strategies/oauth2'
+require 'uri'
+require 'rack/utils'
 
 module OmniAuth
   module Strategies
@@ -20,34 +22,49 @@ module OmniAuth
       uid { raw_info['user_id'] }
 
       info do
-        {
-          name: user_info['user'].to_h['profile'].to_h['real_name_normalized'],
-          email: user_info['user'].to_h['profile'].to_h['email'],
+        hash = {
           nickname: raw_info['user'],
-          first_name: user_info['user'].to_h['profile'].to_h['first_name'],
-          last_name: user_info['user'].to_h['profile'].to_h['last_name'],
-          description: user_info['user'].to_h['profile'].to_h['title'],
-          image_24: user_info['user'].to_h['profile'].to_h['image_24'],
-          image_48: user_info['user'].to_h['profile'].to_h['image_48'],
-          image: user_info['user'].to_h['profile'].to_h['image_192'],
           team: raw_info['team'],
           user: raw_info['user'],
           team_id: raw_info['team_id'],
-          team_domain: team_info['team'].to_h['domain'],
-          user_id: raw_info['user_id'],
-          is_admin: user_info['user'].to_h['is_admin'],
-          is_owner: user_info['user'].to_h['is_owner'],
-          time_zone: user_info['user'].to_h['tz']
+          user_id: raw_info['user_id']
         }
+
+        unless skip_info?
+          hash.merge!(
+            name: user_info['user'].to_h['profile'].to_h['real_name_normalized'],
+            email: user_info['user'].to_h['profile'].to_h['email'],
+            first_name: user_info['user'].to_h['profile'].to_h['first_name'],
+            last_name: user_info['user'].to_h['profile'].to_h['last_name'],
+            description: user_info['user'].to_h['profile'].to_h['title'],
+            image_24: user_info['user'].to_h['profile'].to_h['image_24'],
+            image_48: user_info['user'].to_h['profile'].to_h['image_48'],
+            image: user_info['user'].to_h['profile'].to_h['image_192'],
+            team_domain: team_info['team'].to_h['domain'],
+            is_admin: user_info['user'].to_h['is_admin'],
+            is_owner: user_info['user'].to_h['is_owner'],
+            time_zone: user_info['user'].to_h['tz']
+          )
+        end
+
+        hash
       end
 
       extra do
-        {
+        hash = {
           raw_info: raw_info,
-          user_info: user_info,
-          team_info: team_info,
-          web_hook_info: web_hook_info
+          web_hook_info: web_hook_info,
+          bot_info: bot_info
         }
+
+        unless skip_info?
+          hash.merge!(
+            user_info: user_info,
+            team_info: team_info
+          )
+        end
+
+        hash
       end
 
       def raw_info
@@ -55,7 +72,11 @@ module OmniAuth
       end
 
       def user_info
-        @user_info ||= access_token.get("/api/users.info?user=#{raw_info['user_id']}").parsed
+        url = URI.parse("/api/users.info")
+        url.query = Rack::Utils.build_query(user: raw_info['user_id'])
+        url = url.to_s
+
+        @user_info ||= access_token.get(url).parsed
       end
 
       def team_info
@@ -67,12 +88,24 @@ module OmniAuth
         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

data/test/test.rb

@@ -98,3 +98,43 @@ class CredentialsTest < StrategyTestCase
     refute_has_key "refresh_token", strategy.credentials
   end
 end
+
+class UserInfoTest < StrategyTestCase
+
+  def setup
+    super
+    @access_token = stub("OAuth2::AccessToken")
+    strategy.stubs(:access_token).returns(@access_token)
+  end
+
+  test "performs a GET to https://slack.com/api/users.info" do
+    strategy.stubs(:raw_info).returns("user_id" => "U123")
+    @access_token.expects(:get).with("/api/users.info?user=U123")
+      .returns(stub_everything("OAuth2::Response"))
+    strategy.user_info
+  end
+
+  test "URI escapes user ID" do
+    strategy.stubs(:raw_info).returns("user_id" => "../haxx?U123#abc")
+    @access_token.expects(:get).with("/api/users.info?user=..%2Fhaxx%3FU123%23abc")
+      .returns(stub_everything("OAuth2::Response"))
+    strategy.user_info
+  end
+end
+
+class SkipInfoTest < StrategyTestCase
+
+  test 'info should not include extended info when skip_info is specified' do
+    @options = { skip_info: true }
+    strategy.stubs(:raw_info).returns({})
+    assert_equal %w[nickname team user team_id user_id], strategy.info.keys.map(&:to_s)
+  end
+
+  test 'extra should not include extended info when skip_info is specified' do
+    @options = { skip_info: true }
+    strategy.stubs(:raw_info).returns({})
+    strategy.stubs(:webhook_info).returns({})
+    assert_equal %w[raw_info web_hook_info bot_info], strategy.extra.keys.map(&:to_s)
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-slack
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - kimura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Slack