authlogic_wind 0.1.2 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.2.0

data/authlogic_wind.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{authlogic_wind}
-  s.version = "0.1.2"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Stuart"]
-  s.date = %q{2009-11-03}
+  s.date = %q{2009-11-05}
   s.description = %q{Authlogic plugin for WIND}
   s.email = %q{tastyhat@jamesstuart.org}
   s.extra_rdoc_files = [

data/lib/authlogic_wind/helper.rb

@@ -1,10 +1,7 @@
 module AuthlogicWind
   module Helper
-    def wind_login_link(session_class, controller_name, options = {})
-      callback = url_for(:only_path => false, :controller => controller_name) + "/create"
-      link_to (options[:name] || "Login"), url_for(:host => session_class.wind_host, :controller => "login", :protocol => "https", :service => session_class.wind_service, :destination => callback)
-
-      
+    def wind_login_url(controller_name)
+      url_for(:controller => controller_name) + "/create?login_with_wind=true"
     end
   end
 end

data/lib/authlogic_wind/session.rb

@@ -62,9 +62,9 @@ module AuthlogicWind
         super(&block)
       end
       
-      
+      #TODO: why is this so hacky?
       def build_callback_url
-        wind_controller.url_for :controller => wind_controller.controller_name, :action => wind_controller.action_name
+        wind_controller.url_for(:controller => wind_controller.controller_name) + "/create"
       end
       
       
@@ -145,8 +145,8 @@ module AuthlogicWind
 
           # Tell our rack callback filter what method the current request is using
           wind_controller.session[:wind_callback_method]      = wind_controller.request.method
-
-          wind_controller.redirect_to wind_controller.url_for(:host => wind_host, :controller => "login", :protocol => "https", :service => wind_service, :destination => build_callback_url)
+          
+          wind_controller.redirect_to "https://#{wind_host}/login?destination=#{CGI.escapeHTML(build_callback_url)}&service=#{CGI.escapeHTML(wind_service)}"
         end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: authlogic_wind
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - James Stuart
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-03 00:00:00 -05:00
+date: 2009-11-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency