sq_auth 0.0.24 → 0.0.25

data/examples/client.rb

@@ -1,13 +1,12 @@
 require 'sinatra'
 require 'sq_auth'
-
 enable :sessions
 set :port, 7842
 
-SqAuth.connect(host: "localhost", port: 3000) do |d|
+SqAuth.connect(host: "localhost", port: 3000, https: false) do |d|
   d.project_name = "Project"
+ # d.gateway_ip = "192.168.0.1"
 end
-
 get ["admin"], "/something" do
   <<-EOF
     Logined to something with params #{params}

data/lib/sq_auth/sq_auth_access.rb

@@ -1,7 +1,7 @@
 module SqAuth
   class SqAuthAccess
     DEFAULT_ACCESS_PATH = "/access_partial"
-    DEFAULT_DRAW_PROC = Proc.new {|uri, callback, role, project, session| SqAuthUtils::default_draw_template(uri, callback, role, project, session)}
+    DEFAULT_DRAW_PROC = Proc.new {|uri, project_params, user_params| SqAuthUtils::default_draw_template(uri, project_params, user_params)}
     DEFAULT_DATA_PROC = Proc.new { "Forbidden" }
     DEFAULT_OPTIONS = {project: "Project", https: true}
     attr_accessor :login_path, :callback, :project_name, :gateway_ip, :forced_host, :forced_port
@@ -53,7 +53,7 @@ module SqAuth
       if sq_auth_filter(roles, project, options)
         when_ok.call
       else
-        when_no_role.(not_logged_in_proc.(login_to, callback, roles, project, @session_provider.session_for_current_user))
+        when_no_role.(not_logged_in_proc.(login_to, form_project_params(callback, roles, project), @session_provider.current_user_params))
       end
     end
 
@@ -61,10 +61,13 @@ module SqAuth
       @session_provider.session_for_current_user && @session_provider.role_exist_for_current_user?(roles, project)
     end
 
+    def form_project_params callback, roles, project
+      {callback: callback, roles: [*roles], auth_name: project}
+    end
 
     def when_not_authenticated(roles, project, options = {})
       not_logged_in_proc = get_not_logged_in_proc(options[:draw])
-      not_logged_in_proc.call(login_to, callback, roles, project, @session_provider.session_for_current_user)
+      not_logged_in_proc.call(login_to, form_project_params(callback, roles, project), @session_provider.current_user_params)
     end
 
     def draw_when_not_authenticated(roles, project = @project_name)
@@ -95,7 +98,6 @@ module SqAuth
       else
         @session_provider.user.user_ip = ip
       end
-      p @session_provider.user.user_ip
     end
 
     def login_to

data/lib/sq_auth/sq_auth_client.rb

@@ -20,6 +20,10 @@ module SqAuth
       session_for current_user
     end
 
+    def ip_for_current_user
+      ip_for current_user
+    end
+
     def check_connection
       send_request :check_connection
     end
@@ -50,6 +54,10 @@ module SqAuth
       @sessions[user]
     end
 
+    def ip_for user
+      user[:ip]
+    end
+
     def role_exist? user, roles, project
       request_hash = {sqauthsession: session_for(user), roles: [*roles], auth_name: project, ip: user[:ip]}
       response = send_request :check_role, request_hash
@@ -68,5 +76,9 @@ module SqAuth
       uri_builder = (@https ? URI::HTTPS : URI::HTTP)
       uri_builder.build(host: @host, port: @port)
     end
+
+    def current_user_params
+      {session: session_for_current_user, ip: ip_for_current_user}
+    end
   end
 end

data/lib/sq_auth/sq_auth_utils.rb

@@ -1,9 +1,9 @@
 module SqAuth
   module SqAuthUtils
-    def self.default_draw_template uri, callback, role, project, session
+    def self.default_draw_template uri, project_params, user_params #callback, role, project, session, ip
       <<-EOF
         <div class="sq_auth_not_logged_in">
-          <iframe src='#{uri}?#{SqAuth::SqAuthRequest.hash_to_query({callback: callback, roles: [*role], auth_name: project, sqauthsession: session})}'>
+          <iframe src='#{uri}?#{SqAuth::SqAuthRequest.hash_to_query(project_params.merge(user_params))}'>
           </iframe>
         </div>
       EOF

data/lib/sq_auth/version.rb

@@ -1,3 +1,3 @@
 module SqAuth
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sq_auth
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000Z
+date: 2012-05-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake