doorkeeper 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea51224993fe17eb8bce055c441a2b583a6d9b7
-  data.tar.gz: 366ca2f1d49a33433714f470c5c66dd5b0c84c9d
+  metadata.gz: 8f77e11de4933a587d6936a1185a31d722fd21a7
+  data.tar.gz: d7aa73af1c190fab721a82e364d3c02035ed1974
 SHA512:
-  metadata.gz: 76fdba565bfa0a6b3382fb98a4cf5402794ab8b474ffe3324159b8ae7c1feee0f97e330d22e698fadeb7dc9551b6e56d5520cbc3949fa6ffd47b72fd1aaefd7e
-  data.tar.gz: 22f95b1680a08285831218530b4d8789c64c2e3170d6963d5f1c15f4118a05724ca9e8c4a7c50acce0c918f022f57b2e5bd77c101c6b3f97da818e668579766a
+  metadata.gz: 1e21a060785183070bc2fc685b18cadedd220a069aeab87028caaf0d584f894fb47d69dc554e4169205d869de80c4e385a861bf5755565f45986ec4cf6124720
+  data.tar.gz: 0374fabbd9af363de49f374bc1aecb51579d4e13ddc74fc538c5856ee16dc7b9378bd9cf4c99b8cbbefab49086920382d87cba21f9232691ee2bb79a27028891

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.7.2
+
+- enhancements
+  - [#272] Allow issuing multiple access_tokens for one user/application for multiple devices
+  - [#170] Increase length of allowed redirect URIs
+  - [#239] Do not try to load unavailable Request class for the current phase.
+  - [#273] Relax jquery-rails gem dependency
+
 ## 0.7.1
 
 - bug

data/README.md

@@ -25,7 +25,7 @@ The gem is under constant development. It is based in the [version 22 of the OAu
 Put this in your Gemfile:
 
 ``` ruby
-gem 'doorkeeper', '~> 0.7.1'
+gem 'doorkeeper', '~> 0.7.2'
 ```
 
 Run the installation generator with:
@@ -85,6 +85,9 @@ This will mount following routes:
     DELETE    /oauth/authorize
     POST      /oauth/token
     resources /oauth/applications
+    GET       /oauth/authorized_applications
+    DELETE    /oauth/authorized_applications/:id
+    GET       /oauth/token/info
 
 For more information on how to customize routes, check out [this page on the wiki](https://github.com/applicake/doorkeeper/wiki/Customizing-routes).
 

data/doorkeeper.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency "railties", ">= 3.1"
-  s.add_dependency "jquery-rails", "~> 3.0.4"
+  s.add_dependency "jquery-rails", ">= 2.0.2"
 
   s.add_development_dependency "sqlite3", "~> 1.3.5"
   s.add_development_dependency "rspec-rails", ">= 2.11.4"

data/lib/doorkeeper/oauth/authorization_code_request.rb

@@ -8,7 +8,7 @@ module Doorkeeper
       validate :grant,        :error => :invalid_grant
       validate :redirect_uri, :error => :invalid_grant
 
-      attr_accessor :server, :grant, :client, :redirect_uri
+      attr_accessor :server, :grant, :client, :redirect_uri, :access_token
 
       def initialize(server, grant, client, parameters = {})
         @server = server
@@ -21,7 +21,7 @@ module Doorkeeper
         validate
         @response = if valid?
           grant.revoke
-          find_or_create_access_token
+          issue_token
           TokenResponse.new access_token
         else
           ErrorResponse.from_request self
@@ -32,26 +32,9 @@ module Doorkeeper
         self.error.nil?
       end
 
-      def access_token
-        @access_token ||= Doorkeeper::AccessToken.matching_token_for client, grant.resource_owner_id, grant.scopes
-      end
-
-      private
-
-      def find_or_create_access_token
-        if access_token
-          access_token.expired? ? revoke_and_create_access_token : access_token
-        else
-          create_access_token
-        end
-      end
-
-      def revoke_and_create_access_token
-        access_token.revoke
-        create_access_token
-      end
+    private
 
-      def create_access_token
+      def issue_token
         @access_token = Doorkeeper::AccessToken.create!({
           :application_id    => grant.application_id,
           :resource_owner_id => grant.resource_owner_id,

data/lib/doorkeeper/oauth/client_credentials/creator.rb

@@ -3,21 +3,6 @@ module Doorkeeper
     class ClientCredentialsRequest
       class Creator
         def call(client, scopes, attributes = {})
-          existing_token = existing_token_for(client, scopes)
-          if existing_token
-            return existing_token if existing_token.accessible?
-            existing_token.revoke
-          end
-          create(client, scopes, attributes)
-        end
-
-      private
-
-        def existing_token_for(client, scopes)
-          Doorkeeper::AccessToken.matching_token_for client, nil, scopes
-        end
-
-        def create(client, scopes, attributes = {})
           Doorkeeper::AccessToken.create(attributes.merge({
             :application_id => client.id,
             :scopes         => scopes.to_s

data/lib/doorkeeper/oauth/password_access_token_request.rb

@@ -7,7 +7,7 @@ module Doorkeeper::OAuth
     validate :resource_owner, :error => :invalid_resource_owner
     validate :scopes,         :error => :invalid_scope
 
-    attr_accessor :server, :resource_owner, :client
+    attr_accessor :server, :resource_owner, :client, :access_token
 
     def initialize(server, client, resource_owner, parameters = {})
       @server          = server
@@ -19,7 +19,7 @@ module Doorkeeper::OAuth
     def authorize
       validate
       @response = if valid?
-        find_or_create_access_token
+        issue_token
         TokenResponse.new access_token
       else
         ErrorResponse.from_request self
@@ -30,11 +30,6 @@ module Doorkeeper::OAuth
       self.error.nil?
     end
 
-    def access_token
-      return unless client.present? && resource_owner.present?
-      @access_token ||= Doorkeeper::AccessToken.matching_token_for client, resource_owner.id, scopes
-    end
-
     def scopes
       @scopes ||= if @original_scopes.present?
         Doorkeeper::OAuth::Scopes.from_string(@original_scopes)
@@ -45,20 +40,7 @@ module Doorkeeper::OAuth
 
   private
 
-    def find_or_create_access_token
-      if access_token
-        access_token.expired? ? revoke_and_create_access_token : access_token
-      else
-        create_access_token
-      end
-    end
-
-    def revoke_and_create_access_token
-      access_token.revoke
-      create_access_token
-    end
-
-    def create_access_token
+    def issue_token
       @access_token = Doorkeeper::AccessToken.create!({
         :application_id     => client.id,
         :resource_owner_id  => resource_owner.id,

data/lib/doorkeeper/request.rb

@@ -9,24 +9,21 @@ module Doorkeeper
   module Request
     extend self
 
-    # Available authorization strategies:
-    # :code, :token
     def authorization_strategy(strategy)
-      get_strategy strategy
+      get_strategy strategy, %w[code token]
     rescue NameError
       raise Errors::InvalidAuthorizationStrategy
     end
 
-    # Available token strategies:
-    # :password, :client_credentials, :authorization_code, :refresh_token
     def token_strategy(strategy)
-      get_strategy strategy
+      get_strategy strategy, %w[password client_credentials authorization_code refresh_token]
     rescue NameError
       raise Errors::InvalidTokenStrategy
     end
 
-    def get_strategy(strategy)
+    def get_strategy(strategy, available)
       raise Errors::MissingRequestStrategy unless strategy.present?
+      raise NameError unless available.include?(strategy.to_s)
       "Doorkeeper::Request::#{strategy.to_s.camelize}".constantize
     end
   end

data/lib/doorkeeper/version.rb

@@ -1,3 +1,3 @@
 module Doorkeeper
-  VERSION = "0.7.1"
+  VERSION = "0.7.2"
 end

data/lib/generators/doorkeeper/templates/initializer.rb

@@ -48,7 +48,7 @@ Doorkeeper.configure do
   # Change the way access token is authenticated from the request object.
   # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
   # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
-  # Check out the wiki for mor information on customization
+  # Check out the wiki for more information on customization
   # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
 
   # Change the test redirect uri for client apps

data/lib/generators/doorkeeper/templates/migration.rb

@@ -4,7 +4,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
       t.string  :name,         :null => false
       t.string  :uid,          :null => false
       t.string  :secret,       :null => false
-      t.string  :redirect_uri, :null => false
+      t.string  :redirect_uri, :null => false, :limit => 2048
       t.timestamps
     end
 
@@ -15,7 +15,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
       t.integer  :application_id,    :null => false
       t.string   :token,             :null => false
       t.integer  :expires_in,        :null => false
-      t.string   :redirect_uri,      :null => false
+      t.string   :redirect_uri,      :null => false, :limit => 2048
       t.datetime :created_at,        :null => false
       t.datetime :revoked_at
       t.string   :scopes

data/spec/dummy/db/migrate/{20120524202412_create_doorkeeper_tables.rb → 20130902165751_create_doorkeeper_tables.rb}

@@ -4,9 +4,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
       t.string  :name,         :null => false
       t.string  :uid,          :null => false
       t.string  :secret,       :null => false
-      t.string  :redirect_uri, :null => false
-      t.integer :owner_id,     :null => true
-      t.string  :owner_type,   :null => true
+      t.string  :redirect_uri, :null => false, :limit => 2048
       t.timestamps
     end
 
@@ -17,7 +15,7 @@ class CreateDoorkeeperTables < ActiveRecord::Migration
       t.integer  :application_id,    :null => false
       t.string   :token,             :null => false
       t.integer  :expires_in,        :null => false
-      t.string   :redirect_uri,      :null => false
+      t.string   :redirect_uri,      :null => false, :limit => 2048
       t.datetime :created_at,        :null => false
       t.datetime :revoked_at
       t.string   :scopes

data/spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb

@@ -0,0 +1,7 @@
+class AddOwnerToApplication < ActiveRecord::Migration
+  def change
+    add_column :oauth_applications, :owner_id, :integer, :null => true
+    add_column :oauth_applications, :owner_type, :string, :null => true
+    add_index :oauth_applications, [:owner_id, :owner_type]
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,15 +11,15 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120524202412) do
+ActiveRecord::Schema.define(:version => 20130902175349) do
 
   create_table "oauth_access_grants", :force => true do |t|
-    t.integer  "resource_owner_id", :null => false
-    t.integer  "application_id",    :null => false
-    t.string   "token",             :null => false
-    t.integer  "expires_in",        :null => false
-    t.string   "redirect_uri",      :null => false
-    t.datetime "created_at",        :null => false
+    t.integer  "resource_owner_id",                 :null => false
+    t.integer  "application_id",                    :null => false
+    t.string   "token",                             :null => false
+    t.integer  "expires_in",                        :null => false
+    t.string   "redirect_uri",      :limit => 2048, :null => false
+    t.datetime "created_at",                        :null => false
     t.datetime "revoked_at"
     t.string   "scopes"
   end
@@ -42,16 +42,17 @@ ActiveRecord::Schema.define(:version => 20120524202412) do
   add_index "oauth_access_tokens", ["token"], :name => "index_oauth_access_tokens_on_token", :unique => true
 
   create_table "oauth_applications", :force => true do |t|
-    t.string   "name",         :null => false
-    t.string   "uid",          :null => false
-    t.string   "secret",       :null => false
-    t.string   "redirect_uri", :null => false
-    t.string   "owner_type",   :null => true, :default => "User"
-    t.integer  "owner_id",     :null => true
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
+    t.string   "name",                         :null => false
+    t.string   "uid",                          :null => false
+    t.string   "secret",                       :null => false
+    t.string   "redirect_uri", :limit => 2048, :null => false
+    t.datetime "created_at",                   :null => false
+    t.datetime "updated_at",                   :null => false
+    t.integer  "owner_id"
+    t.string   "owner_type"
   end
 
+  add_index "oauth_applications", ["owner_id", "owner_type"], :name => "index_oauth_applications_on_owner_id_and_owner_type"
   add_index "oauth_applications", ["uid"], :name => "index_oauth_applications_on_uid", :unique => true
 
   create_table "users", :force => true do |t|

data/spec/lib/oauth/authorization_code_request_spec.rb

@@ -62,19 +62,5 @@ module Doorkeeper::OAuth
       subject.validate
       subject.error.should == :invalid_grant
     end
-
-    it 'skips token creation if there is a matching one' do
-      FactoryGirl.create(:access_token, :application_id => client.id, :resource_owner_id => grant.resource_owner_id, :scopes => "public write")
-      expect do
-        subject.authorize
-      end.to_not change { Doorkeeper::AccessToken.count }
-    end
-
-    it 'revokes matching token if expired' do
-      token = FactoryGirl.create(:access_token, :application_id => client.id, :resource_owner_id => grant.resource_owner_id, :scopes => "public write", :expires_in => -100)
-      expect do
-        subject.authorize
-      end.to change { token.reload.revoked? }
-    end
   end
 end

data/spec/lib/oauth/client_credentials/creator_spec.rb

@@ -16,32 +16,5 @@ class Doorkeeper::OAuth::ClientCredentialsRequest
       created = subject.call(client, scopes)
       created.should be_false
     end
-
-    it 'does not create a new token if there is an accessible one' do
-      subject.call(client, scopes, :expires_in => 10.years)
-      expect do
-        subject.call(client, scopes)
-      end.to_not change { Doorkeeper::AccessToken.count }
-    end
-
-    it 'returns the existing token if there is an accessible one' do
-      existing = subject.call(client, scopes, :expires_in => 10.years)
-      created  = subject.call(client, scopes)
-      created.should == existing
-    end
-
-    it 'revokes old token if is not accessible' do
-      existing = subject.call(client, scopes, :expires_in => -1000)
-      subject.call(client, scopes)
-      existing.reload.should be_revoked
-    end
-
-    it 'returns a new token when the old one is not accessible' do
-      existing = subject.call(client, scopes, :expires_in => -1000)
-
-      expect do
-        subject.call(client, scopes)
-      end.to change { Doorkeeper::AccessToken.count }.by(1)
-    end
   end
 end

data/spec/lib/oauth/password_access_token_request_spec.rb

@@ -28,20 +28,6 @@ module Doorkeeper::OAuth
       subject.error.should == :invalid_client
     end
 
-    it 'skips token creation if there is already one' do
-      FactoryGirl.create(:access_token, :application_id => client.id, :resource_owner_id => owner.id)
-      expect do
-        subject.authorize
-      end.to_not change { Doorkeeper::AccessToken.count }
-    end
-
-    it 'revokes old token if expired' do
-      token = FactoryGirl.create(:access_token, :application_id => client.id, :resource_owner_id => owner.id, :expires_in => -100)
-      expect do
-        subject.authorize
-      end.to change { token.reload.revoked? }
-    end
-
     describe "with scopes" do
       subject do
         PasswordAccessTokenRequest.new(server, client, owner, :scope => 'public')

data/spec/lib/server_spec.rb

@@ -15,6 +15,10 @@ describe Doorkeeper::Server do
       expect { subject.authorization_request(:duh) }.to raise_error(Doorkeeper::Errors::InvalidAuthorizationStrategy)
     end
 
+    it 'raises error when strategy does not match phase' do
+      expect { subject.token_request(:code) }.to raise_error(Doorkeeper::Errors::InvalidTokenStrategy)
+    end
+
     it 'builds the request with selected strategy' do
       stub_const 'Doorkeeper::Request::Code', fake_class
       fake_class.should_receive(:build).with(subject)

data/spec/requests/flows/authorization_code_spec.rb

@@ -40,33 +40,6 @@ feature 'Authorization Code Flow' do
     url_should_have_param("state", "return-me")
   end
 
-  scenario 'returns the same token if it is still accessible' do
-    client_is_authorized(@client, @resource_owner)
-    visit authorization_endpoint_url(:client => @client)
-
-    authorization_code = Doorkeeper::AccessGrant.first.token
-    post token_endpoint_url(:code => authorization_code, :client => @client)
-
-    Doorkeeper::AccessToken.count.should be(1)
-
-    should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-  end
-
-  scenario 'revokes and return new token if it is has expired' do
-    client_is_authorized(@client, @resource_owner)
-    token = Doorkeeper::AccessToken.first
-    token.update_column :expires_in, -100
-    visit authorization_endpoint_url(:client => @client)
-
-    authorization_code = Doorkeeper::AccessGrant.first.token
-    post token_endpoint_url(:code => authorization_code, :client => @client)
-
-    token.reload.should be_revoked
-    Doorkeeper::AccessToken.count.should be(2)
-
-    should_have_json 'access_token', Doorkeeper::AccessToken.last.token
-  end
-
   scenario 'resource owner requests an access token with authorization code' do
     visit authorization_endpoint_url(:client => @client)
     click_on "Authorize"

data/spec/requests/flows/password_spec.rb

@@ -48,16 +48,6 @@ feature 'Resource Owner Password Credentials Flow' do
 
       should_have_json 'refresh_token',  token.refresh_token
     end
-
-    scenario 'should return the same token if it is still accessible' do
-      client_is_authorized(@client, @resource_owner)
-
-      post password_token_endpoint_url(:client => @client, :resource_owner => @resource_owner)
-
-      Doorkeeper::AccessToken.count.should be(1)
-
-      should_have_json 'access_token', Doorkeeper::AccessToken.first.token
-    end
   end
 
   context "with invalid user credentials" do

data/spec/requests/flows/refresh_token_spec.rb

@@ -68,4 +68,21 @@ feature "Refresh Token Flow" do
       should_have_json 'error', 'invalid_request'
     end
   end
+
+  context "refreshing the token with multiple sessions (devices)" do
+    before do
+      # enable password auth to simulate other devices
+      config_is_set(:resource_owner_from_credentials) { User.authenticate! params[:username], params[:password] }
+      create_resource_owner
+      @token = FactoryGirl.create(:access_token, :application => @client, :resource_owner_id => @resource_owner.id, :use_refresh_token => true)
+    end
+
+    scenario "client request a token after creating another token with the same user" do
+      @token.update_column :expires_in, -100
+      post password_token_endpoint_url(:client => @client, :resource_owner => @resource_owner)
+      post refresh_token_endpoint_url(:client => @client, :refresh_token => @token.refresh_token)
+      should_have_json 'refresh_token', Doorkeeper::AccessToken.last.refresh_token
+      @token.reload.should be_revoked
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doorkeeper
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Felipe Elias Philipp
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -29,16 +29,16 @@ dependencies:
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -309,7 +309,8 @@ files:
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20111122132257_create_users.rb
 - spec/dummy/db/migrate/20120312140401_add_password_to_users.rb
-- spec/dummy/db/migrate/20120524202412_create_doorkeeper_tables.rb
+- spec/dummy/db/migrate/20130902165751_create_doorkeeper_tables.rb
+- spec/dummy/db/migrate/20130902175349_add_owner_to_application.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html