omniauth 0.2.5 → 0.2.6

data/oa-more/lib/omniauth/strategies/draugiem.rb

@@ -0,0 +1,104 @@
+require 'omniauth/core'
+require 'digest/md5'
+require 'rest-client'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to draugiem.lv and frype.com and others.
+    #
+    # @example Basic Rails Usage
+    #
+    #  Add this to config/initializers/omniauth.rb
+    #
+    #    Rails.application.config.middleware.use OmniAuth::Builder do
+    #      provider :draugiem, 'App id', 'API Key'
+    #    end
+    #
+    # @example Basic Rack example
+    #
+    #  use Rack::Session::Cookie
+    #  use OmniAuth::Strategies::Draugiem, 'App id', 'API Key'
+    #
+    class Draugiem
+      include OmniAuth::Strategy
+      attr_accessor :app_id, :api_key
+
+      def initialize(app, app_id, api_key)
+        super(app, :draugiem)
+        @app_id   = app_id
+        @api_key  = api_key
+      end
+
+      protected
+
+      def request_phase
+        params = {
+          :app => @app_id,
+          :redirect => callback_url,
+          :hash => Digest::MD5.hexdigest("#{@api_key}#{callback_url}")
+        }
+        query_string = params.collect{ |key,value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
+        redirect "http://api.draugiem.lv/authorize/?#{query_string}"
+      end
+
+      def callback_phase
+        if request.params['dr_auth_status'] == 'ok' && request.params['dr_auth_code']
+          response = RestClient.get('http://api.draugiem.lv/json/', { :params => draugiem_authorize_params(request.params['dr_auth_code']) })
+          auth = MultiJson.decode(response.to_s)
+          unless auth['error']
+            @auth_data = auth
+            super
+          else
+            fail!(auth['error']['code'].to_s,auth["error"]["description"].to_s)
+          end
+        else
+          fail!(:invalid_request)
+        end
+      rescue Exception => e
+        fail!(:invalid_response, e)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => @auth_data['uid'],
+          'user_info' => get_user_info,
+          'credentials' => {
+            'apikey' => @auth_data['apikey']
+          },
+          'extra' => { 'user_hash' => @auth_data }
+        })
+      end
+
+      private
+
+      def get_user_info
+        if @auth_data['users'] && @auth_data['users'][@auth_data['uid']]
+          user = @auth_data['users'][@auth_data['uid']]
+          {
+            'name' => "#{user['name']} #{user['surname']}",
+            'nickname' => user['nick'],
+            'first_name' => user['name'],
+            'last_name' => user['surname'],
+            'location' => user['place'],
+            'age' => user['age'] =~ /^0-9$/ ? user['age'] : nil,
+            'adult' => user['adult'] == '1' ? true : false,
+            'image' => user['img'],
+            'sex' => user['sex']
+          }
+        else
+          {}
+        end
+      end
+
+      def draugiem_authorize_params code
+        {
+          :action => 'authorize',
+          :app => @api_key,
+          :code => code
+        }
+      end
+    end
+  end
+end

data/oa-more/lib/omniauth/strategies/ign.rb

@@ -0,0 +1,93 @@
+require 'omniauth/core'
+require 'openssl'
+
+module OmniAuth
+  module Strategies
+    class Ign
+      include OmniAuth::Strategy
+      IDENTIFIER_URL_PARAMETER = ""
+
+      class CallbackError < StandardError
+        attr_accessor :error, :error_reason
+        def initialize(error, error_reason)
+          self.error = error
+          self.error_reason = error_reason
+        end
+      end
+
+      def initialize(app, api_key, hostname=nil, options = {})
+        options[:name] ||= "ign"
+        super(app, :ign)
+        @api_key = api_key
+        @hostname = hostname
+      end
+
+      protected
+
+      def request_phase
+        OmniAuth::Form.build(:title => 'IGN Authentication', :header_info=>js) do
+          label_field('Identifying you with the IGN server', IDENTIFIER_URL_PARAMETER)
+        end.to_response
+      end
+
+      def callback_phase
+        signature = OpenSSL::HMAC.hexdigest('sha1', @api_key, ("#{request.params["username"]}::#{request.params["timestamp"]}"))
+
+        raise CallbackError.new("Invalid Signature","The supplied and calculated signature did not match, user not approved.") if signature != request.params["signature"]
+
+        super
+      rescue CallbackError => e
+        fail!(:invalid_response, e)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => "ign-" + request.params["username"],
+          'credentials' => { 'token' => request.params["signature"] },
+          'user_info' => user_info,
+          'extra' => { 'user_hash' => request.params }
+        })
+      end
+
+      def user_info
+        {
+          'nickname' => request.params["username"],
+        }
+      end
+
+    def js
+      @js = <<-JS
+     $(document).ready(function() {
+      $.ajax({
+        url: "http://#{@hostname}/users/current.json?callback=z33k",
+        type: "get",
+        dataType:"jsonp",
+        success: function(data) {
+          if(typeof data.error == 'undefined'){
+            // There is a current My IGN user
+            var username  = data.my_ign_username;
+            var signature   = data.signature;
+            var timestamp   = data.timestamp;
+            window.location = "/auth/ign/callback?username=" +username+"&signature="+signature+"&timestamp=" + timestamp;
+          }
+          else{
+            nouser();
+          }
+        }
+      });
+      return false;
+    });
+    function nouser() {
+      var url = "http://my.ign.com/login?r="+window.location;
+      top.location = url;
+      window.location = url;
+    }
+    JS
+      "\n<script src='https://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js' type='text/javascript'></script>" +
+      "\n<script type='text/javascript'>#{@js}</script>" +
+      "\n<style type='text/css'>button {visibility:hidden;}</style>"
+    end
+
+    end
+  end
+end

data/oa-more/lib/omniauth/strategies/yupoo.rb

@@ -8,7 +8,7 @@ module OmniAuth
     class Yupoo
       include OmniAuth::Strategy
       attr_accessor :api_key, :secret_key, :options
-      
+
 
       class CallbackError < StandardError
         attr_accessor :error, :error_reason
@@ -26,30 +26,30 @@ module OmniAuth
       end
 
       protected
