exvo-auth 0.8.2 → 0.9.0

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0

data/exvo-auth.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exvo-auth}
-  s.version = "0.8.2"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jacek Becela"]
-  s.date = %q{2010-08-30}
+  s.date = %q{2010-09-02}
   s.description = %q{Sign in with Exvo account}
   s.email = %q{jacek.becela@gmail.com}
   s.extra_rdoc_files = [
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
      "lib/exvo_auth/controllers/base.rb",
      "lib/exvo_auth/controllers/merb.rb",
      "lib/exvo_auth/controllers/rails.rb",
+     "lib/exvo_auth/dejavu.rb",
      "lib/exvo_auth/oauth2.rb",
      "lib/exvo_auth/strategies/base.rb",
      "lib/exvo_auth/strategies/interactive.rb",

data/lib/exvo-auth.rb

@@ -3,9 +3,11 @@ require 'omniauth/oauth'
 require 'multi_json'
 require 'httparty'
 require 'uri'
+require 'base64'
 
 module ExvoAuth
   autoload :Config, 'exvo_auth/config'
+  autoload :Dejavu, 'exvo_auth/dejavu'
   
   module Strategies
     autoload :Base,           'exvo_auth/strategies/base'

data/lib/exvo_auth/controllers/base.rb

@@ -1,12 +1,8 @@
 module ExvoAuth::Controllers::Base
-  def self.included(base)
-    raise "Please define a #root_url method in #{base.name} (or in routes)" unless base.method_defined? :root_url
-  end
-  
   # A before filter to protect your sensitive actions.
   def authenticate_user!
     if !signed_in?
-      store_location!
+      store_request!
 
       callback_key   = ExvoAuth::Config.callback_key
       callback_value = params[callback_key]
@@ -22,21 +18,19 @@ module ExvoAuth::Controllers::Base
   # Usually this method is called from your sessions#create.
   def sign_in_and_redirect!(user_id)
     session[:user_id] = user_id
-    
+
     url = if params[:state] == "popup"
       ExvoAuth::Config.host + "/close_popup.html"
     else
-      stored_location || root_url
+      request_replay_url || "/"
     end
-    
+
     redirect_to url
   end
-  
-  # Redirect to sign_out_url, signs out and redirects back to root_path (by default).
-  # This method assumes you have a "root_url" method defined in your controller.
-  #
+
+  # Redirect to sign_out_url, signs out and redirects back to "/" (by default).
   # Usuallly this method is called from your sessions#destroy.
-  def sign_out_and_redirect!(return_to = root_url)
+  def sign_out_and_redirect!(return_to = "/")
     session.delete(:user_id)
     @current_user = nil
     redirect_to sign_out_url(return_to)
@@ -80,14 +74,6 @@ module ExvoAuth::Controllers::Base
 
   protected
 
-  def store_location!
-    session[:return_to] = current_url
-  end
-  
-  def stored_location
-    session.delete(:return_to)
-  end
-
   def sign_out_url(return_to)
     ExvoAuth::Config.host + "/users/sign_out?" + Rack::Utils.build_query({ :return_to => return_to })
   end
@@ -97,4 +83,31 @@ module ExvoAuth::Controllers::Base
     query = Rack::Utils.build_query(params)
     query.empty? ? path : "#{path}?#{query}"
   end
+
+  def current_request
+    {
+      :script_name  => request.script_name,
+      :path_info    => request.path_info,
+      :method       => request_method,
+      :params       => request.params, # GET + POST params together. no uploads and other crazy shit please ;)
+      :content_type => request.content_type
+    }
+  end
+
+  def store_request!
+    session[:stored_request] = Base64.encode64(MultiJson.encode(current_request))
+  end
+  
+  def request_replay_url
+    if stored_request = session.delete(:stored_request)
+      decoded = MultiJson.decode(Base64.decode64(stored_request))
+      if decoded["method"] == "GET"
+        qs = decoded["query_string"]
+        decoded["script_name"] + decoded["path_info"] + (qs ? "?" + qs : "")
+      else
+        "/auth/dejavu?" + Rack::Utils.build_query(:stored_request => stored_request)
+      end
+    end
+  end
+  
 end

data/lib/exvo_auth/controllers/merb.rb

@@ -12,6 +12,10 @@ module ExvoAuth::Controllers::Merb
     
     protected
 
+    def request_method
+      request.method.to_s.upcase
+    end
+
     def basic_authentication_method_name
       :basic_authentication
     end
@@ -23,9 +27,5 @@ module ExvoAuth::Controllers::Merb
     def find_user_by_id(id)
       User[id]
     end
-
-    def current_url
-      request.full_uri if request.method == :get
-    end
   end
 end

data/lib/exvo_auth/controllers/rails.rb

@@ -5,9 +5,13 @@ module ExvoAuth::Controllers::Rails
     base.helper_method :current_user, :signed_in?, :sign_up_path, :sign_in_path
   end
     
-  module InstanceMethods
+  module InstanceMethods    
     protected
-
+    
+    def request_method
+      request.request_method
+    end
+    
     def basic_authentication_method_name
       :authenticate_or_request_with_http_basic
     end    
@@ -15,9 +19,5 @@ module ExvoAuth::Controllers::Rails
     def find_user_by_id(id)
       User.find(id)
     end
-
-    def current_url
-      request.url if request.get?
-    end
   end
 end

data/lib/exvo_auth/dejavu.rb

@@ -0,0 +1,22 @@
+class ExvoAuth::Dejavu
+  def initialize(app)
+    @app    = app
+  end
+  
+  def call(env)
+    dejavu(env) if Rack::Request.new(env).path == "/auth/dejavu"
+    @app.call(env)
+  end
+  
+  private
+  
+  def dejavu(env)
+    data = MultiJson.decode(Base64.decode64(Rack::Request.new(env).params["stored_request"]))
+
+    env["QUERY_STRING"]   = Rack::Utils.build_nested_query(data["params"]) # Will not work with file uploads.
+    env["SCRIPT_NAME"]    = data["script_name"]
+    env["PATH_INFO"]      = data["path_info"]
+    env["REQUEST_METHOD"] = data["method"]
+    env["CONTENT_TYPE"]   = data["content_type"]
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 8
-  - 2
-  version: 0.8.2
+  - 9
+  - 0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Jacek Becela
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-09-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,6 +109,7 @@ files:
 - lib/exvo_auth/controllers/base.rb
 - lib/exvo_auth/controllers/merb.rb
 - lib/exvo_auth/controllers/rails.rb
+- lib/exvo_auth/dejavu.rb
 - lib/exvo_auth/oauth2.rb
 - lib/exvo_auth/strategies/base.rb
 - lib/exvo_auth/strategies/interactive.rb