oa-cadun 3.0.2 → 3.0.3

data/lib/oa-cadun/version.rb

@@ -2,7 +2,7 @@ module OACadun
   module VERSION
     MAJOR = 3
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
     
     STRING = [MAJOR, MINOR, TINY] * '.'
   end

data/lib/omni_auth/strategies/cadun.rb

@@ -1,14 +1,21 @@
+require 'cadun/config'
+require 'cadun/user'
+require 'cadun/gateway'
+
 module OmniAuth
   module Strategies
     class Cadun
       include OmniAuth::Strategy
+      include ::Cadun
       
       def initialize(app, options = {})
+        Config.load_file(options[:config])
+        
         super(app, :cadun, options)
       end
       
       def request_phase
-        redirect "https://login.dev.globoi.com/login/#{service_id}?url=#{callback_url}"
+        redirect "#{Config.login_url}/#{service_id}?url=#{callback_url}"
       end
       
       def auth_hash
@@ -39,7 +46,7 @@ module OmniAuth
       
       protected
       def user
-        @user ||= ::Cadun::User.new(request.params['GLBID'], env['REMOTE_ADDR'], service_id)
+        @user ||= User.new(request.params['GLBID'], env['REMOTE_ADDR'], service_id)
       end
       
       def service_id
@@ -47,10 +54,11 @@ module OmniAuth
       end
       
       def callback_url
-        uri = URI.parse(request.referer)
-        port = uri.port == 80 ? nil : ":#{uri.port}"
+        uri = request.env['HTTP_HOST']
+        port = request.env['SERVER_PORT'] == "80" ? nil : ":#{request.env['SERVER_PORT']}"
+        scheme = request.env['rack.url_scheme']
         
-        callback_url = "http://#{uri.host}#{port}/auth/cadun/callback"
+        callback_url = "#{scheme}://#{uri}#{port}/auth/cadun/callback"
         URI.escape(callback_url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       end
     end

data/spec/omni_auth/strategies/cadun_spec.rb

@@ -4,12 +4,12 @@ require 'spec_helper'
 describe OmniAuth::Strategies::Cadun do
 
   let(:app) { lambda { |env| [200, {}, ['Hello']] } }
-  let(:strategy) { OmniAuth::Strategies::Cadun.new(app, :service_id => 1) }
+  let(:strategy) { OmniAuth::Strategies::Cadun.new(app, :service_id => 1, :config => File.join(File.dirname(__FILE__), "..", "..", "support", "fixtures", "config.yml")) }
   
   describe "#request_phase" do
     context "when it has a referer" do
       before do
-        strategy.call!(Rack::MockRequest.env_for("", "rack.session" => {}, "HTTP_REFERER" => "http://test.localhost/auth/cadun"))
+        strategy.call!(Rack::MockRequest.env_for("http://test.localhost/auth/cadun", "rack.session" => {}, "HTTP_HOST" => "test.localhost"))
 
         @status, @headers, @body = strategy.request_phase
       end
@@ -27,7 +27,7 @@ describe OmniAuth::Strategies::Cadun do
     
     context "when it has a referer and a different port" do
       before do
-        strategy.call!(Rack::MockRequest.env_for("", "rack.session" => {}, "HTTP_REFERER" => "http://test.localhost:8080/auth/cadun"))
+        strategy.call!(Rack::MockRequest.env_for("http://test.localhost:8080/auth/cadun", "rack.session" => {}, "HTTP_HOST" => "test.localhost", "SERVER_PORT" => "8080"))
 
         @status, @headers, @body = strategy.request_phase
       end

data/spec/support/fixtures/config.yml

@@ -0,0 +1,5 @@
+cadun:
+  logout_url: https://login.dev.globoi.com/Servlet/do/logout
+  login_url: https://login.dev.globoi.com/login
+  auth_url: isp-authenticator.dev.globoi.com
+  auth_port: 8280

metadata

@@ -2,7 +2,7 @@
 name: oa-cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - Bruno Azisaka Maciel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-23 00:00:00 -03:00
+date: 2011-05-24 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -103,6 +103,7 @@ files:
 - spec/omni_auth/strategies/cadun_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/autorizacao.xml
+- spec/support/fixtures/config.yml
 - spec/support/fixtures/pessoa.xml
 has_rdoc: true
 homepage: ""
@@ -136,4 +137,5 @@ test_files:
 - spec/omni_auth/strategies/cadun_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures/autorizacao.xml
+- spec/support/fixtures/config.yml
 - spec/support/fixtures/pessoa.xml