oa-cadun 0.2.2 → 0.3

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2@oa-cadun
+rvm 1.9.2@cadun

data/lib/oa-cadun/version.rb

@@ -1,3 +1,3 @@
 module OACadun
-  VERSION = '0.2.2'
-end
+  VERSION = '0.3'
+end

data/lib/omni_auth/strategies/cadun.rb

@@ -3,48 +3,56 @@ module OmniAuth
     class Cadun
       include OmniAuth::Strategy
       
-      attr_reader :glb_id, :url, :params
-      
       def initialize(app, options = {})
         super(app, :cadun, options)
       end
       
       def request_phase
-        redirect "https://login.dev.globoi.com/login/#{service_id}"
+        redirect "https://login.dev.globoi.com/login/#{service_id}?url=#{callback_url}"
       end
       
       def auth_hash
-        @params = CGI.parse(URI.parse(env['REQUEST_URI']).query)
-        @glb_id = params['GLBID'].first
-        @url = params['url'].first
-        
-        { :GLBID => glb_id,
-          :url => url,
-          :id => user.id,
-          :email => user.email,
-          :status => user.status,
-          :username => user.login,
-          :name => user.name,
-          :address => user.address,
-          :suburb => user.suburb,
-          :city => user.city,
-          :state => user.state,
-          :country => user.country,
-          :gender => user.gender,
-          :birthday =>  user.birthday.strftime('%d/%m/%Y'),
-          :mobile => user.mobile,
-          :phone => user.phone,
-          :cpf => user.cpf }
+        { 
+          :provider => "cadun",
+          :uid => user.id,
+          :user_info => {
+            :id => user.id,
+            :GLBID => request.params['GLBID'],
+            :url => request.params['url'],          
+            :email => user.email,
+            :status => user.status,
+            :nickname => user.login,
+            :name => user.name,
+            :address => user.address,
+            :suburb => user.suburb,
+            :city => user.city,
+            :state => user.state,
+            :country => user.country,
+            :gender => user.gender,
+            :birthday =>  user.birthday.strftime('%d/%m/%Y'),
+            :mobile => user.mobile,
+            :phone => user.phone,
+            :cpf => user.cpf
+          }
+        }
       end
       
       protected
       def user
-        @user ||= ::Cadun::User.new(glb_id, env['REMOTE_ADDR'], service_id)
+        @user ||= ::Cadun::User.new(request.params['GLBID'], env['REMOTE_ADDR'], service_id)
       end
       
       def service_id
         @options[:service_id]
       end
+      
+      def callback_url
+        uri = URI.parse(request.referer)
+        port = uri.port == 80 ? nil : ":#{uri.port}"
+        
+        callback_url = "http://#{uri.host}#{port}/auth/cadun/callback"
+        URI.escape(callback_url, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      end
     end
   end
 end

data/spec/omni_auth/strategies/cadun_spec.rb

@@ -3,45 +3,60 @@ require 'spec_helper'
 
 describe OmniAuth::Strategies::Cadun do
 
-  let(:app) { lambda{ |env| [200, {}, ['Hello']] } }
+  let(:app) { lambda { |env| [200, {}, ['Hello']] } }
+  let(:strategy) { OmniAuth::Strategies::Cadun.new(app, :service_id => 1) }
   
   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"))
 
-    before do
-      @status, @headers, @body = OmniAuth::Strategies::Cadun.new(app, :service_id => 1).request_phase
-    end
-    
-    describe "status" do
-      subject { @status }
-      specify { should == 302 }
+        @status, @headers, @body = strategy.request_phase
+      end
+
+      describe "status" do
+        subject { @status }
+        specify { should == 302 }
+      end
+
+      describe "headers" do
+        subject { @headers }
+        specify { should include("Location" => "https://login.dev.globoi.com/login/1?url=http%3A%2F%2Ftest.localhost%2Fauth%2Fcadun%2Fcallback") }
+      end
     end
     
-    describe "headers" do
-      subject { @headers }
-      specify { should include("Location" => "https://login.dev.globoi.com/login/1") }
-    end
+    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"))
 
+        @status, @headers, @body = strategy.request_phase
+      end
+
+      describe "status" do
+        subject { @status }
+        specify { should == 302 }
+      end
+
+      describe "headers" do
+        subject { @headers }
+        specify { should include("Location" => "https://login.dev.globoi.com/login/1?url=http%3A%2F%2Ftest.localhost%3A8080%2Fauth%2Fcadun%2Fcallback") }
+      end
+    end
   end
   
   describe "#auth_hash" do
-
-    let(:strategy) { OmniAuth::Strategies::Cadun.new(app, :service_id => 1) }
-    
     before do
       stub_requests
-      
-      strategy.call!({ "rack.session" => {},
-                       "REQUEST_URI" => "http://localhost?GLBID=GLBID&url=/go_back",
-                       "REMOTE_ADDR" => "127.0.0.1" })
+      strategy.call!(Rack::MockRequest.env_for("http://localhost?GLBID=GLBID&url=/go_back", "rack.session" => {}))
     end
     
-    subject { strategy.auth_hash }
+    subject { strategy.auth_hash[:user_info] }
     
     specify { should include(:GLBID => "GLBID") }
     specify { should include(:id => "21737810") }
     specify { should include(:email => "fab1@spam.la") }
     specify { should include(:status => "ATIVO") }
-    specify { should include(:username => "fabricio_fab1") }
+    specify { should include(:nickname => "fabricio_fab1") }
     specify { should include(:name => "Fabricio Rodrigo Lopes") }
     specify { should include(:address => "Rua Uruguai, 59") }
     specify { should include(:suburb => "Andaraí") }

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require "#{File.dirname(__FILE__)}/../lib/oa-cadun"
 require 'fakeweb'
+require 'rack/mock'
 
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 

metadata

@@ -2,7 +2,7 @@
 name: oa-cadun
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.2
+  version: "0.3"
 platform: ruby
 authors: 
 - Bruno Azisaka Maciel