omniauth-youtube 1.0 → 2.1

data/.gitignore

@@ -1 +1,3 @@
 .DS_Store
+*.gem
+Gemfile.lock

data/Gemfile

@@ -0,0 +1,2 @@
+source "http://rubygems.org"
+gemspec

data/README.md

@@ -3,30 +3,54 @@ OmniAuth YouTube
 
 This is an [OmniAuth 1.0](https://github.com/intridea/omniauth) strategy for authenticating to YouTube.
 
-Get a YouTube API key on their [developer dashboard](http://code.google.com/apis/youtube/dashboard/)
+Get a Google Oauth2.0 API key at their [API console](https://code.google.com/apis/console/)
 
-An example Rails application using omniauth is also available:
+Your key (AKA client_id) looks like "555555555555.apps.googleusercontent.com"; a longer key like "555555555-xxxxyyyzzz"
+won't work. See [this issue](https://github.com/zquestz/omniauth-google-oauth2/issues/10#issuecomment-5720475) for discussion.
+
+An example Rails 3.2 application using omniauth and omniauth-youtube is also available:
 <https://github.com/jamiew/omniauth-rails-app>
 
 
 Usage
 -----
 
-In a rack application:
+In a Rack application:
 
 ```ruby
 use OmniAuth::Builder do
-  provider :youtube, ENV['YOUTUBE_KEY'], ENV['YOUTUBE_SECRET']
+  provider :youtube, ENV['YOUTUBE_KEY'], ENV['YOUTUBE_SECRET'], {:access_type => 'online', :approval_prompt => ''}
 end
+```
 
 For Rails, put this in `config/initializers/omniauth.rb`:
 
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :youtube, ENV['YOUTUBE_KEY'], ENV['YOUTUBE_SECRET']
+  provider :youtube, ENV['YOUTUBE_KEY'], ENV['YOUTUBE_SECRET'], {:access_type => 'online', :approval_prompt => ''}
 end
 ```
 
+Restart your server and visit */auth/youtube* to try it out
+
+Options
+-------
+
+Re. :access_type and :approval_prompt, via (omniauth-google-oauth2)[https://github.com/zquestz/omniauth-google-oauth2/blob/master/examples/omni_auth.rb]:
+
+If you don't need a refresh token -- if you're only using Google for account creation/auth and don't need google services -- set the access_type to 'online', vs. 'offline'
+Also, set the approval prompt to an empty string, since otherwise it will be set to 'force', which makes users manually approve to the Oauth every time they log in.
+See <http://googleappsdeveloper.blogspot.com/2011/10/upcoming-changes-to-oauth-20-endpoint.html>
+
+
+
+Authors
+-------
+
+* [Jamie Wilkinson (@jamiew)](https://github.com/jamiew)
+* [@tarko](https://github.com/tarko)
+* [Simon Gate (@simon)](https://github.com/simon)
+
 
 License
 -------

data/lib/omniauth-youtube/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module YouTube
-    VERSION = "1.0"
+    VERSION = "2.1"
   end
 end

data/lib/omniauth/strategies/youtube.rb

@@ -1,34 +1,36 @@
-require 'omniauth-oauth'
+require 'omniauth-oauth2'
 require 'multi_json'
 
 module OmniAuth
   module Strategies
-    class YouTube < OmniAuth::Strategies::OAuth
+    class YouTube < OmniAuth::Strategies::OAuth2
+
       option :name, 'youtube'
+
       option :client_options, {
-        :site => 'https://www.google.com',
-        :request_token_path => '/accounts/OAuthGetRequestToken',
-        :access_token_path => '/accounts/OAuthGetAccessToken',
-        :authorize_path => '/accounts/OAuthAuthorizeToken',
+        :site => 'https://www.youtube.com',
+        :authorize_url => 'https://accounts.google.com/o/oauth2/auth',
+        :token_url => 'https://accounts.google.com/o/oauth2/token'
       }
 
-      # For the time being this option requires a fork of omniauth-oauth:
-      # http://github.com/jamiew/omniauth-oauth
-      option :request_params, {
-        :scope => 'http://gdata.youtube.com'
+      option :authorize_params, {
+        :scope => 'http://gdata.youtube.com https://www.googleapis.com/auth/userinfo.email'
       }
 
-      uid { user['id'] }
+      uid { user['id']['$t'] }
 
       info do
         {
           'uid' => user['id']['$t'],
           'nickname' => user['author'].first['name']['$t'],
+          'email'      => verified_email,
           'first_name' => user['yt$firstName'] && user['yt$firstName']['$t'],
           'last_name' => user['yt$lastName'] && user['yt$lastName']['$t'],
           'image' => user['media$thumbnail'] && user['media$thumbnail']['url'],
           'description' => user['yt$description'] && user['yt$description']['$t'],
-          'location' => user['yt$location'] && user['yt$location']['$t']
+          'location' => user['yt$location'] && user['yt$location']['$t'],
+          'channel_title' => user['title']['$t'],
+          'subscribers_count' => user['yt$statistics']['subscriberCount']
         }
       end
 
@@ -44,6 +46,16 @@ module OmniAuth
         @user_hash ||= MultiJson.decode(@access_token.get("http://gdata.youtube.com/feeds/api/users/default?alt=json").body)
       end
 
+      def user_info
+        @raw_info ||= @access_token.get('https://www.googleapis.com/oauth2/v1/userinfo').parsed
+      end
+
+      private
+
+      def verified_email
+        user_info['verified_email'] ? user_info['email'] : nil
+      end
+
     end
   end
 end

data/omniauth-youtube.gemspec

@@ -5,10 +5,10 @@ require "omniauth-youtube/version"
 Gem::Specification.new do |gem|
   gem.name        = "omniauth-youtube"
   gem.version     = Omniauth::YouTube::VERSION
-  gem.authors     = ["Benjamin Fritsch"]
-  gem.email       = ["ben@lomography.com"]
-  gem.homepage    = "https://github.com/lomography/omniauth-youtube"
-  gem.description = %q{OmniAuth strategy for YouTube}
+  gem.authors     = ["Jamie Wilkinson"]
+  gem.email       = ["jamie@jamiedubs.com"]
+  gem.homepage    = "https://github.com/jamiew/omniauth-youtube"
+  gem.description = %q{OmniAuth strategy for YouTube (OAuth 2.0)}
   gem.summary     = gem.description
 
   gem.files         = `git ls-files`.split("\n")
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  gem.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
+  gem.add_runtime_dependency 'omniauth-oauth2', '~> 1.0'
 
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
 end

metadata

@@ -1,88 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: omniauth-youtube
-version: !ruby/object:Gem::Version 
-  hash: 15
+version: !ruby/object:Gem::Version
+  version: '2.1'
   prerelease: 
-  segments: 
-  - 1
-  - 0
-  version: "1.0"
 platform: ruby
-authors: 
-- Benjamin Fritsch
+authors:
+- Jamie Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-30 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: omniauth-oauth
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-08-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: omniauth-oauth2
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-description: OmniAuth strategy for YouTube
-email: 
-- ben@lomography.com
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: OmniAuth strategy for YouTube (OAuth 2.0)
+email:
+- jamie@jamiedubs.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- Gemfile
 - README.md
 - lib/omniauth-youtube.rb
 - lib/omniauth-youtube/version.rb
 - lib/omniauth/strategies/youtube.rb
 - omniauth-youtube.gemspec
-has_rdoc: true
-homepage: https://github.com/lomography/omniauth-youtube
+homepage: https://github.com/jamiew/omniauth-youtube
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: OmniAuth strategy for YouTube
+summary: OmniAuth strategy for YouTube (OAuth 2.0)
 test_files: []
-
+has_rdoc: