doorkeeper 1.1.0 → 1.2.0

data/app/helpers/doorkeeper/form_errors_helper.rb

@@ -1,8 +1,8 @@
 module Doorkeeper::FormErrorsHelper
-  def errors_for(object, method)
+  def doorkeeper_errors_for(object, method)
     if object.errors[method].present?
       object.errors[method].map do |msg|
-        content_tag(:span, :class => "help-block") do
+        content_tag(:span, class: 'help-block') do
           msg.capitalize
         end
       end.reduce(&:join).html_safe

data/app/validators/redirect_uri_validator.rb

@@ -21,7 +21,7 @@ class RedirectUriValidator < ActiveModel::EachValidator
     record.errors.add(attribute, :invalid_uri)
   end
 
-private
+  private
 
   def test_redirect_uri?(uri)
     self.class.test_redirect_uri.present? && uri.to_s == self.class.test_redirect_uri.to_s

data/app/views/doorkeeper/applications/_form.html.erb

@@ -7,7 +7,7 @@
     <%= f.label :name, class: 'col-sm-2 control-label', for: 'application_name' %>
     <div class="col-sm-10">
       <%= f.text_field :name, class: 'form-control' %>
-      <%= errors_for application, :name %>
+      <%= doorkeeper_errors_for application, :name %>
     </div>
   <% end %>
 
@@ -15,7 +15,7 @@
     <%= f.label :redirect_uri, class: 'col-sm-2 control-label', for: 'application_redirect_uri' %>
     <div class="col-sm-10">
       <%= f.text_area :redirect_uri, class: 'form-control' %>
-      <%= errors_for application, :redirect_uri %>
+      <%= doorkeeper_errors_for application, :redirect_uri %>
       <span class="help-block">
          Use one line per URI
         </span>
@@ -29,7 +29,7 @@
 
   <div class="form-group">
     <div class="col-sm-offset-2 col-sm-10">
-      <%= f.submit 'Submit', :class => "btn btn-primary" %>
+      <%= f.submit 'Submit', class: "btn btn-primary" %>
       <%= link_to "Cancel", oauth_applications_path, :class => "btn btn-default" %>
     </div>
   </div>

data/app/views/doorkeeper/applications/edit.html.erb

@@ -2,4 +2,4 @@
   <h1>Edit application</h1>
 </div>
 
-<%= render 'form', :application => @application %>
+<%= render 'form', application: @application %>

data/app/views/doorkeeper/applications/new.html.erb

@@ -2,4 +2,4 @@
   <h1>New application</h1>
 </div>
 
-<%= render 'form', :application => @application %>
+<%= render 'form', application: @application %>

data/app/views/doorkeeper/applications/show.html.erb

@@ -21,7 +21,7 @@
             <code><%= uri %></code>
           </td>
           <td>
-            <%= link_to 'Authorize', oauth_authorization_path(:client_id => @application.uid, :redirect_uri => uri, :response_type => 'code'), class: 'btn btn-success', target: '_blank' %>
+            <%= link_to 'Authorize', oauth_authorization_path(client_id: @application.uid, redirect_uri: uri, response_type: 'code'), class: 'btn btn-success', target: '_blank' %>
           </td>
         </tr>
       <% end %>

data/app/views/doorkeeper/authorizations/new.html.erb

@@ -13,28 +13,28 @@
 
       <ul class="text-info">
         <% @pre_auth.scopes.each do |scope| %>
-          <li><%= t scope, :scope => [:doorkeeper, :scopes] %></li>
+          <li><%= t scope, scope: [:doorkeeper, :scopes] %></li>
         <% end %>
       </ul>
     </div>
   <% end %>
 
   <div class="actions">
-    <%= form_tag oauth_authorization_path, :method => :post do %>
+    <%= form_tag oauth_authorization_path, method: :post do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
       <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag "Authorize", :class => "btn btn-success btn-lg btn-block" %>
+      <%= submit_tag "Authorize", class: "btn btn-success btn-lg btn-block" %>
     <% end %>
-    <%= form_tag oauth_authorization_path, :method => :delete do %>
+    <%= form_tag oauth_authorization_path, method: :delete do %>
       <%= hidden_field_tag :client_id, @pre_auth.client.uid %>
       <%= hidden_field_tag :redirect_uri, @pre_auth.redirect_uri %>
       <%= hidden_field_tag :state, @pre_auth.state %>
       <%= hidden_field_tag :response_type, @pre_auth.response_type %>
       <%= hidden_field_tag :scope, @pre_auth.scope %>
