doorkeeper 1.1.0 → 1.2.0

data/spec/factories/access_grant.rb

@@ -1,9 +1,9 @@
 FactoryGirl.define do
-  factory :access_grant, :class => Doorkeeper::AccessGrant do
+  factory :access_grant, class: Doorkeeper::AccessGrant do
     sequence(:resource_owner_id) { |n| n }
     application
-    redirect_uri "https://app.com/callback"
+    redirect_uri 'https://app.com/callback'
     expires_in 100
-    scopes "public write"
+    scopes 'public write'
   end
 end

data/spec/factories/access_token.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :access_token, :class => Doorkeeper::AccessToken do
+  factory :access_token, class: Doorkeeper::AccessToken do
     sequence(:resource_owner_id) { |n| n }
     application
     expires_in 2.hours

data/spec/factories/application.rb

@@ -1,6 +1,6 @@
 FactoryGirl.define do
-  factory :application, :class => Doorkeeper::Application do
-    sequence(:name){ |n| "Application #{n}" }
-    redirect_uri "https://app.com/callback"
+  factory :application, class: Doorkeeper::Application do
+    sequence(:name) { |n| "Application #{n}" }
+    redirect_uri 'https://app.com/callback'
   end
 end

data/spec/generators/application_owner_generator_spec.rb

@@ -1,23 +1,22 @@
 require 'spec_helper_integration'
 require 'generators/doorkeeper/application_owner_generator'
 
-
 describe 'Doorkeeper::ApplicationOwnerGenerator' do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::ApplicationOwnerGenerator
-  destination ::File.expand_path("../tmp/dummy", __FILE__)
+  destination ::File.expand_path('../tmp/dummy', __FILE__)
 
-  describe "after running the generator" do
+  describe 'after running the generator' do
     before :each do
       prepare_destination
-      FileUtils.mkdir(::File.expand_path("config", Pathname(destination_root)))
-      FileUtils.copy_file(::File.expand_path("../templates/routes.rb", __FILE__), ::File.expand_path("config/routes.rb", Pathname.new(destination_root)))
+      FileUtils.mkdir(::File.expand_path('config', Pathname(destination_root)))
+      FileUtils.copy_file(::File.expand_path('../templates/routes.rb', __FILE__), ::File.expand_path('config/routes.rb', Pathname.new(destination_root)))
       run_generator
     end
 
-    it "creates a migration" do
-      assert_migration "db/migrate/add_owner_to_application.rb"
+    it 'creates a migration' do
+      assert_migration 'db/migrate/add_owner_to_application.rb'
     end
   end
 end

data/spec/generators/install_generator_spec.rb

@@ -5,27 +5,27 @@ describe 'Doorkeeper::InstallGenerator' do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::InstallGenerator
-  destination ::File.expand_path("../tmp/dummy", __FILE__)
+  destination ::File.expand_path('../tmp/dummy', __FILE__)
 
-  describe "after running the generator" do
+  describe 'after running the generator' do
     before :each do
       prepare_destination
-      FileUtils.mkdir(::File.expand_path("config", Pathname(destination_root)))
-      FileUtils.mkdir(::File.expand_path("db", Pathname(destination_root)))
-      FileUtils.copy_file(::File.expand_path("../templates/routes.rb", __FILE__), ::File.expand_path("config/routes.rb", Pathname.new(destination_root)))
+      FileUtils.mkdir(::File.expand_path('config', Pathname(destination_root)))
+      FileUtils.mkdir(::File.expand_path('db', Pathname(destination_root)))
+      FileUtils.copy_file(::File.expand_path('../templates/routes.rb', __FILE__), ::File.expand_path('config/routes.rb', Pathname.new(destination_root)))
       run_generator
     end
 
-    it "creates an initializer file" do
+    it 'creates an initializer file' do
       assert_file 'config/initializers/doorkeeper.rb'
     end
 
