grape-doorkeeper 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a4ac0769056de817dc467e2b4be02afc7b3f765
-  data.tar.gz: 636b183afb2133cb038b82be20eadab3b9fa6445
+  metadata.gz: 3f12cb160c3ce4ce2fde499fd625be0573bbb3b2
+  data.tar.gz: 8623fa6a3f83c9cf2a97fdf9f24ba56375928ffc
 SHA512:
-  metadata.gz: 222c2a6103a496cac88a9b8c33b283418e46746939327d9a7f053d848bc57fe1099c213002851f52170ee3ac66150aba9a2bcd20da20172a71aba625d7eeb05c
-  data.tar.gz: 36cb04ff3de380c333823f8d91fb4c0094b34f44ea89f3c5141651017fdcec48cfe0bd45a21801cd7a6c6f9c99d74ac2f1bdaa0e7a174c834571bbe7685bee4f
+  metadata.gz: 1775e142684490797b5fe20a78317e66b5bc8a4c7678c31bf6f8ac0bc462412394f82fc31788587ed7cb07f0c562d74de13117af8333d05a39d6e34623ca7b49
+  data.tar.gz: 30b6ebaaa08e1ac655952322ab30265467eabfff6ce4a34cc6f42506762ceb0f0eeac6ef619abbebd28c9a8e27f2d24d14ef8384fc07026c283dc262920a29cb

data/grape-doorkeeper.gemspec

@@ -7,19 +7,19 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Alexey Shcherbakov"]
   s.email       = ["schalexey@gmail.com"]
-  s.homepage    = "https://github.com/intridea/grape"
+  s.homepage    = "https://github.com/fuCtor/grape-doorkeeper"
   s.summary     = %q{Gem for auth in grape via doorkeeper.}
   s.description = %q{Gem for auth in grape via doorkeeper.}
   s.license     = "MIT"
 
   s.rubyforge_project = "grape-doorkeeper"
 
-  s.add_runtime_dependency 'grape', '~> 0.6'
-  s.add_runtime_dependency 'doorkeeper', '~> 0'
+  s.add_runtime_dependency 'grape', '~> 0.9'
+  s.add_runtime_dependency 'doorkeeper', '~> 1.4.0'
     
   s.add_development_dependency 'rack-test', '~> 0'
   s.add_development_dependency 'rspec', '~> 2.9'
-  s.add_development_dependency 'bundler', '~> 0'
+  s.add_development_dependency 'bundler', '~> 1.7.0'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/grape-doorkeeper.rb

@@ -1,5 +1,6 @@
 require 'grape'
 require 'doorkeeper'
+require 'grape-doorkeeper/grape_oauth2'
 require 'grape-doorkeeper/oauth2'
 
 module GrapeDoorkeeper

data/lib/grape-doorkeeper/grape_oauth2.rb

@@ -0,0 +1,79 @@
+module GrapeDoorkeeper
+  # OAuth 2.0 authorization for Grape APIs.
+  class OAuth2Base < Grape::Middleware::Base
+    def default_options
+      {
+          token_class: 'AccessToken',
+          realm: 'OAuth API',
+          parameter: %w(bearer_token oauth_token access_token),
+          accepted_headers: %w(HTTP_AUTHORIZATION X_HTTP_AUTHORIZATION X-HTTP_AUTHORIZATION REDIRECT_X_HTTP_AUTHORIZATION),
+          header: [/Bearer (.*)/i, /OAuth (.*)/i],
+          required: true
+      }
+    end
+
+    def before
+      verify_token(token_parameter || token_header)
+    end
+
+    def request
+      @request ||= Grape::Request.new(env)
+    end
+
+    def params
+      @params ||= request.params
+    end
+
+    def token_parameter
+      Array(options[:parameter]).each do |p|
+        return params[p] if params[p]
+      end
+      nil
+    end
+
+    def token_header
+      return false unless authorization_header
+      Array(options[:header]).each do |regexp|
+        return $1 if authorization_header =~ regexp
+      end
+      nil
+    end
+
+    def authorization_header
+      options[:accepted_headers].each do |head|
+        return env[head] if env[head]
+      end
+      nil
+    end
+
+    def token_class
+      @klass ||= eval(options[:token_class]) # rubocop:disable Eval
+    end
+
+    def verify_token(token)
+      token = token_class.verify(token)
+      if token
+        if token.respond_to?(:expired?) && token.expired?
+          error_out(401, 'invalid_grant')
+        else
+          if !token.respond_to?(:permission_for?) || token.permission_for?(env)
+            env['api.token'] = token
+          else
+            error_out(403, 'insufficient_scope')
+          end
+        end
+      elsif !!options[:required]
+        error_out(401, 'invalid_grant')
+      end
+    end
+
+    def error_out(status, error)
+      throw :error,
+            message: error,
+            status: status,
+            headers: {
+                'WWW-Authenticate' => "OAuth realm='#{options[:realm]}', error='#{error}'"
+            }
+    end
+  end
+end

data/lib/grape-doorkeeper/oauth2.rb

@@ -3,7 +3,7 @@ require 'doorkeeper/doorkeeper_for'
 module GrapeDoorkeeper
   # OAuth 2.0 authorization for Grape APIs.
   
-  class Middleware < Grape::Middleware::Auth::OAuth2
+  class Middleware < GrapeDoorkeeper::OAuth2Base
   
     def protected_endpoint?
       endpoint = env['api.endpoint']

data/lib/grape-doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module GrapeDoorkeeper
- VERSION = '0.0.1'
-end
+ VERSION = '0.0.2'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexey Shcherbakov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: doorkeeper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 description: Gem for auth in grape via doorkeeper.
 email:
 - schalexey@gmail.com
@@ -93,9 +93,10 @@ files:
 - README.md
 - grape-doorkeeper.gemspec
 - lib/grape-doorkeeper.rb
+- lib/grape-doorkeeper/grape_oauth2.rb
 - lib/grape-doorkeeper/oauth2.rb
 - lib/grape-doorkeeper/version.rb
-homepage: https://github.com/intridea/grape
+homepage: https://github.com/fuCtor/grape-doorkeeper
 licenses:
 - MIT
 metadata: {}