bouncer-client 0.1.2 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c7547cc0455dedc3b0e335ec4ed3947929c251
-  data.tar.gz: 582dfcc1a9e43ca10f94f4bcaa1da2a044220a2c
+  metadata.gz: e17c125be2501897971c0c22c6ca32a50952d9fa
+  data.tar.gz: 972ca02953b1b93bfb24b87bd0fb23d71b7de85a
 SHA512:
-  metadata.gz: ee79644b7406739aa651d8a87410e7e890a5daa84552da502ddebc458acdbbc34e4d5e888a5a72a88573e3c17f6550c01b5a0e4a52bb78f07d048d6956437fbb
-  data.tar.gz: c964178c31e5f10057946ecff4cafd25549f2f11c867f6c9257f2f7a77fa8b28a94e2eaf5e79c9da88db43f5b6259ae664e58279994250eccbb8c907945d317a
+  metadata.gz: b69f105cac219e2fa3c37feedfa7f4b9bba06c6f9e9b87ac446e39cb5ed4e6ecf3bacb21776d041ab7788f178f63e042e65c9f25aa84e7c01e26f23c380c27aa
+  data.tar.gz: dea2489cc65034126e3d828d209f53ad3ae45ac66369709f03be0e16daf0284de31d9dc547f0cdadacb6dcce58c6d0abed330b60180f92af62fc0ad60a70ff35

data/.gitignore

@@ -1,3 +1,4 @@
+*.swp
 .env
 /.bundle/
 /.yardoc

data/bouncer-client.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'faraday'
+  spec.add_dependency 'faraday_middleware'
   spec.add_dependency 'redis'
   spec.add_development_dependency 'codeclimate-test-reporter'
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/bouncer-client/client.rb

@@ -1,5 +1,40 @@
+require 'faraday'
+require 'faraday_middleware'
 module Bouncer
   class Client
+    def self.current
+      raise "Missing BOUNCER_URL environment" unless ENV['BOUNCER_URL']
+      @client ||= Bouncer::Client.new ENV['BOUNCER_URL']
+    end
 
+    def initialize bouncer_url
+      @conn = Faraday.new(url: bouncer_url, headers: { accept: 'application/json' }) do |faraday|
+        faraday.response :json, :content_type => /\bjson$/
+        faraday.request  :json
+        faraday.use Faraday::Response::RaiseError
+        faraday.adapter  Faraday.default_adapter
+        faraday.headers['Content-Type'] = 'application/json'
+      end
+    end
+
+    def service_token
+      @conn.authorization :Service, ENV['SERVICE_TOKEN']
+    end
+
+    def token token
+      @conn.authorization :Bearer, token
+    end
+
+    def me
+      @conn.get('/me')
+    end
+
+    def user id
+      @conn.get("/users/#{id}")
+    end
+
+    def token_info
+      @conn.get('/oauth/token/info')
+    end
   end
 end

data/lib/bouncer-client/device.rb

@@ -0,0 +1,11 @@
+module Bouncer
+  class Device
+    attr_accessor :id, :created_at
+    def self.from_json json
+      device = Device.new
+      device.id = json['id']
+      device.created_at = json['created_at']
+      device
+    end
+  end
+end

data/lib/bouncer-client/token.rb

@@ -1,8 +1,6 @@
-require 'faraday'
 require 'redis'
 module Bouncer
   class Token
-    attr_reader :payload
     def initialize token
       @token = token.split(' ')[1]
       return get_from_bouncer unless redis.exists "TOKEN:#{@token}"
@@ -15,39 +13,34 @@ module Bouncer
       end
     end
 
-    def id
-      model['id']
-    end
-
-    def email
-      model["email"] if user?
-    end
-
-    def phone
-      model["phone"] if user?
-    end
-
-    def image
-      model["image"] if user?
+    def validate!
+      puts "DEPRECATED: valid? should be used instead of validate!"
+      valid?
     end
 
-    def validate!
+    def valid?
       return false unless @payload
       @payload["users"] != nil || @payload["devices"] != nil
     end
 
-    def super_admin?
-      model["super_admin"] == true
-    end
-
     def device?
       @payload['devices'] && !@payload['devices'].empty?
     end
 
+    def device
+      return nil unless device?
+      @device ||= build_model
+    end
+
     def user?
       @payload['users'] && !@payload['users'].empty?
     end
 
+    def user
+      return nil unless user?
+      @user ||= build_model
+    end
+
     def self.present? request
       return false unless auth_header = request.headers['authorization']
       auth_header.split(' ')[0] == 'Bearer'
@@ -56,33 +49,26 @@ module Bouncer
     private
 
     def get_from_bouncer
-      raise "No BOUNCER_URL" unless ENV['BOUNCER_URL']
-      conn = Faraday.new(url: ENV['BOUNCER_URL']) do |faraday|
-        faraday.request  :url_encoded
-        faraday.adapter  Faraday.default_adapter
-        faraday.headers['Content-Type'] = 'application/json'
-        faraday.headers['Authorization'] = 'Bearer ' + @token
-      end
+      client = Bouncer::Client.current
+      client.token @token
 
-      response = conn.get("/oauth/token/info")
-      @expires_in = JSON.parse(response.body)["expires_in_seconds"]
-      if response.success?
-        raw = conn.get("/me")
-        if raw.success?
-          @payload = JSON.parse(raw.body)
-          redis.setex("TOKEN:#{@token}", @expires_in, @payload.to_json)
-          return
-        end
-      end
+      begin
+      response = client.token_info
+      @expires_in = response.body["expires_in_seconds"]
+      raw = client.me
+      @payload = raw.body
+      redis.setex("TOKEN:#{@token}", @expires_in, @payload.to_json)
+      rescue Faraday::ClientError
       @payload = nil
       redis.del("TOKEN:#{@token}")
+      end
     end
 
-    def model
+    def build_model
       if device?
-        @payload['devices'][0]
+        Bouncer::Device.from_json @payload['devices'][0]
       else
-        @payload['users'][0]
+        Bouncer::User.from_json @payload['users'][0]
       end
     end
 

data/lib/bouncer-client/user.rb

@@ -0,0 +1,27 @@
+module Bouncer
+  class User
+    attr_accessor :id, :email, :name, :phone, :image, :super_admin, :created_at
+
+    def self.from_id id
+      client = Bouncer::Client.current
+      client.service_token
+      raw = client.user id
+      from_json raw.body['users'][0]
+    end
+
+    def self.from_json json
+      user = User.new
+      user.id = json['id']
+      user.email = json['email']
+      user.phone = json['phone']
+      user.image = json['image']
+      user.super_admin = json['super_admin']
+      user.created_at = json['created_at']
+      user
+    end
+
+    def super_admin?
+      @super_admin
+    end
+  end
+end

data/lib/bouncer-client/version.rb

@@ -1,3 +1,3 @@
 module Bouncer
-  VERSION = "0.1.2"
+  VERSION = "0.2"
 end

data/lib/bouncer-client.rb

@@ -1,2 +1,5 @@
 require 'bouncer-client/token'
 require 'bouncer-client/errors'
+require 'bouncer-client/user'
+require 'bouncer-client/device'
+require 'bouncer-client/client'

data/spec/cassettes/bouncer/invalid_token.yml

@@ -0,0 +1,62 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://mbouncer.herokuapp.com/oauth/token/info
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Content-Type:
+      - application/json
+      Authorization:
+      - Bearer junk
+      User-Agent:
+      - Faraday v0.9.1
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - Cowboy
+      Connection:
+      - close
+      Date:
+      - Thu, 19 Feb 2015 19:53:04 GMT
+      Status:
+      - 401 Unauthorized
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      Cache-Control:
+      - no-store
+      Pragma:
+      - no-cache
+      Content-Type:
+      - application/json; charset=utf-8
+      Www-Authenticate:
+      - Bearer realm="Doorkeeper", error="invalid_request", error_description="The
+        request is missing a required parameter, includes an unsupported parameter
+        value, or is otherwise malformed."
+      X-Request-Id:
+      - 3ec4f699-efa2-46bd-bcc8-4dda83815cec
+      X-Runtime:
+      - '0.007876'
+      Via:
+      - 1.1 vegur
+    body:
+      encoding: UTF-8
+      string: '{"error":"invalid_request","error_description":"The request is missing
+        a required parameter, includes an unsupported parameter value, or is otherwise
+        malformed."}'
+    http_version: 
+  recorded_at: Thu, 19 Feb 2015 19:53:03 GMT
+recorded_with: VCR 2.9.3

data/spec/cassettes/bouncer/user.yml

@@ -0,0 +1,56 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://mbouncer.herokuapp.com/users/960dd380-85db-43c7-b79b-ed3f3c7d4a88
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Content-Type:
+      - application/json
+      User-Agent:
+      - Faraday v0.9.1
+      Authorization:
+      - Service a41c1636c6d341c9766ce3e1194d8b1a5f12168abf0c547af2d82c63dff8874f
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - Cowboy
+      Connection:
+      - close
+      Date:
+      - Thu, 19 Feb 2015 22:59:40 GMT
+      Status:
+      - 200 OK
+      X-Frame-Options:
+      - SAMEORIGIN
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Content-Type-Options:
+      - nosniff
+      Content-Type:
+      - application/json; charset=utf-8
+      Etag:
+      - W/"f3b0c963380b198b62bf64cc73b32e13"
+      Cache-Control:
+      - max-age=0, private, must-revalidate
+      X-Request-Id:
+      - d2b2d060-e687-4d32-85ab-c636bc5d0162
+      X-Runtime:
+      - '0.156021'
+      Via:
+      - 1.1 vegur
+    body:
+      encoding: UTF-8
+      string: '{"users":[{"id":"960dd380-85db-43c7-b79b-ed3f3c7d4a88","image":"https://secure.gravatar.com/avatar/ebfcbe366c47be18e8d3d6eb13d51d17?d=mm\u0026s=50","phone":"4075120689","email":"kurt@monsieur.co","name":null,"super_admin":true,"confirmed_at":"2000-01-01T18:46:46.786Z"}]}'
+    http_version: 
+  recorded_at: Thu, 19 Feb 2015 22:59:40 GMT
+recorded_with: VCR 2.9.3

