oa-oauth 0.1.3 → 0.1.4

data/lib/omniauth/oauth.rb

@@ -12,5 +12,6 @@ module OmniAuth
     autoload :ThirtySevenSignals, 'omniauth/strategies/thirty_seven_signals'
     autoload :Foursquare,         'omniauth/strategies/foursquare'
     autoload :Gowalla,            'omniauth/strategies/gowalla'
+    autoload :Identica,           'omniauth/strategies/identica'
   end
 end

data/lib/omniauth/strategies/facebook.rb

@@ -24,9 +24,9 @@ module OmniAuth
         @data ||= MultiJson.decode(@access_token.get('/me'))
       end
       
-      def request_phase(options = {})
+      def request_phase
         options[:scope] ||= "email,offline_access"
-        super(options)
+        super
       end
       
       def user_info

data/lib/omniauth/strategies/gowalla.rb

@@ -26,9 +26,9 @@ module OmniAuth
         @data ||= MultiJson.decode(@access_token.get("/users/me.json"))
       end
       
-      def request_phase(options = {})
+      def request_phase
         options[:scope] ||= "email,offline_access"
-        super(options)
+        super
       end
       
       def user_info

data/lib/omniauth/strategies/identica.rb

@@ -0,0 +1,49 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+    #
+    # Authenticate to Identica via OAuth and retrieve basic
+    # user information.
+    #
+    # Usage:
+    #
+    #    use OmniAuth::Strategies::Identica, 'consumerkey', 'consumersecret'
+    #
+    class Identica < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key, consumer_secret)
+        super(app, :identica, consumer_key, consumer_secret,
+                :site => 'http://identi.ca',
+                :request_token_path => "/api/oauth/request_token",
+                :access_token_path  => "/api/oauth/access_token",
+                :authorize_path     => "/api/oauth/authorize")
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(super, {
+          'uid' => @access_token.params[:user_id],
+          'user_info' => user_info,
+          'extra' => {'user_hash' => user_hash}
+        })
+      end
+
+      def user_info
+        user_hash = self.user_hash
+
+        {
+          'nickname' => user_hash['screen_name'],
+          'name' => user_hash['name'],
+          'location' => user_hash['location'],
+          'image' => user_hash['profile_image_url'],
+          'description' => user_hash['description'],
+          'urls' => {'Website' => user_hash['url']}
+        }
+      end
+
+      def user_hash
+        @user_hash ||= MultiJson.decode(@access_token.get('/api/account/verify_credentials.json').body)
+      end
+    end
+  end
+end

data/lib/omniauth/strategies/oauth2.rb

@@ -8,25 +8,39 @@ module OmniAuth
     class OAuth2
       include OmniAuth::Strategy
       
+      attr_accessor :options, :client
+      
+      class CallbackError < StandardError
+        attr_accessor :error, :error_reason, :error_uri
+        
+        def initialize(error, error_reason=nil, error_uri=nil)
+          self.error = error
+          self.error_reason = error_reason
+          self.error_uri = error_uri
+        end
+      end
+      
       def initialize(app, name, client_id, client_secret, options = {})
         super(app, name)
-        @options = options
-        @client = ::OAuth2::Client.new(client_id, client_secret, options)
+        self.options = options
+        self.client = ::OAuth2::Client.new(client_id, client_secret, options)
       end
       
       protected
-      
-      attr_accessor :client
-      
-      def request_phase(options = {})
+        
+      def request_phase
         redirect client.web_server.authorize_url({:redirect_uri => callback_url}.merge(options))
       end
       
       def callback_phase
+        if request.params['error']
+          raise CallbackError.new(request.params['error'], request.params['error_description'] || request.params['error_reason'], request.params['error_uri'])
+        end
+        
         verifier = request.params['code']
         @access_token = client.web_server.get_access_token(verifier, :redirect_uri => callback_url)
         super
-      rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied => e
+      rescue ::OAuth2::HTTPError, ::OAuth2::AccessDenied, CallbackError => e
         fail!(:invalid_credentials, e)
       end
       

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oa-oauth
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 -05:00
+date: 2010-10-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,12 +24,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 4
+        version: 0.1.4
   requirement: *id001
   name: oa-core
   prerelease: false
@@ -206,6 +206,7 @@ files:
 - lib/omniauth/strategies/foursquare.rb
 - lib/omniauth/strategies/github.rb
 - lib/omniauth/strategies/gowalla.rb
+- lib/omniauth/strategies/identica.rb
 - lib/omniauth/strategies/linked_in.rb
 - lib/omniauth/strategies/oauth.rb
 - lib/omniauth/strategies/oauth2.rb