doorkeeper 3.1.0 → 4.2.6

data/spec/dummy/db/schema.rb

@@ -11,55 +11,56 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20141209001746) do
+ActiveRecord::Schema.define(version: 20160320211015) 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",      limit: 2048, null: false
-    t.datetime "created_at",                     null: false
+  create_table "oauth_access_grants", force: :cascade 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.text     "redirect_uri",      null: false
+    t.datetime "created_at",        null: false
     t.datetime "revoked_at"
     t.string   "scopes"
   end
 
   add_index "oauth_access_grants", ["token"], name: "index_oauth_access_grants_on_token", unique: true
 
-  create_table "oauth_access_tokens", force: true do |t|
+  create_table "oauth_access_tokens", force: :cascade do |t|
     t.integer  "resource_owner_id"
     t.integer  "application_id"
-    t.string   "token",             null: false
+    t.string   "token",                               null: false
     t.string   "refresh_token"
     t.integer  "expires_in"
     t.datetime "revoked_at"
-    t.datetime "created_at",        null: false
+    t.datetime "created_at",                          null: false
     t.string   "scopes"
+    t.string   "previous_refresh_token", default: "", null: false
   end
 
   add_index "oauth_access_tokens", ["refresh_token"], name: "index_oauth_access_tokens_on_refresh_token", unique: true
   add_index "oauth_access_tokens", ["resource_owner_id"], name: "index_oauth_access_tokens_on_resource_owner_id"
   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", limit: 2048,              null: false
-    t.datetime "created_at",                             null: false
-    t.datetime "updated_at",                             null: false
+  create_table "oauth_applications", force: :cascade do |t|
+    t.string   "name",                      null: false
+    t.string   "uid",                       null: false
+    t.string   "secret",                    null: false
+    t.text     "redirect_uri",              null: false
+    t.string   "scopes",       default: "", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.integer  "owner_id"
     t.string   "owner_type"
-    t.string   "scopes",                    default: "", null: false
   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|
+  create_table "users", force: :cascade do |t|
     t.string   "name"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
     t.string   "password"
   end
 

data/spec/factories.rb

@@ -22,5 +22,7 @@ FactoryGirl.define do
     redirect_uri 'https://app.com/callback'
   end
 
-  factory :user
+  # do not name this factory :user, otherwise it will conflict with factories
+  # from applications that use doorkeeper factories in their own tests
+  factory :doorkeeper_testing_user, class: :user
 end

data/spec/lib/config_spec.rb

@@ -8,7 +8,7 @@ describe Doorkeeper, 'configuration' do
       block = proc {}
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
-        resource_owner_authenticator &block
+        resource_owner_authenticator(&block)
       end
       expect(subject.authenticate_resource_owner).to eq(block)
     end
@@ -149,7 +149,7 @@ describe Doorkeeper, 'configuration' do
     end
   end
 
-  describe 'access_token_credentials' do
+  describe 'access_token_methods' do
     it 'has defaults order' do
       expect(subject.access_token_methods).to eq([:from_bearer_authorization, :from_access_token_param, :from_bearer_param])
     end
@@ -314,4 +314,21 @@ describe Doorkeeper, 'configuration' do
       expect(subject.access_token_generator).to eq('Example')
     end
   end
+
+  describe 'base_controller' do
+    context 'default' do
+      it { expect(Doorkeeper.configuration.base_controller).to eq('ActionController::Base') }
+    end
+
+    context 'custom' do
+      before do
+        Doorkeeper.configure do
+          orm DOORKEEPER_ORM
+          base_controller 'ApplicationController'
+        end
+      end
+
+      it { expect(Doorkeeper.configuration.base_controller).to eq('ApplicationController') }
+    end
+  end
 end

data/spec/lib/doorkeeper_spec.rb

@@ -1,28 +1,150 @@
 require 'spec_helper_integration'
 
 describe Doorkeeper do