-    it "copies the locale file" do
+    it 'copies the locale file' do
       assert_file 'config/locales/doorkeeper.en.yml'
     end
 
-    it "adds sample route" do
-      assert_file "config/routes.rb", /use_doorkeeper/
+    it 'adds sample route' do
+      assert_file 'config/routes.rb', /use_doorkeeper/
     end
   end
 end

data/spec/generators/migration_generator_spec.rb

@@ -5,16 +5,16 @@ describe 'Doorkeeper::MigrationGenerator' do
   include GeneratorSpec::TestCase
 
   tests Doorkeeper::MigrationGenerator
-  destination ::File.expand_path("../tmp/dummy", __FILE__)
+  destination ::File.expand_path('../tmp/dummy', __FILE__)
 
-  describe "after running the generator" do
+  describe 'after running the generator' do
     before :each do
       prepare_destination
       run_generator
     end
 
-    it "creates a migration" do
-      assert_migration "db/migrate/create_doorkeeper_tables.rb"
+    it 'creates a migration' do
+      assert_migration 'db/migrate/create_doorkeeper_tables.rb'
     end
   end
 end

data/spec/lib/config_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper_integration'
 
-describe Doorkeeper, "configuration" do
+describe Doorkeeper, 'configuration' do
   subject { Doorkeeper.configuration }
 
-  describe "resource_owner_authenticator" do
-    it "sets the block that is accessible via authenticate_resource_owner" do
-      block = proc do end
+  describe 'resource_owner_authenticator' do
+    it 'sets the block that is accessible via authenticate_resource_owner' do
+      block = proc {}
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
         resource_owner_authenticator &block
@@ -14,9 +14,9 @@ describe Doorkeeper, "configuration" do
     end
   end
 
-  describe "admin_authenticator" do
-    it "sets the block that is accessible via authenticate_admin" do
-      block = proc do end
+  describe 'admin_authenticator' do
+    it 'sets the block that is accessible via authenticate_admin' do
+      block = proc {}
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
         admin_authenticator &block
@@ -25,12 +25,12 @@ describe Doorkeeper, "configuration" do
     end
   end
 
-  describe "access_token_expires_in" do
-    it "has 2 hours by default" do
+  describe 'access_token_expires_in' do
+    it 'has 2 hours by default' do
       expect(subject.access_token_expires_in).to eq(2.hours)
     end
 
-    it "can change the value" do
+    it 'can change the value' do
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
         access_token_expires_in 4.hours
@@ -38,7 +38,7 @@ describe Doorkeeper, "configuration" do
       expect(subject.access_token_expires_in).to eq(4.hours)
     end
 
-    it "can be set to nil" do
+    it 'can be set to nil' do
       Doorkeeper.configure do
         orm DOORKEEPER_ORM
         access_token_expires_in nil
@@ -47,20 +47,20 @@ describe Doorkeeper, "configuration" do
     end
   end
 
-  describe "scopes" do
-    it "has default scopes" do
-      Doorkeeper.configure {
+  describe 'scopes' do
+    it 'has default scopes' do
+      Doorkeeper.configure do
         orm DOORKEEPER_ORM
         default_scopes :public
-      }
+      end
       expect(subject.default_scopes).to include('public')
     end
 
     it 'has optional scopes' do
-      Doorkeeper.configure {
+      Doorkeeper.configure do
         orm DOORKEEPER_ORM
         optional_scopes :write, :update
-      }
+      end
       expect(subject.optional_scopes).to include('write', 'update')
     end
 
@@ -74,18 +74,35 @@ describe Doorkeeper, "configuration" do
     end
   end
 
-  describe "use_refresh_token" do
-    it "is false by default" do
+  describe 'use_refresh_token' do
+    it 'is false by default' do
       expect(subject.refresh_token_enabled?).to be_false
     end
 