-      <%= submit_tag "Deny", :class => "btn btn-danger btn-lg btn-block" %>
+      <%= submit_tag "Deny", class: "btn btn-danger btn-lg btn-block" %>
     <% end %>
   </div>
 </main>

data/doorkeeper.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.version     = Doorkeeper::VERSION
   s.authors     = ["Felipe Elias Philipp", "Piotr Jakubowski"]
   s.email       = ["felipe@applicake.com", "piotr.jakubowski@applicake.com"]
-  s.homepage    = "https://github.com/applicake/doorkeeper"
+  s.homepage    = "https://github.com/doorkeeper-gem/doorkeeper"
   s.summary     = "Doorkeeper is an OAuth 2 provider for Rails."
   s.description = "Doorkeeper is an OAuth 2 provider for Rails."
   s.license     = 'MIT'

data/lib/doorkeeper.rb

@@ -1,45 +1,45 @@
-require "doorkeeper/version"
-require "doorkeeper/engine"
-require "doorkeeper/config"
-require "doorkeeper/doorkeeper_for"
+require 'doorkeeper/version'
+require 'doorkeeper/engine'
+require 'doorkeeper/config'
+require 'doorkeeper/doorkeeper_for'
 
 require 'doorkeeper/errors'
 require 'doorkeeper/server'
 require 'doorkeeper/request'
-require "doorkeeper/validations"
-
-require "doorkeeper/oauth/authorization/code"
-require "doorkeeper/oauth/authorization/token"
-require "doorkeeper/oauth/authorization/uri_builder"
-require "doorkeeper/oauth/helpers/scope_checker"
-require "doorkeeper/oauth/helpers/uri_checker"
-require "doorkeeper/oauth/helpers/unique_token"
-
-require "doorkeeper/oauth/scopes"
-require "doorkeeper/oauth/error"
-require "doorkeeper/oauth/code_response"
-require "doorkeeper/oauth/token_response"
-require "doorkeeper/oauth/error_response"
-require "doorkeeper/oauth/pre_authorization"
-require "doorkeeper/oauth/authorization_code_request"
-require "doorkeeper/oauth/refresh_token_request"
-require "doorkeeper/oauth/password_access_token_request"
-require "doorkeeper/oauth/client_credentials_request"
-require "doorkeeper/oauth/code_request"
-require "doorkeeper/oauth/token_request"
-require "doorkeeper/oauth/client"
-require "doorkeeper/oauth/token"
-require "doorkeeper/oauth/invalid_token_response"
+require 'doorkeeper/validations'
+
+require 'doorkeeper/oauth/authorization/code'
+require 'doorkeeper/oauth/authorization/token'
+require 'doorkeeper/oauth/authorization/uri_builder'
+require 'doorkeeper/oauth/helpers/scope_checker'
+require 'doorkeeper/oauth/helpers/uri_checker'
+require 'doorkeeper/oauth/helpers/unique_token'
+
+require 'doorkeeper/oauth/scopes'
+require 'doorkeeper/oauth/error'
+require 'doorkeeper/oauth/code_response'
+require 'doorkeeper/oauth/token_response'
+require 'doorkeeper/oauth/error_response'
+require 'doorkeeper/oauth/pre_authorization'
+require 'doorkeeper/oauth/authorization_code_request'
+require 'doorkeeper/oauth/refresh_token_request'
+require 'doorkeeper/oauth/password_access_token_request'
+require 'doorkeeper/oauth/client_credentials_request'
+require 'doorkeeper/oauth/code_request'
+require 'doorkeeper/oauth/token_request'
+require 'doorkeeper/oauth/client'
+require 'doorkeeper/oauth/token'
+require 'doorkeeper/oauth/invalid_token_response'
 
 require 'doorkeeper/models/scopes'
 require 'doorkeeper/models/expirable'
 require 'doorkeeper/models/revocable'
 require 'doorkeeper/models/accessible'
 
-require "doorkeeper/helpers/filter"
-require "doorkeeper/helpers/controller"
+require 'doorkeeper/helpers/filter'
+require 'doorkeeper/helpers/controller'
 