data/spec/model/token_spec.rb

@@ -3,18 +3,26 @@ require 'spec_helper'
 describe Bouncer::Token do
   let(:admin_token) { Bouncer::Token.new('Bearer ' + ENV['ADMIN_TOKEN']) }
   let(:device_token) { Bouncer::Token.new('Bearer ' + ENV['DEVICE_TOKEN'])}
-  describe "#validate!" do
+  let(:invalid_token) { Bouncer::Token.new('Bearer junk') }
+
+  describe "#valid?" do
     it "validates admin tokens" do
       VCR.use_cassette 'bouncer/valid_admin' do
-      expect(admin_token.validate!).to eq true #hit network
-      expect(admin_token.validate!).to eq true #redis cache
+        expect(admin_token).to be_valid #hit network
+        expect(admin_token).to be_valid #redis cache
       end
     end
 
     it 'validates device tokens' do
       VCR.use_cassette 'bouncer/valid_device' do
-        expect(device_token.validate!).to eq true
-        expect(device_token.validate!).to eq true
+        expect(device_token).to be_valid
+        expect(device_token).to be_valid
+      end
+    end
+
+    it 'does not validate bad token' do
+      VCR.use_cassette 'bouncer/invalid_token' do
+        expect(invalid_token).to_not be_valid
       end
     end
   end
@@ -22,7 +30,7 @@ describe Bouncer::Token do
   describe "#super_admin?" do
     it "returns true" do
       VCR.use_cassette 'bouncer/valid_admin' do
-        expect(admin_token).to be_super_admin
+        expect(admin_token.user).to be_super_admin
       end
     end
   end
@@ -30,26 +38,30 @@ describe Bouncer::Token do
   describe "#id" do
     context "device token" do
       it 'is correct' do
-        VCR.use_cassette('bouncer/valid_device') { expect(device_token.id).to eq "e6b89f6d-fc60-4001-b666-8a5a7bb8b369" }
+        VCR.use_cassette('bouncer/valid_device') { expect(device_token.device.id).to eq "e6b89f6d-fc60-4001-b666-8a5a7bb8b369" }
       end
     end
     context "user token" do
       it 'is correct' do
-        VCR.use_cassette('bouncer/valid_admin') { expect(admin_token.id).to eq "960dd380-85db-43c7-b79b-ed3f3c7d4a88" }
+        VCR.use_cassette('bouncer/valid_admin') { expect(admin_token.user.id).to eq "960dd380-85db-43c7-b79b-ed3f3c7d4a88" }
       end
     end
   end
 
   describe "#email" do
-    context "user token" do
-      it 'is correct' do
-        VCR.use_cassette('bouncer/valid_admin') { expect(admin_token.email).to eq "kurt@monsieur.co" }
-      end
+    it 'is correct' do
+      VCR.use_cassette('bouncer/valid_admin') { expect(admin_token.user.email).to eq "kurt@monsieur.co" }
     end
-    context "device token" do
-      it 'is nil' do
-        VCR.use_cassette('bouncer/valid_device') { expect(device_token.email).to eq nil }
-      end
+  end
+
+  describe "device token" do
+    it 'does not have a user' do
+      VCR.use_cassette('bouncer/valid_device') { expect(device_token.user).to eq nil }
+    end
+  end
+  describe "user token" do
+    it 'does not have a device' do
+      VCR.use_cassette('bouncer/valid_admin') { expect(admin_token.device).to eq nil }
     end
   end
 

data/spec/model/user_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Bouncer::User do
+  it 'is created from an ID' do
+    uuid = "960dd380-85db-43c7-b79b-ed3f3c7d4a88"
+    VCR.use_cassette 'bouncer/user' do
+      user = Bouncer::User.from_id uuid
+      expect(user.id).to eq uuid
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bouncer-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: '0.2'
 platform: ruby
 authors:
 - Kurt Nelson
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -213,13 +227,18 @@ files:
 - lib/bouncer-client.rb
 - lib/bouncer-client/client.rb
 - lib/bouncer-client/controller_mixin.rb
+- lib/bouncer-client/device.rb
 - lib/bouncer-client/errors.rb
 - lib/bouncer-client/test_helpers.rb
 - lib/bouncer-client/token.rb
+- lib/bouncer-client/user.rb
 - lib/bouncer-client/version.rb
+- spec/cassettes/bouncer/invalid_token.yml
+- spec/cassettes/bouncer/user.yml
 - spec/cassettes/bouncer/valid_admin.yml
 - spec/cassettes/bouncer/valid_device.yml
 - spec/model/token_spec.rb
+- spec/model/user_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -246,7 +265,10 @@ signing_key:
 specification_version: 4
 summary: Allows Rails to easily use a Bouncer instance for authentication
 test_files:
+- spec/cassettes/bouncer/invalid_token.yml
+- spec/cassettes/bouncer/user.yml
 - spec/cassettes/bouncer/valid_admin.yml
 - spec/cassettes/bouncer/valid_device.yml
 - spec/model/token_spec.rb
+- spec/model/user_spec.rb
 - spec/spec_helper.rb