-    it "can change the value" do
-      Doorkeeper.configure {
+    it 'can change the value' do
+      Doorkeeper.configure do
         orm DOORKEEPER_ORM
         use_refresh_token
-      }
+      end
       expect(subject.refresh_token_enabled?).to be_true
     end
+
+    it "does not includes 'refresh_token' in authorization_response_types" do
+      expect(subject.token_grant_types).not_to include 'refresh_token'
+    end
+
+    context "is enabled" do
+      before do
+        Doorkeeper.configure {
+          orm DOORKEEPER_ORM
+          use_refresh_token
+        }
+      end
+
+      it "includes 'refresh_token' in authorization_response_types" do
+        expect(subject.token_grant_types).to include 'refresh_token'
+      end
+    end
   end
 
   describe 'client_credentials' do
@@ -93,11 +110,11 @@ describe Doorkeeper, "configuration" do
       expect(subject.client_credentials_methods).to eq([:from_basic, :from_params])
     end
 
-    it "can change the value" do
-      Doorkeeper.configure {
+    it 'can change the value' do
+      Doorkeeper.configure do
         orm DOORKEEPER_ORM
         client_credentials :from_digest, :from_params
-      }
+      end
       expect(subject.client_credentials_methods).to eq([:from_digest, :from_params])
     end
   end
@@ -107,68 +124,143 @@ describe Doorkeeper, "configuration" do
       expect(subject.access_token_methods).to eq([:from_bearer_authorization, :from_access_token_param, :from_bearer_param])
     end
 
-    it "can change the value" do
-      Doorkeeper.configure {
+    it 'can change the value' do
+      Doorkeeper.configure do
         orm DOORKEEPER_ORM
         access_token_methods :from_access_token_param, :from_bearer_param
-      }
+      end
       expect(subject.access_token_methods).to eq([:from_access_token_param, :from_bearer_param])
     end
   end
 
-  describe "enable_application_owner" do
-    it "is disabled by default" do
+  describe 'enable_application_owner' do
+    it 'is disabled by default' do
       expect(Doorkeeper.configuration.enable_application_owner?).not_to be_true
     end
 
-    context "when enabled without confirmation" do
+    context 'when enabled without confirmation' do
       before do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM
           enable_application_owner
         end
       end
-      it "adds support for application owner" do
+      it 'adds support for application owner' do
         expect(Doorkeeper::Application.new).to respond_to :owner
       end
-      it "Doorkeeper.configuration.confirm_application_owner? returns false" do
+      it 'Doorkeeper.configuration.confirm_application_owner? returns false' do
         expect(Doorkeeper.configuration.confirm_application_owner?).not_to be_true
       end
     end
 
-    context "when enabled with confirmation set to true" do
+    context 'when enabled with confirmation set to true' do
       before do
         Doorkeeper.configure do
           orm DOORKEEPER_ORM
-          enable_application_owner :confirmation => true
+          enable_application_owner confirmation: true
         end
       end
-      it "adds support for application owner" do
+      it 'adds support for application owner' do
         expect(Doorkeeper::Application.new).to respond_to :owner
       end
-      it "Doorkeeper.configuration.confirm_application_owner? returns true" do
+      it 'Doorkeeper.configuration.confirm_application_owner? returns true' do
         expect(Doorkeeper.configuration.confirm_application_owner?).to be_true
       end
     end
   end
 
-  describe "wildcard_redirect_uri" do
-    it "is disabled by default" do
+  describe 'wildcard_redirect_uri' do
+    it 'is disabled by default' do
       Doorkeeper.configuration.wildcard_redirect_uri.should be_false
     end
   end
 