-require "doorkeeper/rails/routes"
+require 'doorkeeper/rails/routes'
 
 module Doorkeeper
   def self.configured?

data/lib/doorkeeper/config.rb

@@ -1,7 +1,7 @@
 module Doorkeeper
   class MissingConfiguration < StandardError
     def initialize
-      super("Configuration for doorkeeper missing. Do you have doorkeeper initializer?")
+      super('Configuration for doorkeeper missing. Do you have doorkeeper initializer?')
     end
   end
 
@@ -12,17 +12,16 @@ module Doorkeeper
   end
 
   def self.configuration
-    @config || (raise MissingConfiguration.new)
+    @config || (fail MissingConfiguration.new)
   end
 
   def self.orm_model_dir
     case configuration.orm
     when :mongoid3, :mongoid4
-      "mongoid3_4"
+      'mongoid3_4'
     else
       configuration.orm
     end
-
   end
 
   def self.enable_orm
@@ -50,42 +49,41 @@ module Doorkeeper
         @config
       end
 
-      def enable_application_owner(opts={})
-        @config.instance_variable_set("@enable_application_owner", true)
+      def enable_application_owner(opts = {})
+        @config.instance_variable_set('@enable_application_owner', true)
         confirm_application_owner if opts[:confirmation].present? && opts[:confirmation]
       end
 
       def confirm_application_owner
-        @config.instance_variable_set("@confirm_application_owner", true)
+        @config.instance_variable_set('@confirm_application_owner', true)
       end
 
       def default_scopes(*scopes)
-        @config.instance_variable_set("@default_scopes", Doorkeeper::OAuth::Scopes.from_array(scopes))
+        @config.instance_variable_set('@default_scopes', Doorkeeper::OAuth::Scopes.from_array(scopes))
       end
 
       def optional_scopes(*scopes)
-        @config.instance_variable_set("@optional_scopes", Doorkeeper::OAuth::Scopes.from_array(scopes))
+        @config.instance_variable_set('@optional_scopes', Doorkeeper::OAuth::Scopes.from_array(scopes))
       end
 
       def client_credentials(*methods)
-        @config.instance_variable_set("@client_credentials", methods)
+        @config.instance_variable_set('@client_credentials', methods)
       end
 
       def access_token_methods(*methods)
-        @config.instance_variable_set("@access_token_methods", methods)
+        @config.instance_variable_set('@access_token_methods', methods)
       end
 
       def use_refresh_token
-        @config.instance_variable_set("@refresh_token_enabled", true)
+        @config.instance_variable_set('@refresh_token_enabled', true)
       end
 
       def realm(realm)
-        @config.instance_variable_set("@realm", realm)
+        @config.instance_variable_set('@realm', realm)
       end
     end
 
     module Option
-
       # Defines configuration option
       #
       # When you call option, it defines two methods. One method will take place
@@ -109,9 +107,9 @@ module Doorkeeper
       # ==== Examples
       #
       #    option :name
-      #    option :name, :as => :set_name
-      #    option :name, :default => "My Name"
-      #    option :scopes :builder_class => ScopesBuilder
+      #    option :name, as: :set_name
+      #    option :name, default: 'My Name'
+      #    option :scopes builder_class: ScopesBuilder
       #
       def option(name, options = {})
         attribute = options[:as] || name
@@ -121,10 +119,10 @@ module Doorkeeper
           define_method name do |*args, &block|
             # TODO: is builder_class option being used?
             value = unless attribute_builder
-              block ? block : args.first
-            else
-              attribute_builder.new(&block).build
-            end
+                      block ? block : args.first
+                    else
+                      attribute_builder.new(&block).build
+                    end
 
             @config.instance_variable_set(:"@#{attribute}", value)
           end
@@ -149,27 +147,29 @@ module Doorkeeper
     extend Option
 
     option :resource_owner_authenticator,
-           :as => :authenticate_resource_owner,
-           :default => lambda{|routes|
+           as: :authenticate_resource_owner,
+           default: (lambda do |routes|
              logger.warn(I18n.translate('doorkeeper.errors.messages.resource_owner_authenticator_not_configured'))
              nil
-           }
+           end)
     option :admin_authenticator,
-           :as => :authenticate_admin,
-           :default => lambda{|routes| }
+           as: :authenticate_admin,
+           default: ->(routes) {}
     option :resource_owner_from_credentials,
-           :default => lambda{|routes|
+           default: (lambda do |routes|
              warn(I18n.translate('doorkeeper.errors.messages.credential_flow_not_configured'))
              nil
-           }
-    option :skip_authorization, :default => lambda{|routes|}
-    option :access_token_expires_in,      :default => 7200
-    option :authorization_code_expires_in,:default => 600
-    option :orm, :default => :active_record
-    option :test_redirect_uri, :default => 'urn:ietf:wg:oauth:2.0:oob'
-    option :active_record_options, :default => {}
-    option :realm, :default => "Doorkeeper"
-    option :wildcard_redirect_uri, :default => false
+           end)
+    option :skip_authorization,            default: ->(routes) {}
+    option :access_token_expires_in,       default: 7200
+    option :authorization_code_expires_in, default: 600
+    option :orm,                           default: :active_record
+    option :test_redirect_uri,             default: 'urn:ietf:wg:oauth:2.0:oob'
+    option :active_record_options,         default: {}
+    option :realm,                         default: 'Doorkeeper'
+    option :wildcard_redirect_uri,         default: false
+    option :grant_flows,
+           default: %w(authorization_code implicit password client_credentials)
 
     def refresh_token_enabled?
       !!@refresh_token_enabled
@@ -208,7 +208,36 @@ module Doorkeeper
     end
 
     def realm
-      @realm ||= "Doorkeeper"
+      @realm ||= 'Doorkeeper'
+    end
+
+    def authorization_response_types
+      @authorization_response_types ||= calculate_authorization_response_types
+    end
+
+    def token_grant_types
+      @token_grant_types ||= calculate_token_grant_types
+    end
+
+  private
+
+    # Determines what values are acceptable for 'response_type' param in
+    # authorization request endpoint, and return them as an array of strings.
+    #
+    def calculate_authorization_response_types
+      types = []
+      types << 'code'  if grant_flows.include? 'authorization_code'
+      types << 'token' if grant_flows.include? 'implicit'
+      types
+    end
+
+    # Determines what values are acceptable for 'grant_type' param token
+    # request endpoint, and return them in array.
+    #
+    def calculate_token_grant_types
+      types = grant_flows - ['implicit']
+      types << 'refresh_token' if refresh_token_enabled?
+      types
     end
   end
 end

data/lib/doorkeeper/doorkeeper_for.rb

@@ -3,7 +3,7 @@ module Doorkeeper
   class DoorkeeperFor
     def initialize(options)
       options ||= {}
-      raise InvalidSyntax unless options.is_a? Hash
+      fail InvalidSyntax unless options.is_a? Hash
       @filter_options = {}
 
       options.each do |k, v|
@@ -14,7 +14,7 @@ module Doorkeeper
     # TODO: move this to Token class
     def validate_token(token)
       return false unless token
-      token.accessible? and validate_token_scopes(token)
+      token.accessible? && validate_token_scopes(token)
     end
 
     def filter_options
@@ -22,6 +22,7 @@ module Doorkeeper
     end
 
     private
+
     def scopes(scopes)
       @scopes = scopes.map(&:to_s)
     end
@@ -43,6 +44,7 @@ module Doorkeeper
 
   class AllDoorkeeperFor < DoorkeeperFor
     private
+
     def except(actions)
       @filter_options[:except] = actions
     end
@@ -56,6 +58,7 @@ module Doorkeeper
     end
 
     private
+
     def only(actions)
       @filter_options[:only] = actions
     end
@@ -67,7 +70,7 @@ module Doorkeeper
       when :all
         AllDoorkeeperFor.new(args[1] || {})
       when Hash, nil
-        raise InvalidSyntax
+        fail InvalidSyntax
       else
         SelectedDoorkeeperFor.new(*args)
       end

data/lib/doorkeeper/engine.rb

@@ -1,11 +1,11 @@
 module Doorkeeper
   class Engine < Rails::Engine
-    initializer "doorkeeper.routes" do
+    initializer 'doorkeeper.routes' do
       Doorkeeper::Rails::Routes.warn_if_using_mount_method!
       Doorkeeper::Rails::Routes.install!
     end
 
-    initializer "doorkeeper.helpers" do
+    initializer 'doorkeeper.helpers' do
       ActiveSupport.on_load(:action_controller) do
         include Doorkeeper::Helpers::Filter
       end