-      
+
       def request_phase
         params = { :api_key => api_key, :perms => options[:scope] }
         params[:api_sig] = yupoo_sign(params)
         query_string = params.collect{ |key,value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
         redirect "http://www.yupoo.com/services/auth/?#{query_string}"
       end
-      
+
       def callback_phase
         params = { :api_key => api_key, :method => 'yupoo.auth.getToken', :frob => request.params['frob'], :format => 'json', :nojsoncallback => '1' }
         params[:api_sig] = yupoo_sign(params)
-        
+
         response = RestClient.get('http://www.yupoo.com/api/rest/', { :params => params })
         auth = MultiJson.decode(response.to_s)
         raise CallbackError.new(auth['code'],auth['message']) if auth['stat'] == 'fail'
-        
+
         @user = auth['auth']['user']
         @access_token = auth['auth']['token']['_content']
-        
+
         super
       rescue CallbackError => e
         fail!(:invalid_response, e)
       end
-      
+
       def auth_hash
         OmniAuth::Utils.deep_merge(super, {
           'uid' => @user['nsid'],
@@ -58,7 +58,7 @@ module OmniAuth
           'extra' => { 'user_hash' => @user }
         })
       end
-      
+
       def yupoo_sign(params)
         Digest::MD5.hexdigest(secret_key + params.sort{|a,b| a[0].to_s <=> b[0].to_s }.flatten.join)
       end

data/oa-more/lib/omniauth/version.rb

@@ -7,7 +7,7 @@ module OmniAuth
       MINOR = 2
     end
     unless defined?(::OmniAuth::Version::PATCH)
-      PATCH = 5
+      PATCH = 6
     end
     unless defined?(::OmniAuth::Version::PRE)
       PRE   = nil

data/oa-more/oa-more.gemspec

@@ -2,7 +2,6 @@
 require File.expand_path('../lib/omniauth/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'jruby-openssl', '~> 0.7.3' if RUBY_PLATFORM == 'java'
   gem.add_runtime_dependency 'multi_json',   '~> 1.0.0'
   gem.add_runtime_dependency 'oa-core', OmniAuth::Version::STRING
   gem.add_runtime_dependency 'rest-client',  '~> 1.6.0'
@@ -13,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 2.5'
   gem.add_development_dependency 'simplecov', '~> 0.4'
   gem.add_development_dependency 'webmock', '~> 1.6'
-  gem.add_development_dependency 'yard', '~> 0.6'
+  gem.add_development_dependency 'yard', '~> 0.7'
   gem.add_development_dependency 'ZenTest', '~> 4.5'
   gem.name = 'oa-more'
   gem.version = OmniAuth::Version::STRING

data/oa-more/spec/omniauth/strategies/draugiem_spec.rb

@@ -0,0 +1,51 @@
+require File.expand_path('../../../spec_helper', __FILE__)
+
+describe 'OmniAuth::Strategies::Draugiem', :type => :strategy do
+
+  include OmniAuth::Test::StrategyTestCase
+
+  def strategy
+   [OmniAuth::Strategies::Draugiem, '123', "abc"]
+  end
+
+  it 'should initialize with api key and app id' do
+    lambda{OmniAuth::Strategies::Draugiem.new({},'123','abc')}.should_not raise_error
+  end
+
+  describe '/auth/draugiem' do
+
+    it 'should redirect to api.draugiem.lv' do
+      get '/auth/draugiem'
+      last_response.should be_redirect
+      last_response.headers['Location'].should match %r{http://api\.draugiem\.lv/authorize/}
+    end
+
+    it 'should gather user data after success authorization' do
+        stub_request(:get, "http://api.draugiem.lv/json/?action=authorize&app=abc&code=123456").
+        to_return(:body => MultiJson.encode({
+          'apikey'=>"123456789",
+          'uid'=>"100",
+          'language'=>"lv",
+          'users'=>{
+            '100'=>{
+              'uid'=>"100",
+              'name'=>"John",
+              'surname'=>"Lenon",
+              'nick'=>"johnybravo",
+              'place'=>"Durbe",
+              'age'=>"false",
+              'adult'=>"1",
+              'img'=>"http://4.bp.blogspot.com/_ZmXOoYjxXog/Sg2jby1RFSI/AAAAAAAAE_Q/1LpfjimAz50/s400/JohnnyBravo3.gif",
+              'sex'=>"M"
+            }
+          }
+        }))
+        get '/auth/draugiem/callback?dr_auth_status=ok&dr_auth_code=123456'
+
+        last_request.env['omniauth.auth']['credentials']['apikey'].should == "123456789"
+        last_request.env['omniauth.auth']['user_info']['location'].should == "Durbe"
+        last_request.env['omniauth.auth']['user_info']['age'].should be_nil
+        last_request.env['omniauth.auth']['user_info']['adult'].should be_true
+    end
+  end
+end

data/oa-more/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'rack/test'
 require 'webmock/rspec'
 require 'omniauth/more'
 
-Rspec.configure do |config|
+RSpec.configure do |config|
   config.include Rack::Test::Methods
   config.include WebMock::API
 end

data/oa-oauth/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+platforms :jruby do
+  gem 'jruby-openssl', '~> 0.7'
+end
+
+gemspec

data/oa-oauth/lib/omniauth/oauth.rb

@@ -28,12 +28,14 @@ module OmniAuth
     autoload :Mixi,               'omniauth/strategies/mixi'
     autoload :Netflix,            'omniauth/strategies/netflix'
     autoload :Qzone,              'omniauth/strategies/qzone'
+    autoload :Plurk,              'omniauth/strategies/plurk'
     autoload :Rdio,               'omniauth/strategies/rdio'
     autoload :Renren,             'omniauth/strategies/renren'
     autoload :Salesforce,         'omniauth/strategies/salesforce'
     autoload :SmugMug,            'omniauth/strategies/smug_mug'
     autoload :SoundCloud,         'omniauth/strategies/sound_cloud'
     autoload :T163,               'omniauth/strategies/t163'
+    autoload :TB,               'omniauth/strategies/taobao'
     autoload :Teambox,            'omniauth/strategies/teambox'
     autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
     autoload :Tqq,                'omniauth/strategies/tqq'
@@ -49,5 +51,6 @@ module OmniAuth
     autoload :Yahoo,              'omniauth/strategies/yahoo'
     autoload :Yammer,             'omniauth/strategies/yammer'
     autoload :YouTube,            'omniauth/strategies/you_tube'
+    autoload :Mailru,             'omniauth/strategies/mailru'
   end
 end

data/oa-oauth/lib/omniauth/strategies/facebook.rb

@@ -45,7 +45,7 @@ module OmniAuth
 
       def user_info
         {
-          'nickname' => user_data["link"].split('/').last,
+          'nickname' => user_data["username"],
           'email' => (user_data["email"] if user_data["email"]),
           'first_name' => user_data["first_name"],
           'last_name' => user_data["last_name"],

data/oa-oauth/lib/omniauth/strategies/google.rb

@@ -20,9 +20,9 @@ module OmniAuth
           :authorize_path => '/accounts/OAuthAuthorizeToken'
         }
 
-        google_contacts_auth = "http://www.google.com/m8/feeds"
+        google_contacts_auth = "www.google.com/m8/feeds"
         options[:scope] ||= google_contacts_auth
-        options[:scope] << " #{google_contacts_auth}" unless options[:scope].include?(google_contacts_auth)
+        options[:scope] << " http://#{google_contacts_auth}" unless options[:scope] =~ %r[http[s]?:\/\/#{google_contacts_auth}]
 
         super(app, :google, consumer_key, consumer_secret, client_options, options)
       end

data/oa-oauth/lib/omniauth/strategies/gowalla.rb

@@ -30,6 +30,14 @@ module OmniAuth
         @data ||= MultiJson.decode(@access_token.get("/users/me.json"))
       end
 
+      def refresh_token
+        @refresh_token ||= @access_token.refresh_token
+      end
+
+      def token_expires_at
+        @expires_at ||= @access_token.expires_at
+      end
+
       def request_phase
         options[:scope] ||= "read"
         super
@@ -56,7 +64,7 @@ module OmniAuth
         OmniAuth::Utils.deep_merge(super, {
           'uid' => user_data["url"].split('/').last,
           'user_info' => user_info,
-          'extra' => {'user_hash' => user_data}
+          'extra' => {'user_hash' => user_data, 'refresh_token' => refresh_token, 'token_expires_at' => token_expires_at}
         })
       end
     end

data/oa-oauth/lib/omniauth/strategies/linked_in.rb

@@ -28,26 +28,27 @@ module OmniAuth
       end
 
       def user_hash(access_token)
-        person = MulitXml.parse(@access_token.get('/v1/people/~:(id,first-name,last-name,headline,member-url-resources,picture-url,location,public-profile-url)').body).xpath('person')
+       person = MultiXml.parse(@access_token.get('/v1/people/~:(id,first-name,last-name,headline,member-url-resources,picture-url,location,public-profile-url)').body)['person']
 
         hash = {
-          'id' => person.xpath('id').text,
-          'first_name' => person.xpath('first-name').text,
-          'last_name' => person.xpath('last-name').text,
-          'nickname' => person.xpath('public-profile-url').text.split('/').last,
-          'location' => person.xpath('location/name').text,
-          'image' => person.xpath('picture-url').text,
-          'description' => person.xpath('headline').text,
-          'public_profile_url' => person.xpath('public-profile-url').text,
-          'urls' => person.css('member-url-resources member-url').inject({}) do |h,element|
-            h[element.xpath('name').text] = element.xpath('url').text
-            h
-          end
+          'id' => person['id'],
+          'first_name' => person['first_name'],
+          'last_name' => person['last_name'],
+          'nickname' => person['public_profile_url'].split('/').last,
+          'location' => person['location']['name'],
+          'image' => person['picture_url'],
+          'description' => person['headline'],
+          'public_profile_url' => person['public_profile_url']
         }
-
-        hash['urls']['LinkedIn'] = person.xpath('public-profile-url').text
+        hash['urls']={}
+        member_urls = person['member_url_resources']['member_url']
+        if (!member_urls.nil?) and (!member_urls.empty?)
+          [member_urls].flatten.each do |url|
+            hash['urls']["#{url['name']}"]=url['url']
+          end
+        end
+        hash['urls']['LinkedIn'] = person['public_profile_url']
         hash['name'] = "#{hash['first_name']} #{hash['last_name']}"
-
         hash
       end
     end