heroku-bouncer 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 828f65b68c8ed42f82cf523ab3748a16263fe5d2
-  data.tar.gz: 6b53e6ef3efb5f53bd35af410e0fd0501a3a9722
+  metadata.gz: 415f3f61030a94fb1e1eb0a4481be6fb8d60b5cd
+  data.tar.gz: 7cc105448d3d48f17ac0271ce336bb355245631e
 SHA512:
-  metadata.gz: 0b317ac658086d8ebe4157ab5b85b93fd23b61569d0ac5b41c7426a9514c4b490d06ffabc2daed835a40fcd2a33bd33812afe95d4d0843b6438d6d17b0894c4a
-  data.tar.gz: 12fd8a29894b24568fbfd0ed6d236b640cb4658084692e61f5900e7dc32ca69ebab3570d3760c76cef8ddf3f88ca6b45d27d6cbb6ef0fb5a6af75451b41d9c44
+  metadata.gz: c977a0ea26bdac8fd14863a761a34492f9155b341171f707544bb9a816032f82bc29ba5414f0013168bcab71801a8ef0dcca56f20caea249a9b89eac9f577063
+  data.tar.gz: aa0ce2396d42163f876f37c9f3ae01c7d831250f26e664411a8aa56782101d065582c3351b705256c5bd322d6c99b2cd5a14e0b5a3cb755a5155b98c227d7e20

data/lib/heroku/bouncer/builder.rb

@@ -7,7 +7,7 @@ class Heroku::Bouncer::Builder
   def self.new(app, options = {})
     builder = Rack::Builder.new
     id, secret, scope = extract_options!(options)
-    unless id.empty? || secret.empty?
+    unless options[:disabled]
       builder.use OmniAuth::Builder do
         provider :heroku, id, secret, :scope => scope
       end
@@ -17,10 +17,10 @@ class Heroku::Bouncer::Builder
   end
 
   def self.extract_options!(options)
-    oauth = options.delete(:oauth) || {}
-    id = oauth.delete(:id)
-    secret = oauth.delete(:secret)
-    scope = oauth.delete(:scope) || 'identity'
+    oauth = options[:oauth] || {}
+    id = oauth[:id]
+    secret = oauth[:secret]
+    scope = oauth[:scope] || 'identity'
 
     if id.nil? && (ENV.has_key?('HEROKU_ID') || ENV.has_key?('HEROKU_OAUTH_ID'))
       $stderr.puts "[warn] heroku-bouncer: HEROKU_ID or HEROKU_OAUTH_ID detected in environment, please pass in :oauth hash instead"
@@ -32,8 +32,8 @@ class Heroku::Bouncer::Builder
       secret = ENV['HEROKU_OAUTH_SECRET'] || ENV['HEROKU_SECRET']
     end
 
-    if id.nil? || secret.nil?
-      $stderr.puts "[fatal] heroku-bouncer: HEROKU_OAUTH_ID or HEROKU_OAUTH_SECRET not set, middleware disabled"
+    if id.nil? || secret.nil? || id.empty? || secret.empty?
+      $stderr.puts "[fatal] heroku-bouncer: OAuth ID or secret not set, middleware disabled"
       options[:disabled] = true
     end
 

data/lib/heroku/bouncer/middleware.rb

@@ -172,8 +172,10 @@ private
   end
 
   def encrypt_store(env)
-    env["rack.session"][:bouncer] =
-      env["rack.session"][:bouncer].lock(@cookie_secret)
+    if env["rack.session"].key?(:bouncer)
+      env["rack.session"][:bouncer] =
+        env["rack.session"][:bouncer].lock(@cookie_secret)
+    end
   end
 
   def store

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Jonathan Dance
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-heroku