exvo-auth 0.10.4 → 0.11.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    exvo-auth (0.10.3)
+    exvo-auth (0.11.0)
       actionpack (~> 3.0.0)
       activemodel (~> 3.0.0)
       httparty (~> 0.6.1)

data/README

@@ -44,13 +44,7 @@ Sample implementation (Rails):
 
 class SessionsController < ApplicationController
   def create
-    auth = params[:auth] # sometimes you will need to do this: request.env["rack.request.query_hash"]["auth"]
-    user = User.find_or_create_by_uid(auth["uid"])
-    
-    user_info = auth["user_info"]
-    user.update_attributes!(user_info)
-    
-    sign_in_and_redirect!(user.id)
+    sign_in_and_redirect!
   end
   
   def destroy
@@ -61,11 +55,19 @@ class SessionsController < ApplicationController
     render :text => "Sorry!"
   end
 end
+
+
+6. Implement #find_or_create_user_by_uid(uid) in your Application Controller.
+
+This method will be called by #current_user. Previously we did this in sessions_controller but since the sharing sessions changes this controller
+will not be used in most cases because the session comes from another app through a shared cookie. This method should find user by uid or create it. 
+Additional info (emails, etc) can be obtained using auth api (/users/uid.json path).
+
   
 In short: you get params[:auth]. Do what you want to do with it: store the data, create session, etc.
 
 
-6. Sign up and sign in paths for use in links.
+7. Sign up and sign in paths for use in links.
 
 sign in path:                       "/auth/interactive"
 sign up path:                       "/auth/interactive?x_sign_up=true" # this is OAuth2 custom param
@@ -74,7 +76,7 @@ sign in path with a return address: "/auth/interactive?state=url"      # using O
 You have a handy methods available in controllers (and views in Rails): sign_in_path and sign_up_path.
 
 
-7. Read the source, there are few features not mentioned in this README.
+8. Read the source, there are few features not mentioned in this README.
 
 
 Inter-Application Communication

data/lib/exvo_auth/controllers/base.rb

@@ -16,8 +16,8 @@ module ExvoAuth::Controllers::Base
   end
 
   # Usually this method is called from your sessions#create.
-  def sign_in_and_redirect!(user_id)
-    session[:user_id] = user_id
+  def sign_in_and_redirect!
+    session[:user_id] = request.env["rack.request.query_hash"]["auth"]["uid"]
 
     url = if params[:state] == "popup"
       ExvoAuth::Config.host + "/close_popup.html"
@@ -63,7 +63,7 @@ module ExvoAuth::Controllers::Base
   
   def current_user
     return @current_user if defined?(@current_user)
-    @current_user = session[:user_id] && find_user_by_id(session[:user_id])
+    @current_user = session[:user_id] && find_or_create_user_by_uid(session[:user_id])
   end
   
   def current_app_id
@@ -73,8 +73,12 @@ module ExvoAuth::Controllers::Base
   def signed_in?
     !!current_user
   end
-
+  
   protected
+  
+  def find_or_create_user_by_uid(uid)
+    raise "Implement this method in a controller"
+  end
 
   def sign_out_url(return_to)
     ExvoAuth::Config.host + "/users/sign_out?" + Rack::Utils.build_query({ :return_to => return_to })

data/lib/exvo_auth/controllers/merb.rb

@@ -23,9 +23,5 @@ module ExvoAuth::Controllers::Merb
     def redirect_to(*args)
       redirect(*args)
     end
-    
-    def find_user_by_id(id)
-      User[id]
-    end
   end
 end

data/lib/exvo_auth/controllers/rails.rb

@@ -15,9 +15,5 @@ module ExvoAuth::Controllers::Rails
     def basic_authentication_method_name
       :authenticate_or_request_with_http_basic
     end    
-
-    def find_user_by_id(id)
-      User.find(id)
-    end
   end
 end

data/lib/exvo_auth/version.rb

@@ -1,3 +1,3 @@
 module ExvoAuth
-  VERSION = "0.10.4"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exvo-auth
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
-  - 4
-  version: 0.10.4
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Jacek Becela