authlogic-connect 0.0.3.6 → 0.0.3.8

data/README.markdown

@@ -37,7 +37,7 @@ Rails 3: `Gemfile`
     
 ### 2b.  Add the `OpenIdAuthentication.store`
 
-Do to "some strange problem":http://github.com/openid/ruby-openid/issues#issue/1 I have yet to really understand, Rails 2.3.5 doesn't like when `OpenIdAuthentication.store` is null, which means it uses the "in memory" store and for some reason fails.
+Do to [some strange problem](http://github.com/openid/ruby-openid/issues#issue/1) I have yet to really understand, Rails 2.3.5 doesn't like when `OpenIdAuthentication.store` is null, which means it uses the "in memory" store and for some reason fails.
 
 So as a fix, add these at the end of your `config/environment.rb` files:
 
@@ -142,26 +142,37 @@ These are examples of what you can get from a User.  Code is placed in controlle
 
 User model has the following public accessors and methods.  This example assumes:
 
-# You've associated your Google, OpenID, and Twitter accounts with this app.
-# You're currently logged in via Google.
+- You've associated your Google, OpenID, and Twitter accounts with this app.
+- You're currently logged in via Google.
+
+Inside the `show` method in a controller...
 
     def show
       @user = @current_user
+      
       puts @user.tokens #=> [
         #<OpenidToken id: 12, user_id: 9, type: "OpenidToken", key: "http://my-openid-login.myopenid.com/", token: nil, secret: nil, active: nil, created_at: "2010-05-24 14:52:19", updated_at: "2010-05-24 14:52:19">,
         #<TwitterToken id: 13, user_id: 9, type: "TwitterToken", key: "my-twitter-id-123", token: "twitter-token", secret: "twitter-secret", active: nil, created_at: "2010-05-24 15:03:05", updated_at: "2010-05-24 15:03:05">,
         #<GoogleToken id: 14, user_id: 9, type: "GoogleToken", key: "my-email@gmail.com", token: "google-token", secret: "google-secret", active: nil, created_at: "2010-05-24 15:09:04", updated_at: "2010-05-24 15:09:04">]
+          
       puts @user.tokens.length #=> 3
+      
       # currently logged in with...
       puts @user.active_token #=> #<GoogleToken id: 14, user_id: 9, type: "GoogleToken", key: "my-email@gmail.com", token: "google-token", secret: "google-secret", active: nil, created_at: "2010-05-24 15:09:04", updated_at: "2010-05-24 15:09:04">
+        
       puts @user.authenticated_with #=> ["twitter", "openid", "google"]
       puts @user.authenticated_with?(:twitter) #=> true
       puts @user.authenticated_with?(:facebook) #=> false
+      
       puts @user.has_token?(:google) #=> true
+      
       puts @user.get_token(:google) #=> #<GoogleToken id: 14, user_id: 9, type: "GoogleToken", key: "my-email@gmail.com", token: "google-token", secret: "google-secret", active: nil, created_at: "2010-05-24 15:09:04", updated_at: "2010-05-24 15:09:04">
+      
       # change active_token
       @user.active_token = @user.get_token(:twitter)
       puts @user.active_token #=> #<TwitterToken id: 13, user_id: 9, type: "TwitterToken", key: "my-twitter-id-123", token: "twitter-token", secret: "twitter-secret", active: nil, created_at: "2010-05-24 15:03:05", updated_at: "2010-05-24 15:03:05">
+      
+      # access oauth api
       @twitter = @user.active_token
       @twitter_profile = JSON.parse(@twitter.get("/account/verify_credentials.json").body) #=> twitter api stuff
       # ...
@@ -173,7 +184,7 @@ If they've associated their Facebook account with your site, you can access Face
 
     def show
       @user = @current_user
-      token = @user.active_token
+      token = @user.active_token # assuming this is FacebookToken
       facebook = JSON.parse(token.get("/me"))
       @profile = {
         :id     => facebook["id"],
@@ -192,6 +203,10 @@ If they've associated their Facebook account with your site, you can access Face
 - Twitter
 - Facebook
 - Google
+- LinkedIn
+- MySpace
+- Vimeo
+- Yahoo
 
 ### OpenID
 

data/Rakefile

@@ -6,7 +6,7 @@ require 'rake/gempackagetask'
 spec = Gem::Specification.new do |s|
   s.name              = "authlogic-connect"
   s.author            = "Lance Pollard"
-  s.version           = "0.0.3.6"
+  s.version           = "0.0.3.8"
   s.summary           = "Authlogic Connect: Let your app use all of Oauth and OpenID"
   s.homepage          = "http://github.com/viatropos/authlogic-connect"
   s.email             = "lancejpollard@gmail.com"

data/lib/authlogic_connect/oauth/tokens/linked_in_token.rb

@@ -1,10 +1,19 @@
 # http://developer.linkedin.com/docs/DOC-1008
+# https://www.linkedin.com/secure/developer
 # http://github.com/pengwynn/linkedin/tree/master/lib/linked_in/
 class LinkedInToken < OauthToken
   
+  key do |access_token|
+    body = access_token.get("https://api.linkedin.com/v1/people/~:(id)").body
+    id = body.gsub("<id>([^><]+)</id>", "\\1") # so we don't need to also import nokogiri
+    id
+  end
+  
   settings "https://api.linkedin.com",
     :request_token_path => "/uas/oauth/requestToken",
     :access_token_path  => "/uas/oauth/accessToken",
-    :authorize_path     => "/uas/oauth/authorize"
+    :authorize_path     => "/uas/oauth/authorize",
+    :http_method        => "get",
+    :scheme             => :query_string
   
 end

data/lib/authlogic_connect/oauth/tokens/myspace_token.rb

@@ -1,11 +1,26 @@
 # http://wiki.developer.myspace.com/index.php?title=Category:MySpaceID
 # http://developerwiki.myspace.com/index.php?title=OAuth_REST_API_Usage_-_Authentication_Process
 # http://developerwiki.myspace.com/index.php?title=How_to_Set_Up_a_New_Application_for_OpenID
+# http://developer.myspace.com/Modules/Apps/Pages/ApplyDevSandbox.aspx
+# after you've signed up:
+# http://developer.myspace.com/modules/apps/pages/createappaccount.aspx
+# "Create a MySpaceID App"
+# http://developer.myspace.com/modules/apps/pages/editapp.aspx?appid=188312&mode=create
+# http://developer.myspace.com/Modules/APIs/Pages/OAuthTool.aspx
+# http://developer.myspace.com/Community/forums/p/3626/15947.aspx
 class MyspaceToken < OauthToken
   
+  # http://wiki.developer.myspace.com/index.php?title=Portable_Contacts_REST_Resources
+  key do |access_token|
+    body = JSON.parse(access_token.get("/v2/people/@me/@self?format=json").body)
+    id = body["entry"]["id"]
+  end
+  
   settings "http://api.myspace.com", 
     :request_token_path => "/request_token",
     :authorize_path     => "/authorize",
-    :access_token_path  => "/access_token"
+    :access_token_path  => "/access_token",
+    :http_method        => "get",
+    :scheme             => :query_string
   
 end

data/lib/authlogic_connect/oauth/tokens/oauth_token.rb

@@ -87,6 +87,9 @@ class OauthToken < Token
           else
             result[:key] = access.params[self.oauth_key] || access.params[self.oauth_key.to_s] # try both
           end
+        else
+          puts "Access Token: #{access.inspect}"
+          raise "please set an oauth key for #{service_name.to_s}"
         end
       else
         access = consumer.web_server.get_access_token(secret, :redirect_uri => redirect_uri)
@@ -103,7 +106,9 @@ class OauthToken < Token
         yield request if block_given?
         return request.authorize_url
       else
-        return consumer.web_server.authorize_url(:redirect_uri => callback_url, :scope => self.config[:scope])
+        options = {:redirect_uri => callback_url}
+        options[:scope] = self.config[:scope] unless self.config[:scope].blank?
+        return consumer.web_server.authorize_url(options)
       end
     end
     
@@ -111,8 +116,10 @@ class OauthToken < Token
       OAuth::RequestToken.new(consumer, token, secret)
     end
     
+    # if you pass a hash as the second parameter to consumer.get_request_token,
+    # ruby oauth will think this is a form and all sorts of bad things happen
     def get_request_token(callback_url)
-      consumer.get_request_token({:oauth_callback => callback_url}, config)
+      consumer.get_request_token(:oauth_callback => callback_url)
     end
     
     def get_access_token(oauth_verifier)

data/lib/authlogic_connect/oauth/tokens/vimeo_token.rb

@@ -1,8 +1,18 @@
 # http://www.vimeo.com/api/docs/oauth
 # http://www.vimeo.com/api/applications/new
+# http://vimeo.com/api/applications
 class VimeoToken < OauthToken
   
+  key do |access_token|
+    body = JSON.parse(access_token.get("http://vimeo.com/api/v2/#{access_token.token}/info.json"))
+    user_id = body.first["id"]
+  end
+  
   settings "http://vimeo.com",
-    :authorize_url => "http://vimeo.com/oauth/authorize"
+    :request_token_path => "/oauth/request_token",
+    :authorize_path     => "/oauth/authorize",
+    :access_token_path  => "/oauth/access_token",
+    :http_method        => "get",
+    :scheme             => :query_string
   
 end

data/lib/authlogic_connect/oauth/tokens/yahoo_token.rb

@@ -1,12 +1,19 @@
 # https://developer.apps.yahoo.com/dashboard/createKey.html
+# https://developer.apps.yahoo.com/projects
 # http://developer.yahoo.com/oauth/guide/oauth-accesstoken.html
+# http://developer.yahoo.com/oauth/guide/oauth-auth-flow.html
+# http://code.google.com/apis/gadgets/docs/oauth.html
+# http://developer.yahoo.com/social/rest_api_guide/web-services-guids.html
+# A GUID identifies a person
+# http://social.yahooapis.com/v1/me/guid
 class YahooToken < OauthToken
   
-  version 2
+  # http://social.yahooapis.com/v1/me/guid
+  key :xoauth_yahoo_guid
   
   settings "https://api.login.yahoo.com",
     :request_token_path => '/oauth/v2/get_request_token',
     :access_token_path  => '/oauth/v2/get_token',
     :authorize_path     => '/oauth/v2/request_auth'
   
-end
+end

data/lib/authlogic_connect/token.rb

@@ -40,6 +40,7 @@ class Token < ActiveRecord::Base
     
     def config
       @settings ||= {}
+      @settings.dup
     end
     
     protected

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - 3
-  - 6
-  version: 0.0.3.6
+  - 8
+  version: 0.0.3.8
 platform: ruby
 authors: 
 - Lance Pollard
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-26 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency