Merge pull request WebTheoryLLC#2 from almirsarajcic/master

Fix issue WebTheoryLLC#1 (change Auth Hash)
jtokoph · Mar 1, 2015 · 68688be · 68688be
2 parents c90a93f + 1161766
commit 68688be
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -28,37 +28,39 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 end
 ```
 
-
-
 ## Auth Hash
 
 Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
 
 ```ruby
-{"provider"=>"twitch",
- "uid"=>12345678,
- "info"=>
- {"display_name"=>"johndoe",
- "name"=>"johndoe",
- "email"=>"johndoe@gmail.com",
- "bio"=>"My channel.",
- "logo"=>nil,
- "type"=>"user"},
- "credentials"=>{"token"=>"asdfghjklasdfghjklasdfghjkl", "expires"=>false},
- "extra"=>
- {"raw_info"=>
- {"display_name"=>"johndoe",
- "_id"=>12345678,
- "name"=>"johndoe",
- "type"=>"user",
- "bio"=>"My channel.",
- "created_at"=>"2011-07-01T19:46:21Z",
- "updated_at"=>"2014-05-06T05:59:37Z",
- "logo"=>nil,
- "_links"=>{"self"=>"https://api.twitch.tv/kraken/users/johndoe"},
- "email"=>"johdoe@gmail.com",
- "partnered"=>false
- }
+{
+ provider: 'twitch',
+ uid: 12345678,
+ info: {
+ name: 'JohnDoe',
+ email: 'johndoe@gmail.com',
+ nickname: 'johndoe',
+ description: 'My channel.',
+ image: 'http://static-cdn.jtvnw.net/jtv-static/404_preview-300x300.png',
+ },
+ credentials: {
+ token: 'asdfghjklasdfghjklasdfghjkl', # OAuth 2.0 access_token, which you may wish to store
+ expires: false # this will always be false
+ },
+ extra: {
+ raw_info: {
+ display_name: 'JohnDoe',
+ _id: 12345678,
+ name: 'johndoe',
+ type: 'user',
+ bio:"My channel.",
+ created_at:"2011-07-01T19:46:21Z",
+ updated_at:"2014-05-06T05:59:37Z",
+ logo:nil,
+ _links: { self: 'https://api.twitch.tv/kraken/users/johndoe'},
+ email:'johdoe@gmail.com',
+ partnered:false
+ }
  }
 }
 ```
diff --git a/lib/omniauth/strategies/twitch.rb b/lib/omniauth/strategies/twitch.rb
@@ -24,12 +24,12 @@ class Twitch < OmniAuth::Strategies::OAuth2
 
  info do
  {
- display_name: raw_info['display_name'],
- name: raw_info['name'],
+ name: raw_info['display_name'],
  email: raw_info['email'],
- bio: raw_info['bio'],
- logo: raw_info['logo'],
- type: raw_info['type']
+ nickname: raw_info['name'],
+ description: raw_info['bio'],
+ image: raw_info['logo'],
+ urls: { Twitch: "http://www.twitch.tv/#{raw_info['name']}" }
  }
  end
 

diff --git a/lib/omniauth/twitch/version.rb b/lib/omniauth/twitch/version.rb
@@ -1,5 +1,5 @@
 module OmniAuth
  module Twitch
- VERSION = "0.1.2"
+ VERSION = "0.2.0"
  end
 end