-  describe 'authenticate' do
-    let(:token) { double('Token') }
-    let(:request) { double('ActionDispatch::Request') }
+  describe "#authenticate" do
+    let(:request) { double }
+
+    it "calls OAuth::Token#authenticate" do
+      token_strategies = Doorkeeper.configuration.access_token_methods
+
+      expect(Doorkeeper::OAuth::Token).to receive(:authenticate).
+        with(request, *token_strategies)
+
+      Doorkeeper.authenticate(request)
+    end
+
+    it "accepts custom token strategies" do
+      token_strategies = [:first_way, :second_way]
+
+      expect(Doorkeeper::OAuth::Token).to receive(:authenticate).
+        with(request, *token_strategies)
+
+      Doorkeeper.authenticate(request, token_strategies)
+    end
+  end
+
+  describe "#configured?" do
+    after do
+      Doorkeeper.remove_instance_variable(:@config)
+    end
+
+    context "@config is set" do
+      it "returns true" do
+        Doorkeeper.instance_variable_set(:@config, "hi")
+
+        expect(Doorkeeper.configured?).to eq(true)
+      end
+    end
+
+    context "@config is not set" do
+      it "returns false" do
+        Doorkeeper.instance_variable_set(:@config, nil)
+
+        expect(Doorkeeper.configured?).to eq(false)
+      end
+    end
+
+    it "is deprecated" do
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
+
+      Doorkeeper.configured?
+    end
+  end
+
+  describe "#database_installed?" do
     before do
-      allow(Doorkeeper::OAuth::Token).to receive(:authenticate).
-        with(request, *token_strategies) { token }
+      ["AccessToken", "AccessGrant", "Application"].each do |klass|
+        @original_classes ||= {}
+        @original_classes[klass] = Doorkeeper.const_get(klass)
+        Doorkeeper.send(:remove_const, klass)
+      end
+    end
+
+    after do
+      ["AccessToken", "AccessGrant", "Application"].each do |klass|
+        Doorkeeper.send(:remove_const, klass)
+        Doorkeeper.const_set(klass, @original_classes[klass])
+      end
     end
 
-    context 'with specific access token strategies' do
-      let(:token_strategies) { [:first_way, :second_way] }
+    context "all tables exist" do
+      before do
+        klass = double table_exists?: true
+
+        Doorkeeper.const_set(:AccessToken, klass)
+        Doorkeeper.const_set(:AccessGrant, klass)
+        Doorkeeper.const_set(:Application, klass)
+      end
 
-      it 'authenticates the token from the request' do
-        expect(Doorkeeper.authenticate(request, token_strategies)).to eq(token)
+      it "returns true" do
+        expect(Doorkeeper.database_installed?).to eq(true)
+      end
+
+      it "is deprecated" do
+        expect(ActiveSupport::Deprecation).to receive(:warn).
+          with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
+
+        Doorkeeper.database_installed?
       end
     end
 
-    context 'with default access token strategies' do
-      let(:token_strategies) { Doorkeeper.configuration.access_token_methods }
+    context "all tables do not exist" do
+      before do
+        klass = double table_exists?: false
+
+        Doorkeeper.const_set(:AccessToken, klass)
+        Doorkeeper.const_set(:AccessGrant, klass)
+        Doorkeeper.const_set(:Application, klass)
+      end
+
+      it "returns false" do
+        expect(Doorkeeper.database_installed?).to eq(false)
+      end
+
+      it "is deprecated" do
+        expect(ActiveSupport::Deprecation).to receive(:warn).
+          with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
 
-      it 'authenticates the token from the request' do
-        expect(Doorkeeper.authenticate(request)).to eq(token)
+        Doorkeeper.database_installed?
       end
     end
   end
+
+  describe "#installed?" do
+    context "methods return true" do
+      before do
+        allow(Doorkeeper).to receive(:configured?).and_return(true).once
+        allow(Doorkeeper).to receive(:database_installed?).and_return(true).once
+      end
+
+      it "returns true" do
+        expect(Doorkeeper.installed?).to eq(true)
+      end
+    end
+
+    context "methods return false" do
+      before do
+        allow(Doorkeeper).to receive(:configured?).and_return(false).once
+        allow(Doorkeeper).to receive(:database_installed?).and_return(false).once
+      end
+
+      it "returns false" do
+        expect(Doorkeeper.installed?).to eq(false)
+      end
+    end
+
+    it "is deprecated" do
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#configured?` has been deprecated without replacement.")
+
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#database_installed?` has been deprecated without replacement.")
+
+      expect(ActiveSupport::Deprecation).to receive(:warn).
+        with("Method `Doorkeeper#installed?` has been deprecated without replacement.")
+
+      Doorkeeper.installed?
+    end
+  end
 end

data/spec/lib/models/expirable_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'timecop'
 require 'active_support/time'
 require 'doorkeeper/models/concerns/expirable'
 

data/spec/lib/models/revocable_spec.rb

@@ -11,20 +11,21 @@ describe 'Revocable' do
 
   describe :revoke do
     it 'updates :revoked_at attribute with current time' do
-      clock = double now: double
-      expect(subject).to receive(:update_attribute).with(:revoked_at, clock.now)
+      utc = double utc: double
+      clock = double now: utc
+      expect(subject).to receive(:update_attribute).with(:revoked_at, clock.now.utc)
       subject.revoke(clock)
     end
   end
 
   describe :revoked? do
     it 'is revoked if :revoked_at has passed' do
-      allow(subject).to receive(:revoked_at).and_return(Time.now - 1000)
+      allow(subject).to receive(:revoked_at).and_return(Time.now.utc - 1000)
       expect(subject).to be_revoked
     end
 
     it 'is not revoked if :revoked_at has not passed' do
-      allow(subject).to receive(:revoked_at).and_return(Time.now + 1000)
+      allow(subject).to receive(:revoked_at).and_return(Time.now.utc + 1000)
       expect(subject).not_to be_revoked
     end
 
@@ -33,4 +34,26 @@ describe 'Revocable' do
       expect(subject).not_to be_revoked
     end
   end
+
+  describe :revoke_previous_refresh_token! do
+    it "revokes the previous token if existing, and resets the
+      `previous_refresh_token` attribute" do
+      previous_token = FactoryGirl.create(
+        :access_token,
+        refresh_token: "refresh_token"
+      )
+      current_token = FactoryGirl.create(
+        :access_token,
+        previous_refresh_token: previous_token.refresh_token
+      )
+
+      expect_any_instance_of(
+        Doorkeeper::AccessToken
+      ).to receive(:revoke).and_call_original
+      current_token.revoke_previous_refresh_token!
+
+      expect(current_token.previous_refresh_token).to be_empty
+      expect(previous_token.reload).to be_revoked
+    end
+  end
 end

data/spec/lib/oauth/authorization/uri_builder_spec.rb

@@ -6,8 +6,7 @@ require 'doorkeeper/oauth/authorization/uri_builder'
 
 module Doorkeeper::OAuth::Authorization
   describe URIBuilder do
-
-    subject { Object.new.class.send :include, URIBuilder }
+    subject { URIBuilder }
 
     describe :uri_with_query do
       it 'returns the uri with query' do

data/spec/lib/oauth/authorization_code_request_spec.rb

@@ -18,7 +18,7 @@ module Doorkeeper::OAuth
     it 'issues a new token for the client' do
       expect do
         subject.authorize
-      end.to change { client.access_tokens.count }.by(1)
+      end.to change { client.reload.access_tokens.count }.by(1)
     end
 
     it "issues the token with same grant's scopes" do

data/spec/lib/oauth/base_request_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper_integration'
+
+module Doorkeeper::OAuth
+  describe BaseRequest do
+    let(:access_token) do
+      double :access_token,
+        token:              "some-token",
+        expires_in:         "3600",
+        expires_in_seconds: "300",
+        scopes_string:      "two scopes",
+        refresh_token:      "some-refresh-token",
+        token_type:         "bearer",
+        created_at:         0
+    end
+
+    let(:client) do
+      double :client,
+        id: '1'
+    end
+
+    let(:scopes_array) do
+      %w(public write)
+    end
+
+    let(:server) do
+      double :server,
+        access_token_expires_in: 100,
+        custom_access_token_expires_in: ->(_) { nil },
+        refresh_token_enabled?: false
+    end
+
+    subject do
+      BaseRequest.new
+    end
+
+    describe "#authorize" do
+      before do
+        allow(subject).to receive(:access_token).and_return(access_token)
+      end
+
+      it "validates itself" do
+        expect(subject).to receive(:validate).once
+        subject.authorize
+      end
+
+      context "valid" do
+        before do
+          allow(subject).to receive(:valid?).and_return(true)
+        end
+
+        it "calls callback methods" do
+          expect(subject).to receive(:before_successful_response).once
+          expect(subject).to receive(:after_successful_response).once
+          subject.authorize
+        end
+
+        it "returns a TokenResponse object" do
+          result = subject.authorize
+
+          expect(result).to be_an_instance_of(TokenResponse)
+          expect(result.body).to eq(
+            TokenResponse.new(access_token).body
+          )
+        end
+      end
+
+      context "invalid" do
+        before do
+          allow(subject).to receive(:valid?).and_return(false)
+          allow(subject).to receive(:error).and_return("server_error")
+          allow(subject).to receive(:state).and_return("hello")
+        end
+
+        it "returns an ErrorResponse object" do
+          error_description = I18n.translate(
+            "server_error",
+            scope: [:doorkeeper, :errors, :messages]
+          )
+
+          result = subject.authorize
+
+          expect(result).to be_an_instance_of(ErrorResponse)
+
+          expect(result.body).to eq(
+            error: "server_error",
+            error_description: error_description,
+            state: "hello"
+          )
+        end
+      end
+    end
+
+    describe "#default_scopes" do
+      it "delegates to the server" do
+        expect(subject).to receive(:server).and_return(server).once
+        expect(server).to receive(:default_scopes).once
+
+        subject.default_scopes
+      end
+    end
+
+    describe "#find_or_create_access_token" do
+      it "returns an instance of AccessToken" do
+        result = subject.find_or_create_access_token(
+          client,
+          "1",
+          "public",
+          server
+        )
+
+        expect(result).to be_an_instance_of(Doorkeeper::AccessToken)
+      end
+    end
+
+    describe "#scopes" do
+      context "@original_scopes is present" do
+        before do
+          subject.instance_variable_set(:@original_scopes, "public write")
+        end
+
+        it "returns array of @original_scopes" do
+          result = subject.scopes
+
+          expect(result).to eq(scopes_array)
+        end
+      end
+
+      context "@original_scopes is not present" do
+        before do
+          subject.instance_variable_set(:@original_scopes, "")
+        end
+
+        it "calls #default_scopes" do
+          allow(subject).to receive(:server).and_return(server).once
+          allow(server).to receive(:default_scopes).and_return(scopes_array).once
+
+          result = subject.scopes
+
+          expect(result).to eq(scopes_array)
+        end
+      end
+    end
+
+    describe "#valid?" do
+      context "error is nil" do
+        it "returns true" do
+          allow(subject).to receive(:error).and_return(nil).once
+          expect(subject.valid?).to eq(true)
+        end
+      end
+
+      context "error is not nil" do
+        it "returns false" do
+          allow(subject).to receive(:error).and_return(Object.new).once
+          expect(subject.valid?).to eq(false)
+        end
+      end
+    end
+  end
+end

