vidibus-user 0.0.2 → 0.0.3

data/README.rdoc

@@ -6,6 +6,7 @@ This gem is part of the open source SOA framework Vidibus: vidibus.org.
 
 It is far from being complete, but this will change soon.
 
+
 == Installation
 
 Add the dependency to the Gemfile of your application:
@@ -15,6 +16,17 @@ Add the dependency to the Gemfile of your application:
 Then call bundle install on your console.
 
 
+== Obtaining user data
+
+After authorization via OAuth this gem requests user data from providing service. It will call the following route:
+
+  /oauth/user
+
+It expects JSON data to be returned. The dataset must at least include the user's uuid.
+
+The vidibus-oauth2_server gem will provide a controller for this task.
+
+
 == Dependencies
 
 In order to perform authentication, this gem depends on services provided by the vidibus-service gem.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/vidibus/user/warden_strategy.rb

@@ -41,20 +41,28 @@ Warden::Strategies.add(:connector) do
   def authenticate!
     code = params["code"]
     redirect_url = "#{host}/authenticate_user"
+    args = { :redirect_url => redirect_url }
 
     # Fetch code first
-    args = { :redirect_url => redirect_url }
     return redirect!(client.web_server.authorize_url(args)) unless code
 
-    # Exchange code for token and fetch user data
+    # Exchange code for token
     access_token = client.web_server.get_access_token(code, :redirect_url => redirect_url)
-    user_data = JSON.parse(access_token.get("/oauth/user"))
 
-    unless user = User.where(:email => user_data["email"]).first
-      unless user = User.create(user_data)
-        raise "user.errors = #{user.errors.inspect}"
+    # Try to fetch user data
+    begin
+      response = access_token.get("/oauth/user")
+      user_data = JSON.parse(response)
+      unless user = User.where(:uuid => user_data["uuid"]).first
+        unless user = User.create(user_data)
+          raise "user.errors = #{user.errors.inspect}"
+        end
       end
+    rescue OAuth2::HTTPError
+      Rails.logger.error "Failed to fetch user data from #{credentials[:service_url]}/oauth/user"
+      user = true
     end
+
     success!(user)
   rescue OAuth2::HTTPError => e
     raise e.response.body

data/vidibus-user.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vidibus-user}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Andre Pankratz"]
-  s.date = %q{2011-01-03}
+  s.date = %q{2011-01-14}
   s.description = %q{Provides single sign-on and a local user model.}
   s.email = %q{andre@vidibus.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vidibus-user
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Andre Pankratz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-03 00:00:00 +01:00
+date: 2011-01-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency