rack-oauth2 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/example/server/oauth2_controller.rb

@@ -0,0 +1,24 @@
+class Oauth2Controller < ApplicationController
+
+  def authorize
+    authorization_endpoint = Rack::OAuth2::Server::Authorization.new(self) do |req, res|
+      # TODO
+    end
+    status, header, body = authorization_endpoint.call(request.env)
+    case status
+    when 302
+      redirect_to header['Location']
+    else
+      render :status => status, :json => body
+    end
+  end
+
+  def token
+    token_endpoint = Rack::OAuth2::Server::Token.new(self) do |req, res|
+      # TODO
+    end
+    status, header, body = token_endpoint.call(request.env)
+    render :status => status, :json => body
+  end
+
+end

data/example/server/token.rb

@@ -7,7 +7,6 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '../../lib'))
 require 'rack/oauth2'
 
 use Rack::OAuth2::Server::Token do |request, response|
-  p request, request.required_params
   # allow everything
   response.access_token = 'access_token'
   response.expires_in = 3600

data/lib/rack/oauth2/server/abstract/handler.rb

@@ -1,14 +1,13 @@
-require 'rack/auth/abstract/handler'
-
 module Rack
   module OAuth2
     module Server
       module Abstract
-        class Handler < Rack::Auth::AbstractHandler
-          attr_accessor :request, :response
+        class Handler
+          attr_accessor :realm, :authenticator, :request, :response
 
           def initialize(realm = '', &authenticator)
-            super(nil, realm, &authenticator)
+            @realm = realm
+            @authenticator = authenticator
           end
 
           def call(env)

data/lib/rack/oauth2/server/abstract/request.rb

@@ -9,7 +9,7 @@ module Rack
             super
             verify_required_params!
             @client_id = params['client_id']
-            @scope     = Array(params['scope'].to_s.split(' '))
+            @scope = Array(params['scope'].to_s.split(' '))
           end
 
           def required_params

data/lib/rack/oauth2/server/authorization.rb

@@ -11,19 +11,16 @@ module Rack
         end
 
         class Request < Abstract::Request
-          attr_accessor :response_type, :client_id, :redirect_uri, :state
+          attr_accessor :response_type, :redirect_uri, :state
 
           def initialize(env)
             super
+            @state = params['state']
             @redirect_uri = Util.parse_uri(params['redirect_uri']) if params['redirect_uri']
-            @state        = params['state']
-          rescue URI::InvalidURIError
-            # NOTE: can't redirect in this case.
-            raise BadRequest.new(:invalid_request, 'Invalid redirect_uri format.')
           end
 
           def required_params
-            super + [:response_type, :client_id]
+            super + [:response_type]
           end
 
           def profile
@@ -44,8 +41,8 @@ module Rack
           attr_accessor :redirect_uri, :state, :approved
 
           def initialize(request)
+            @state = request.state
             @redirect_uri = Util.parse_uri(request.redirect_uri) if request.redirect_uri
-            @state        = request.state
             super
           end
 

data/rack-oauth2.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-oauth2}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["nov matake"]
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "example/server/authorize.rb",
+     "example/server/oauth2_controller.rb",
      "example/server/token.rb",
      "lib/rack/oauth2.rb",
      "lib/rack/oauth2/server.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-oauth2
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - nov matake
@@ -79,6 +79,7 @@ files:
 - Rakefile
 - VERSION
 - example/server/authorize.rb
+- example/server/oauth2_controller.rb
 - example/server/token.rb
 - lib/rack/oauth2.rb
 - lib/rack/oauth2/server.rb