heroku-bouncer 0.0.1 → 0.1.0

data/Gemfile.lock

@@ -1,20 +1,18 @@
 PATH
   remote: .
   specs:
-    heroku-bouncer (0.0.1)
-      heroku-api (>= 0.0.0)
+    heroku-bouncer (0.0.2.pre)
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
       omniauth-heroku (>= 0.1.0)
       sinatra (~> 1.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    excon (0.16.10)
     faraday (0.8.6)
       multipart-post (~> 1.1)
     hashie (1.2.0)
-    heroku-api (0.3.8)
-      excon (~> 0.16.10)
     httpauth (0.2.0)
     jwt (0.1.5)
       multi_json (>= 1.0)

data/README.md

@@ -1,12 +1,19 @@
 # Heroku Bouncer
 
-Heroku Bounder is a Rack middleware (implemented in Sinatra) that
+Heroku Bouncer is a Rack middleware (implemented in Sinatra) that
 requires Heroku OAuth on all requests.
 
 ## Use
 
-1. Set `HEROKU_ID` and `HEROKU_SECRET` in your environment.
-2. Use the middleware:
+1. Create your OAuth client using `/auth/heroku/callback` as your
+   callback endpoint:
+
+    ```sh
+    heroku clients:create likeaboss https://likeaboss.herokuapp.com/auth/heroku/callback
+    ```
+
+2. Set `HEROKU_ID` and `HEROKU_SECRET` in your environment.
+3. Use the middleware:
 
     ```ruby
     require 'heroku/bouncer'
@@ -33,7 +40,7 @@ There are 4 boolean options you can pass to the middleware:
 You use these by passing a hash to the `use` call, for example:
 
 ```ruby
-use Heroku::Builder, expose_token: true
+use Heroku::Bouncer, expose_token: true
 ```
 
 ## How to get the data
@@ -54,7 +61,7 @@ appropriate, or `/auth/logout` if you only wish to logout of your app.
 The latter will redirect to `/`, which may result is the user being
 logging in again.
 
-## Conditionally disabling the middleware
+## Conditionally enable the middleware
 
 Don't want to OAuth on every request? Use a middleware to conditionally
 enable this middleware, like

data/lib/heroku/bouncer.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'omniauth-heroku'
-require 'heroku-api'
+require 'faraday'
+require 'multi_json'
 
 Heroku ||= Module.new
 
@@ -26,6 +27,14 @@ class Heroku::Bouncer < Sinatra::Base
     options.has_key?(option) ? options[option] : default
   end
 
+  def fetch_user(token)
+    MultiJson.decode(
+      Faraday.new(ENV["HEROKU_API_URL"] || "https://api.heroku.com/").get('/account') do |r|
+        r.headers['Accept'] = 'application/json'
+        r.headers['Authorization'] = "Bearer #{token}"
+      end.body)
+  end
+
   def store(key, value)
     session[:store] ||= {}
     session[:store][key] = value
@@ -52,12 +61,11 @@ class Heroku::Bouncer < Sinatra::Base
     token = request.env['omniauth.auth']['credentials']['token']
     store(:token, token) if @expose_token
     if @expose_email || @expose_user || @herokai_only
-      api = Heroku::API.new(:api_key => token)
-      user = api.get_user.body if @expose_user
+      user = fetch_user(token)
       store(:user, user) if @expose_user
       store(:email, user['email']) if @expose_email
 
-      if @herokai_only && user['email'] !~ /@heroku\.com$/
+      if @herokai_only && !user['email'].end_with?("@heroku.com")
         url = @herokai_only.is_a?(String) ? @herokai_only : 'https://www.heroku.com'
         redirect to(url) and return
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: heroku-bouncer
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-heroku
@@ -44,21 +44,37 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: heroku-api
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: ID please.
 email:
 - jd@heroku.com
@@ -72,7 +88,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
-homepage: http://github.com/heroku/heroku-bouncer
+homepage: https://github.com/heroku/heroku-bouncer
 licenses: []
 post_install_message: 
 rdoc_options: []