doorkeeper 1.1.0 → 1.2.0

data/lib/doorkeeper/models/mongoid3_4/access_grant.rb

@@ -13,16 +13,16 @@ module Doorkeeper
     self.store_in collection: :oauth_access_grants
 
     if defined?(Moped::BSON)
-      field :resource_owner_id, :type => Moped::BSON::ObjectId
+      field :resource_owner_id, type: Moped::BSON::ObjectId
     else
-      field :resource_owner_id, :type => BSON::ObjectId
+      field :resource_owner_id, type: BSON::ObjectId
     end
 
-    field :application_id, :type => Hash
-    field :token, :type => String
-    field :expires_in, :type => Integer
-    field :redirect_uri, :type => String
-    field :revoked_at, :type => DateTime
+    field :application_id, type: Hash
+    field :token, type: String
+    field :expires_in, type: Integer
+    field :redirect_uri, type: String
+    field :revoked_at, type: DateTime
 
     index({ token: 1 }, { unique: true })
   end

data/lib/doorkeeper/models/mongoid3_4/access_token.rb

@@ -13,31 +13,31 @@ module Doorkeeper
     self.store_in collection: :oauth_access_tokens
 
     if defined?(Moped::BSON)
-      field :resource_owner_id, :type => Moped::BSON::ObjectId
+      field :resource_owner_id, type: Moped::BSON::ObjectId
     else
-      field :resource_owner_id, :type => BSON::ObjectId
+      field :resource_owner_id, type: BSON::ObjectId
     end
 
-    field :token, :type => String
-    field :expires_in, :type => Integer
-    field :revoked_at, :type => DateTime
+    field :token, type: String
+    field :expires_in, type: Integer
+    field :revoked_at, type: DateTime
 
     index({ token: 1 }, { unique: true })
     index({ refresh_token: 1 }, { unique: true, sparse: true })
 
     def self.delete_all_for(application_id, resource_owner)
-      where(:application_id => application_id,
-            :resource_owner_id => resource_owner.id).delete_all
+      where(application_id: application_id,
+            resource_owner_id: resource_owner.id).delete_all
     end
     private_class_method :delete_all_for
 
     def self.last_authorized_token_for(application, resource_owner_id)
-      where(:application_id => application.id,
-            :resource_owner_id => resource_owner_id,
-            :revoked_at => nil).
-      order_by([:created_at, :desc]).
-      limit(1).
-      first
+      where(application_id: application.id,
+            resource_owner_id: resource_owner_id,
+            revoked_at: nil).
+        order_by([:created_at, :desc]).
+        limit(1).
+        first
     end
     private_class_method :last_authorized_token_for
 

data/lib/doorkeeper/models/mongoid3_4/application.rb

@@ -5,17 +5,17 @@ module Doorkeeper
 
     self.store_in collection: :oauth_applications
 
-    field :name, :type => String
-    field :uid, :type => String
-    field :secret, :type => String
-    field :redirect_uri, :type => String
+    field :name, type: String
+    field :uid, type: String
+    field :secret, type: String
+    field :redirect_uri, type: String
 
     index({ uid: 1 }, { unique: true })
 
-    has_many :authorized_tokens, :class_name => "Doorkeeper::AccessToken"
+    has_many :authorized_tokens, class_name: 'Doorkeeper::AccessToken'
 
     def self.authorized_for(resource_owner)
-      ids = AccessToken.where(:resource_owner_id => resource_owner.id, :revoked_at => nil).map(&:application_id)
+      ids = AccessToken.where(resource_owner_id: resource_owner.id, revoked_at: nil).map(&:application_id)
       find(ids)
     end
   end

data/lib/doorkeeper/models/ownership.rb

@@ -3,14 +3,14 @@ module Doorkeeper
     module Ownership
       def validate_owner?
         Doorkeeper.configuration.confirm_application_owner?
-      end    
-  
+      end
+
       def self.included(base)
         base.class_eval do
-          belongs_to :owner, :polymorphic => true
-          validates :owner, :presence => true, :if => :validate_owner?      
+          belongs_to :owner, polymorphic: true
+          validates :owner, presence: true, if: :validate_owner?
         end
       end
     end
   end
-end
+end

data/lib/doorkeeper/oauth/authorization/code.rb

@@ -11,11 +11,11 @@ module Doorkeeper
 
         def issue_token
           @token ||= AccessGrant.create!(
-            :application_id    => pre_auth.client.id,
-            :resource_owner_id => resource_owner.id,
-            :expires_in        => configuration.authorization_code_expires_in,
-            :redirect_uri      => pre_auth.redirect_uri,
-            :scopes            => pre_auth.scopes.to_s
+            application_id: pre_auth.client.id,
+            resource_owner_id: resource_owner.id,
+            expires_in: configuration.authorization_code_expires_in,
+            redirect_uri: pre_auth.redirect_uri,
+            scopes: pre_auth.scopes.to_s
           )
         end
 

data/lib/doorkeeper/oauth/authorization/token.rb

@@ -10,13 +10,13 @@ module Doorkeeper
         end
 
         def issue_token
-          @token ||= AccessToken.create!({
-            :application_id    => pre_auth.client.id,
-            :resource_owner_id => resource_owner.id,
-            :scopes            => pre_auth.scopes.to_s,
-            :expires_in        => configuration.access_token_expires_in,
-            :use_refresh_token => false
-          })
+          @token ||= AccessToken.create!(
+            application_id: pre_auth.client.id,
+            resource_owner_id: resource_owner.id,
+            scopes: pre_auth.scopes.to_s,
+            expires_in: configuration.access_token_expires_in,
+            use_refresh_token: false
+          )
         end
 
         def configuration

data/lib/doorkeeper/oauth/authorization_code_request.rb

@@ -3,10 +3,10 @@ module Doorkeeper
     class AuthorizationCodeRequest
       include Doorkeeper::Validations
 
-      validate :attributes,   :error => :invalid_request
-      validate :client,       :error => :invalid_client
-      validate :grant,        :error => :invalid_grant
-      validate :redirect_uri, :error => :invalid_grant
+      validate :attributes,   error: :invalid_request
+      validate :client,       error: :invalid_client
+      validate :grant,        error: :invalid_grant
+      validate :redirect_uri, error: :invalid_grant
 
       attr_accessor :server, :grant, :client, :redirect_uri, :access_token
 
@@ -20,28 +20,27 @@ module Doorkeeper
       def authorize
         validate
         @response = if valid?
-          grant.revoke
-          issue_token
-          TokenResponse.new access_token
-        else
-          ErrorResponse.from_request self
-        end
+                      grant.revoke
+                      issue_token
+                      TokenResponse.new access_token
+                    else
+                      ErrorResponse.from_request self
+                    end
       end
 
       def valid?
-        self.error.nil?
+        error.nil?
       end
 
-    private
+      private
 
       def issue_token
-        @access_token = Doorkeeper::AccessToken.create!({
-          :application_id    => grant.application_id,
-          :resource_owner_id => grant.resource_owner_id,
-          :scopes            => grant.scopes_string,
-          :expires_in        => server.access_token_expires_in,
-          :use_refresh_token => server.refresh_token_enabled?
-        })
+        @access_token = Doorkeeper::AccessToken.create!(
+          application_id:    grant.application_id,
+          resource_owner_id: grant.resource_owner_id,
+          scopes:            grant.scopes_string,
+          expires_in:        server.access_token_expires_in,
+          use_refresh_token: server.refresh_token_enabled?)
       end
 
       def validate_attributes

data/lib/doorkeeper/oauth/client.rb

@@ -17,7 +17,7 @@ module Doorkeeper
         end
       end
 
-      delegate :id, :name, :uid, :redirect_uri, :to => :@application
+      delegate :id, :name, :uid, :redirect_uri, to: :@application
 
       def initialize(application)
         @application = application

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

@@ -3,10 +3,10 @@ module Doorkeeper
     class ClientCredentialsRequest
       class Creator
         def call(client, scopes, attributes = {})
-          Doorkeeper::AccessToken.create(attributes.merge({
-            :application_id => client.id,
-            :scopes         => scopes.to_s
-          }))
+          Doorkeeper::AccessToken.create(attributes.merge(
+            application_id: client.id,
+            scopes: scopes.to_s
+          ))
         end
       end
     end

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

@@ -24,10 +24,12 @@ module Doorkeeper
         private
 
         def create_token(client, scopes, creator)
-          creator.call(client, scopes, {
-            :use_refresh_token => false,
-            :expires_in        => @server.access_token_expires_in
-          })
+          creator.call(
+            client,
+            scopes,
+            use_refresh_token: false,
+            expires_in: @server.access_token_expires_in
+          )
         end
       end
     end

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

@@ -9,8 +9,8 @@ module Doorkeeper
         include Doorkeeper::Validations
         include Doorkeeper::OAuth::Helpers
 
-        validate :client, :error => :invalid_client
-        validate :scopes, :error => :invalid_scope
+        validate :client, error: :invalid_client
+        validate :scopes, error: :invalid_scope
 
         def initialize(server, request)
           @server, @request = server, request

data/lib/doorkeeper/oauth/client_credentials_request.rb

@@ -1,7 +1,3 @@
-require 'doorkeeper/oauth/error'
-require 'doorkeeper/oauth/error_response'
-require 'doorkeeper/oauth/scopes'
-require 'doorkeeper/oauth/token_response'
 require 'doorkeeper/oauth/client_credentials/creator'
 require 'doorkeeper/oauth/client_credentials/issuer'
 require 'doorkeeper/oauth/client_credentials/validation'
@@ -10,10 +6,10 @@ module Doorkeeper
   module OAuth
     class ClientCredentialsRequest
       attr_accessor :issuer, :server, :client, :original_scopes, :scopes
-      attr_reader   :response
-      alias         :error_response :response
+      attr_reader :response
+      alias :error_response :response
 
-      delegate :error, :to => :issuer
+      delegate :error, to: :issuer
 
       def issuer
         @issuer ||= Issuer.new(server, Validation.new(server, self))
@@ -28,19 +24,19 @@ module Doorkeeper
       def authorize
         status = issuer.create(client, scopes)
         @response = if status
-          TokenResponse.new(issuer.token)
-        else
-          ErrorResponse.from_request(self)
-        end
+                      TokenResponse.new(issuer.token)
+                    else
+                      ErrorResponse.from_request(self)
+                    end
       end
 
       # TODO: duplicated code in all flows
       def scopes
         @scopes ||= if @original_scopes.present?
-          Doorkeeper::OAuth::Scopes.from_string(@original_scopes)
-        else
-          server.default_scopes
-        end
+                      Doorkeeper::OAuth::Scopes.from_string(@original_scopes)
+                    else
+                      server.default_scopes
+                    end
       end
     end
   end

data/lib/doorkeeper/oauth/code_request.rb

@@ -10,18 +10,19 @@ module Doorkeeper
       end
 
       def authorize
-        @response = if pre_auth.authorizable?
+        if pre_auth.authorizable?
           auth = Authorization::Code.new(pre_auth, resource_owner)
           auth.issue_token
-          CodeResponse.new pre_auth, auth
+          @response = CodeResponse.new pre_auth, auth
         else
-          ErrorResponse.from_request pre_auth
+          @response = ErrorResponse.from_request pre_auth
         end
       end
 
       def deny
         pre_auth.error = :access_denied
-        ErrorResponse.from_request(pre_auth, :redirect_uri => pre_auth.redirect_uri)
+        ErrorResponse.from_request pre_auth,
+                                   redirect_uri: pre_auth.redirect_uri
       end
     end
   end

data/lib/doorkeeper/oauth/code_response.rb

@@ -21,14 +21,15 @@ module Doorkeeper
           "/oauth/authorize/#{auth.token.token}"
         else
           if response_on_fragment
-            uri_with_fragment(pre_auth.redirect_uri, {
-              :access_token => auth.token.token,
-              :token_type   => auth.token.token_type,
-              :expires_in   => auth.token.expires_in,
-              :state        => pre_auth.state
-            })
+            uri_with_fragment(
+              pre_auth.redirect_uri,
+              access_token: auth.token.token,
+              token_type: auth.token.token_type,
+              expires_in: auth.token.expires_in,
+              state: pre_auth.state
+            )
           else
-            uri_with_query pre_auth.redirect_uri, :code => auth.token.token, :state => pre_auth.state
+            uri_with_query pre_auth.redirect_uri, code: auth.token.token, state: pre_auth.state
           end
         end
       end

data/lib/doorkeeper/oauth/error.rb

@@ -2,7 +2,7 @@ module Doorkeeper
   module OAuth
     class Error < Struct.new(:name, :state)
       def description
-        I18n.translate name, :scope => [:doorkeeper, :errors, :messages]
+        I18n.translate name, scope: [:doorkeeper, :errors, :messages]
       end
     end
   end

data/lib/doorkeeper/oauth/error_response.rb

@@ -6,10 +6,10 @@ module Doorkeeper
 
       def self.from_request(request, attributes = {})
         state = request.state if request.respond_to?(:state)
-        new(attributes.merge(:name => request.error, :state => state))
+        new(attributes.merge(name: request.error, state: state))
       end
 
-      delegate :name, :description, :state, :to => :@error
+      delegate :name, :description, :state, to: :@error
 
       def initialize(attributes = {})
         @error = Doorkeeper::OAuth::Error.new(*attributes.values_at(:name, :state))
@@ -18,7 +18,7 @@ module Doorkeeper
       end
 
       def body
-        { :error => name, :error_description => description, :state => state }.reject { |k, v| v.blank? }
+        { error: name, error_description: description, state: state }.reject { |k, v| v.blank? }
       end
 
       def status
@@ -38,7 +38,7 @@ module Doorkeeper
       end
 
       def authenticate_info
-        %{Bearer realm="#{realm}", error="#{name}", error_description="#{description}"}
+        %(Bearer realm="#{realm}", error="#{name}", error_description="#{description}")
       end
 
       def headers
@@ -50,7 +50,7 @@ module Doorkeeper
 
       protected
 
-      delegate :realm, :to => :configuration
+      delegate :realm, to: :configuration
 
       def configuration
         Doorkeeper.configuration

data/lib/doorkeeper/oauth/helpers/uri_checker.rb

@@ -21,7 +21,7 @@ module Doorkeeper
         end
 
         def self.valid_for_authorization?(url, client_url)
-          valid?(url) && client_url.split.any?{|other_url| matches?(url, other_url) }
+          valid?(url) && client_url.split.any? { |other_url| matches?(url, other_url) }
         end
 
         def self.as_uri(url)

data/lib/doorkeeper/oauth/invalid_token_response.rb

@@ -3,24 +3,24 @@ module Doorkeeper
     class InvalidTokenResponse < ErrorResponse
       def self.from_access_token(access_token, attributes = {})
         reason = case
-          when access_token.try(:revoked?)
-            :revoked
-          when access_token.try(:expired?)
-            :expired
-          else
-            :unknown
-          end
+                 when access_token.try(:revoked?)
+                   :revoked
+                 when access_token.try(:expired?)
+                   :expired
+                 else
+                   :unknown
+                 end
 
-        new(attributes.merge(:reason => reason))
+        new(attributes.merge(reason: reason))
       end
 
       def initialize(attributes = {})
-        super(attributes.merge(:name => :invalid_token, :state => :unauthorized))
+        super(attributes.merge(name: :invalid_token, state: :unauthorized))
         @reason = attributes[:reason] || :unknown
       end
 
       def description
-        @description ||= I18n.translate @reason, :scope => [:doorkeeper, :errors, :messages, :invalid_token]
+        @description ||= I18n.translate @reason, scope: [:doorkeeper, :errors, :messages, :invalid_token]
       end
     end
   end