Merge pull request #417 from tomtaylor/master

Added Flickr OAuth provider

oa-more/lib/omniauth/more.rb

@@ -3,7 +3,6 @@
 module OmniAuth
   module Strategies
     autoload :WindowsLive, 'omniauth/strategies/windows_live'
-    autoload :Flickr, 'omniauth/strategies/flickr'
     autoload :LastFm, 'omniauth/strategies/last_fm'
     autoload :Yupoo, 'omniauth/strategies/yupoo'
     autoload :Ign, 'omniauth/strategies/ign'

oa-oauth/lib/omniauth/oauth.rb

@@ -9,6 +9,7 @@ module Strategies
     autoload :Dropbox,            'omniauth/strategies/oauth/dropbox'
     autoload :Evernote,           'omniauth/strategies/oauth/evernote'
     autoload :Flattr,             'omniauth/strategies/oauth/flattr'    
+    autoload :Flickr,             'omniauth/strategies/oauth/flickr'    
     autoload :Goodreads,          'omniauth/strategies/oauth/goodreads'
     autoload :Google,             'omniauth/strategies/oauth/google'
     autoload :GoogleHealth,       'omniauth/strategies/oauth/google_health'

oa-oauth/lib/omniauth/strategies/oauth/flickr.rb

@@ -0,0 +1,39 @@
+require 'omniauth/oauth'
+require 'multi_json'
+
+module OmniAuth
+  module Strategies
+
+    class Flickr < OmniAuth::Strategies::OAuth
+      def initialize(app, consumer_key=nil, consumer_secret=nil, options={}, &block)
+        scope = options.delete(:scope) || 'read'
+        options[:authorize_params] ||= {}
+        options[:authorize_params][:perms] = scope
+
+        client_options = {
+          :access_token_path => "/services/oauth/access_token",
+          :authorize_path => "/services/oauth/authorize",
+          :request_token_path => "/services/oauth/request_token",
+          :site => "http://www.flickr.com"
+        }
+        super(app, :flickr, consumer_key, consumer_secret, client_options, options, &block)
+      end
+
+      def auth_hash
+        OmniAuth::Utils.deep_merge(
+          super, {
+            'uid' => @access_token.params["user_nsid"],
+            'user_info' => user_info
+          }
+        )
+      end
+
+      def user_info
+        {
+          'username' => @access_token.params["username"],
+          'full_name' => @access_token.params["fullname"]
+        }
+      end
+    end
+  end
+end

oa-oauth/spec/omniauth/strategies/oauth/flickr_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Flickr do
+  it_should_behave_like "an oauth strategy"
+end
+