-  describe "realm" do
-    it "is \"Doorkeeper\" by default" do
-      expect(Doorkeeper.configuration.realm).to eq("Doorkeeper")
+  describe 'realm' do
+    it 'is \'Doorkeeper\' by default' do
+      expect(Doorkeeper.configuration.realm).to eq('Doorkeeper')
+    end
+
+    it 'can change the value' do
+      Doorkeeper.configure do
+        orm DOORKEEPER_ORM
+        realm 'Example'
+      end
+      expect(subject.realm).to eq('Example')
+    end
+  end
+
+  describe "grant_flows" do
+    it "is set to all grant flows by default" do
+      expect(Doorkeeper.configuration.grant_flows).to eq [
+        'authorization_code',
+        'implicit',
+        'password',
+        'client_credentials'
+      ]
     end
 
     it "can change the value" do
       Doorkeeper.configure {
         orm DOORKEEPER_ORM
-        realm "Example"
+        grant_flows [ 'authorization_code', 'implicit' ]
       }
-      expect(subject.realm).to eq("Example")
+      expect(subject.grant_flows).to eq ['authorization_code', 'implicit']
+    end
+
+    context "when including 'authorization_code'" do
+      before do
+        Doorkeeper.configure {
+          orm DOORKEEPER_ORM
+          grant_flows ['authorization_code']
+        }
+      end
+
+      it "includes 'code' in authorization_response_types" do
+        expect(subject.authorization_response_types).to include 'code'
+      end
+
+      it "includes 'authorization_code' in token_grant_types" do
+        expect(subject.token_grant_types).to include 'authorization_code'
+      end
+    end
+
+    context "when including 'implicit'" do
+      before do
+        Doorkeeper.configure {
+          orm DOORKEEPER_ORM
+          grant_flows ['implicit']
+        }
+      end
+
+      it "includes 'token' in authorization_response_types" do
+        expect(subject.authorization_response_types).to include 'token'
+      end
+    end
+
+    context "when including 'password'" do
+      before do
+        Doorkeeper.configure {
+          orm DOORKEEPER_ORM
+          grant_flows ['password']
+        }
+      end
+
+      it "includes 'password' in token_grant_types" do
+        expect(subject.token_grant_types).to include 'password'
+      end
+    end
+
+    context "when including 'client_credentials'" do
+      before do
+        Doorkeeper.configure {
+          orm DOORKEEPER_ORM
+          grant_flows ['client_credentials']
+        }
+      end
+
+      it "includes 'client_credentials' in token_grant_types" do
+        expect(subject.token_grant_types).to include 'client_credentials'
+      end
     end
   end
 

data/spec/lib/models/expirable_spec.rb

@@ -15,37 +15,37 @@ describe 'Expirable' do
   end
 
   describe :expired? do
-    it "is not expired if time has not passed" do
+    it 'is not expired if time has not passed' do
       allow(subject).to receive(:expires_in).and_return(2.minutes)
       expect(subject).not_to be_expired
     end
 
-    it "is expired if time has passed" do
+    it 'is expired if time has passed' do
       allow(subject).to receive(:expires_in).and_return(10.seconds)
       expect(subject).to be_expired
     end
 
-    it "is not expired if expires_in is not set" do
+    it 'is not expired if expires_in is not set' do
       allow(subject).to receive(:expires_in).and_return(nil)
       expect(subject).not_to be_expired
     end
   end
 
   describe :expires_in_seconds do
-    it "should return the amount of time remaining until the token is expired" do
+    it 'should return the amount of time remaining until the token is expired' do
       allow(subject).to receive(:expires_in).and_return(2.minutes)
-      expect(subject.expires_in_seconds).to eq(60) 
+      expect(subject.expires_in_seconds).to eq(60)
     end
 
-    it "should return 0 when expired" do
+    it 'should return 0 when expired' do
       allow(subject).to receive(:expires_in).and_return(30.seconds)
-      expect(subject.expires_in_seconds).to eq(0) 
+      expect(subject.expires_in_seconds).to eq(0)
     end
 
-    it "should return nil when expires_in is nil" do
+    it 'should return nil when expires_in is nil' do
       allow(subject).to receive(:expires_in).and_return(nil)
       expect(subject.expires_in_seconds).to be_nil
     end
-    
+
   end
 end