authbox 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88f3bad31b1a1dc5767a54eba3593de501f0a0bb
-  data.tar.gz: d3f8f8c13f83a669824f9f3488915c1a95cb49ef
+  metadata.gz: 043a3f024ab2ffbee3924fbb1db65f0355a37b71
+  data.tar.gz: c05d9d06d4a9c94b5629a529225e8c3f22f220cb
 SHA512:
-  metadata.gz: c52b50856e96ebcf07272763549b82432613b69aa7abc1fd009c8ad57de51686e07ae1f89f00ac1a8acf513f0d59516905248fb89d5dc0b844580a8930288821
-  data.tar.gz: 04823d5d38976a4a89debf7f7e5bad4c4ef55657320e90eea2dc82da6b05143c606852f599ef509adde7c4ac7c8d465623bb5780a2bf30cf796c77fcadb52fd1
+  metadata.gz: 50a26b11ba2b16dcd23ff55018c47be35e1662fc5cccfbf4b0b9bb997e74076e753dbb84665fd569e9f47abfb0157124aa43a1b86791f83a6752bcb2fe843584
+  data.tar.gz: 9004ce71a310cbc65ba6b904451c05db4e712eb127228e6eb3e39819f02348e2f2b80cb539ffd48ca37f395a29ea15818ee623c2348b4adea6589186f54923dd

data/lib/authbox.rb

@@ -55,31 +55,25 @@ module Authbox
   # will be logged. See the documentation for what information
   # you can pass here in the action hash.
   def authbox_log(action={})
-    if not authbox_ensure_one_request()
-      return @authbox_verdict
+    if not authbox_ensure_one_request(:log)
+      return
     end
 
-    return authbox_request('/action', action, true)
-  end
-
-  def authbox_check(action={})
-    if not authbox_ensure_one_request()
-      return @authbox_verdict
+    if not @authbox_verdict.blank? and @authbox_verdict['type'] != 'ALLOW'
+      return
     end
 
-    return authbox_request('/action', action, false)
+
+    return authbox_request('/action_log', action, true)
   end
 
-  def authbox_begin(action={})
-    if not authbox_ensure_one_request()
+  def authbox_check(action={})
+    if not authbox_ensure_one_request(:check)
       return @authbox_verdict
     end
 
-    return authbox_request('/action_begin', action, false)
-  end
-
-  def authbox_end(action={})
-    return authbox_request('/action_end', action, false)
+    @authbox_check_action = action
+    return authbox_request('/action_check', action, false)
   end
 
   ##
@@ -143,13 +137,13 @@ module Authbox
     return Rails.configuration.authbox[:endpoint] || 'https://api.authbox.io/api'
   end
 
-  def authbox_ensure_one_request
-    if @authbox_requested
+  def authbox_ensure_one_request(type)
+    if @authbox_fired[type]
       authbox_warn_log { 'authbox_log() already called' }
       return false
     end
 
-    @authbox_requested = true
+    @authbox_fired[type] = true
     return true
   end
 
@@ -217,7 +211,7 @@ module Authbox
     begin
       parsed_response = JSON.parse(response.body)
       if not parsed_response.has_key? 'type'
-        @authbox_verdict = {'type' => 'ALLOW', 'info' => 'No verdict returend'}
+        @authbox_verdict = {'type' => 'ALLOW', 'info' => 'No verdict returned'}
         return @authbox_verdict
       end
     rescue => e
@@ -238,13 +232,17 @@ module Authbox
   end
 
   def authbox_before
-    @authbox_requested = false
+    @authbox_fired = {
+      :check => false,
+      :log => false
+    }
+    @authbox_check_action = {}
     @authbox_insert_pixel = rand() < 0.01
   end
 
   def authbox_after
-    if not @authbox_requested
-      authbox_log({})
+    if not @authbox_fired[:log]
+      authbox_log @authbox_check_action
 
       if @authbox_insert_pixel and Rails.configuration.authbox.fetch(:enable_tracking_pixel, true)
         endpoint = authbox_get_endpoint()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authbox
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Authbox, Inc.