data/spec/lib/oauth/base_response_spec.rb

@@ -0,0 +1,45 @@
+require 'spec_helper_integration'
+
+module Doorkeeper::OAuth
+  describe BaseResponse do
+    subject do
+      BaseResponse.new
+    end
+
+    describe "#body" do
+      it "returns an empty Hash" do
+        expect(subject.body).to eq({})
+      end
+    end
+
+    describe "#description" do
+      it "returns an empty String" do
+        expect(subject.description).to eq("")
+      end
+    end
+
+    describe "#headers" do
+      it "returns an empty Hash" do
+        expect(subject.headers).to eq({})
+      end
+    end
+
+    describe "#redirectable?" do
+      it "returns false" do
+        expect(subject.redirectable?).to eq(false)
+      end
+    end
+
+    describe "#redirect_uri" do
+      it "returns an empty String" do
+        expect(subject.redirect_uri).to eq("")
+      end
+    end
+
+    describe "#status" do
+      it "returns :ok" do
+        expect(subject.status).to eq(:ok)
+      end
+    end
+  end
+end

data/spec/lib/oauth/client/credentials_spec.rb

@@ -4,6 +4,9 @@ require 'doorkeeper/oauth/client'
 
 class Doorkeeper::OAuth::Client
   describe Credentials do
+    let(:client_id) { 'some-uid' }
+    let(:client_secret) { 'some-secret' }
+
     it 'is blank when any of the credentials is blank' do
       expect(Credentials.new(nil, 'something')).to be_blank
       expect(Credentials.new('something', nil)).to be_blank
@@ -43,5 +46,43 @@ class Doorkeeper::OAuth::Client
         expect(credentials.secret).to eq('secret')
       end
     end
+
+    describe :from_params do
+      it 'returns credentials from parameters when Authorization header is not available' do
+        request     = double parameters: { client_id: client_id, client_secret: client_secret }
+        uid, secret = Credentials.from_params(request)
+
+        expect(uid).to    eq('some-uid')
+        expect(secret).to eq('some-secret')
+      end
+
+      it 'is blank when there are no credentials' do
+        request     = double parameters: {}
+        uid, secret = Credentials.from_params(request)
+
+        expect(uid).to    be_blank
+        expect(secret).to be_blank
+      end
+    end
+
+    describe :from_basic do
+      let(:credentials) { Base64.encode64("#{client_id}:#{client_secret}") }
+
+      it 'decodes the credentials' do
+        request     = double authorization: "Basic #{credentials}"
+        uid, secret = Credentials.from_basic(request)
+
+        expect(uid).to    eq('some-uid')
+        expect(secret).to eq('some-secret')
+      end
+
+      it 'is blank if Authorization is not Basic' do
+        request     = double authorization: "#{credentials}"
+        uid, secret = Credentials.from_basic(request)
+
+        expect(uid).to    be_blank
+        expect(secret).to be_blank
+      end
+    end
   end
 end

data/spec/lib/oauth/code_response_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Doorkeeper
+  module OAuth
+    describe CodeResponse do
+      describe '.redirect_uri' do
+        context 'when generating the redirect URI for an implicit grant' do
+          let :pre_auth do
+            double(
+              :pre_auth,
+              client: double(:application, id: 1),
+              redirect_uri: 'http://tst.com/cb',
+              state: nil,
+              scopes: Scopes.from_string('public'),
+            )
+          end
+
+          let :auth do
+            Authorization::Token.new(pre_auth, double(id: 1)).tap do |c|
+              c.issue_token
+              allow(c.token).to receive(:expires_in_seconds).and_return(3600)
+            end
+          end
+
+          subject { CodeResponse.new(pre_auth, auth, response_on_fragment: true).redirect_uri }
+
+          it 'includes the remaining TTL of the token relative to the time the token was generated' do
+            expect(subject).to include('expires_in=3600')
+          end
+        end
+      end
+    end
+  end
+end