doorkeeper 1.1.0 → 1.2.0

data/lib/doorkeeper/helpers/controller.rb

@@ -32,20 +32,20 @@ module Doorkeeper
 
       def get_error_response_from_exception(exception)
         error_name = case exception
-        when Errors::InvalidTokenStrategy
-          :unsupported_grant_type
-        when Errors::InvalidAuthorizationStrategy
-          :unsupported_response_type
-        when Errors::MissingRequestStrategy
-          :invalid_request
-        end
+                     when Errors::InvalidTokenStrategy
+                       :unsupported_grant_type
+                     when Errors::InvalidAuthorizationStrategy
+                       :unsupported_response_type
+                     when Errors::MissingRequestStrategy
+                       :invalid_request
+                     end
 
-        OAuth::ErrorResponse.new :name => error_name, :state => params[:state]
+        OAuth::ErrorResponse.new name: error_name, state: params[:state]
       end
 
       def handle_token_exception(exception)
         error = get_error_response_from_exception exception
-        self.headers.merge!  error.headers
+        self.headers.merge! error.headers
         self.response_body = error.body.to_json
         self.status        = error.status
       end

data/lib/doorkeeper/helpers/filter.rb

@@ -8,7 +8,7 @@ module Doorkeeper
           before_filter doorkeeper_for.filter_options do
             unless doorkeeper_for.validate_token(doorkeeper_token)
               @error = OAuth::InvalidTokenResponse.from_access_token(doorkeeper_token)
-              headers.merge!(@error.headers.reject {|k, v| ['Content-Type'].include? k })
+              headers.merge!(@error.headers.reject { |k, v| ['Content-Type'].include? k })
               render_options = doorkeeper_unauthorized_render_options
 
               if render_options.nil? || render_options.empty?

data/lib/doorkeeper/models/access_grant.rb

@@ -6,19 +6,19 @@ module Doorkeeper
     include Doorkeeper::Models::Accessible
     include Doorkeeper::Models::Scopes
 
-    belongs_to :application, :class_name => "Doorkeeper::Application", :inverse_of => :access_grants
+    belongs_to :application, class_name: 'Doorkeeper::Application', inverse_of: :access_grants
 
     if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)
       attr_accessible :resource_owner_id, :application_id, :expires_in, :redirect_uri, :scopes
     end
 
-    validates :resource_owner_id, :application_id, :token, :expires_in, :redirect_uri, :presence => true
-    validates :token, :uniqueness => true
+    validates :resource_owner_id, :application_id, :token, :expires_in, :redirect_uri, presence: true
+    validates :token, uniqueness: true
 
-    before_validation :generate_token, :on => :create
+    before_validation :generate_token, on: :create
 
     def self.authenticate(token)
-      where(:token => token).first
+      where(token: token).first
     end
 
     private

data/lib/doorkeeper/models/access_token.rb

@@ -6,32 +6,32 @@ module Doorkeeper
     include Doorkeeper::Models::Accessible
     include Doorkeeper::Models::Scopes
 
-    belongs_to :application, :class_name => "Doorkeeper::Application", :inverse_of => :access_tokens
+    belongs_to :application, class_name: 'Doorkeeper::Application', inverse_of: :access_tokens
 
-    validates :token, :presence => true
-    validates :token, :uniqueness => true
-    validates :refresh_token, :uniqueness => true, :if => :use_refresh_token?
+    validates :token, presence: true
+    validates :token, uniqueness: true
+    validates :refresh_token, uniqueness: true, if: :use_refresh_token?
 
     attr_accessor :use_refresh_token
     if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)
       attr_accessible :application_id, :resource_owner_id, :expires_in, :scopes, :use_refresh_token
     end
 
-    before_validation :generate_token, :on => :create
-    before_validation :generate_refresh_token, :on => :create, :if => :use_refresh_token?
+    before_validation :generate_token, on: :create
+    before_validation :generate_refresh_token, on: :create, if: :use_refresh_token?
 
     def self.authenticate(token)
-      where(:token => token).first
+      where(token: token).first
     end
 
     def self.by_refresh_token(refresh_token)
-      where(:refresh_token => refresh_token).first
+      where(refresh_token: refresh_token).first
     end
 
     def self.revoke_all_for(application_id, resource_owner)
-      where(:application_id => application_id,
-            :resource_owner_id => resource_owner.id,
-            :revoked_at => nil)
+      where(application_id: application_id,
+            resource_owner_id: resource_owner.id,
+            revoked_at: nil)
       .map(&:revoke)
     end
 
@@ -42,22 +42,27 @@ module Doorkeeper
     end
 
     def token_type
-      "bearer"
+      'bearer'
     end
 
     def use_refresh_token?
       self.use_refresh_token
     end
 
-    def as_json(options={})
+    def as_json(options = {})
       {
-        :resource_owner_id => self.resource_owner_id,
-        :scopes => self.scopes,
-        :expires_in_seconds => self.expires_in_seconds,
-        :application => { :uid => self.application.uid }
+        resource_owner_id: self.resource_owner_id,
+        scopes: self.scopes,
+        expires_in_seconds: self.expires_in_seconds,
+        application: { uid: self.application.uid }
       }
     end
 
+    # It indicates whether the tokens have the same credential
+    def same_credential?(access_token)
+      application_id == access_token.application_id && resource_owner_id == access_token.resource_owner_id
+    end
+
     private
 
     def generate_refresh_token
@@ -67,6 +72,5 @@ module Doorkeeper
     def generate_token
       self.token = UniqueToken.generate
     end
-
   end
 end

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

@@ -7,18 +7,18 @@ module Doorkeeper
     self.table_name = "#{self.table_name_prefix}oauth_access_tokens#{self.table_name_suffix}".to_sym
 
     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('created_at desc').
-      limit(1).
-      first
+      where(application_id: application.id,
+            resource_owner_id: resource_owner_id,
+            revoked_at: nil).
+        order('created_at desc').
+        limit(1).
+        first
     end
     private_class_method :last_authorized_token_for
   end

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

@@ -7,9 +7,9 @@ module Doorkeeper
     self.table_name = "#{self.table_name_prefix}oauth_applications#{self.table_name_suffix}".to_sym
 
     if ActiveRecord::VERSION::MAJOR >= 4
-      has_many :authorized_tokens, -> { where(revoked_at: nil) }, class_name: "AccessToken"
+      has_many :authorized_tokens, -> { where(revoked_at: nil) }, class_name: 'AccessToken'
     else
-      has_many :authorized_tokens, class_name: "AccessToken", conditions: { revoked_at: nil }
+      has_many :authorized_tokens, class_name: 'AccessToken', conditions: { revoked_at: nil }
     end
     has_many :authorized_applications, through: :authorized_tokens, source: :application
 
@@ -18,9 +18,9 @@ module Doorkeeper
     end
 
     def self.authorized_for(resource_owner)
-      joins(:authorized_applications)
-        .where(Doorkeeper::AccessToken.table_name => { resource_owner_id: resource_owner.id, revoked_at: nil })
-        .group(column_names_with_table.join(','))
+      joins(:authorized_applications).
+        where(Doorkeeper::AccessToken.table_name => { resource_owner_id: resource_owner.id, revoked_at: nil }).
+        group(column_names_with_table.join(','))
     end
   end
 end

data/lib/doorkeeper/models/application.rb

@@ -2,15 +2,14 @@ module Doorkeeper
   class Application
     include Doorkeeper::OAuth::Helpers
 
-    has_many :access_grants, :dependent => :destroy, :class_name => "Doorkeeper::AccessGrant"
-    has_many :access_tokens, :dependent => :destroy, :class_name => "Doorkeeper::AccessToken"
+    has_many :access_grants, dependent: :destroy, class_name: 'Doorkeeper::AccessGrant'
+    has_many :access_tokens, dependent: :destroy, class_name: 'Doorkeeper::AccessToken'
 
-    validates :name, :secret, :uid, :presence => true
-    validates :uid, :uniqueness => true
-    validates :redirect_uri, :redirect_uri => true
+    validates :name, :secret, :uid, presence: true
+    validates :uid, uniqueness: true
+    validates :redirect_uri, redirect_uri: true
 
-
-    before_validation :generate_uid, :generate_secret, :on => :create
+    before_validation :generate_uid, :generate_secret, on: :create
 
     if ::Rails.version.to_i < 4 || defined?(ProtectedAttributes)
       attr_accessible :name, :redirect_uri
@@ -21,11 +20,11 @@ module Doorkeeper
     end
 
     def self.authenticate(uid, secret)
-      self.where(:uid => uid, :secret => secret).first
+      self.where(uid: uid, secret: secret).first
     end
 
     def self.by_uid(uid)
-      self.where(:uid => uid).first
+      self.where(uid: uid).first
     end
 
     private

data/lib/doorkeeper/models/expirable.rb

@@ -13,7 +13,7 @@ module Doorkeeper
         return nil if expires_in.nil?
         expires = (created_at + expires_in.seconds) - Time.now
         expires_sec = expires.seconds.round(0)
-        expires_sec > 0 ? expires_sec : 0  
+        expires_sec > 0 ? expires_sec : 0
       end
       private :expired_time
     end

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

@@ -7,7 +7,7 @@ module Doorkeeper
     safe
     timestamps!
 
-    set_collection_name "oauth_access_grants"
+    set_collection_name 'oauth_access_grants'
 
     key :resource_owner_id, ObjectId
     key :application_id,    ObjectId
@@ -22,7 +22,7 @@ module Doorkeeper
     end
 
     def self.create_indexes
-      ensure_index :token, :unique => true
+      ensure_index :token, unique: true
     end
   end
 end

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

@@ -7,7 +7,7 @@ module Doorkeeper
     safe
     timestamps!
 
-    set_collection_name "oauth_access_tokens"
+    set_collection_name 'oauth_access_tokens'
 
     key :resource_owner_id, ObjectId
     key :token,             String
@@ -24,18 +24,18 @@ module Doorkeeper
     end
 
     def self.delete_all_for(application_id, resource_owner)
-      delete_all(:application_id => application_id,
-                 :resource_owner_id => resource_owner.id)
+      delete_all(application_id: application_id,
+                 resource_owner_id: resource_owner.id)
     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).
-      sort(:created_at.desc).
-      limit(1).
-      first
+      where(application_id: application.id,
+            resource_owner_id: resource_owner_id,
+            revoked_at: nil).
+        sort(:created_at.desc).
+        limit(1).
+        first
     end
     private_class_method :last_authorized_token_for
 
@@ -44,8 +44,8 @@ module Doorkeeper
     end
 
     def self.create_indexes
-      ensure_index :token, :unique => true
-      ensure_index [[:refresh_token, 1]], :unique => true, :sparse => true
+      ensure_index :token, unique: true
+      ensure_index [[:refresh_token, 1]], unique: true, sparse: true
     end
   end
 end

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

@@ -4,9 +4,9 @@ module Doorkeeper
     safe
     timestamps!
 
-    set_collection_name "oauth_applications"
+    set_collection_name 'oauth_applications'
 
-    many :authorized_tokens, :class_name => "Doorkeeper::AccessToken"
+    many :authorized_tokens, class_name: 'Doorkeeper::AccessToken'
 
     key :name,         String
     key :uid,          String
@@ -19,12 +19,12 @@ module Doorkeeper
     end
 
     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
 
     def self.create_indexes
-      ensure_index :uid, :unique => true
+      ensure_index :uid, unique: true
     end
   end
 end

data/lib/doorkeeper/models/mongoid/version.rb

@@ -3,11 +3,11 @@ module Doorkeeper
     module Mongoid
       module Version
         def mongoid3?
-          ::Mongoid::VERSION.starts_with?("3")
+          ::Mongoid::VERSION.starts_with?('3')
         end
 
         def mongoid4?
-          ::Mongoid::VERSION.starts_with?("4")
+          ::Mongoid::VERSION.starts_with?('4')
         end
       end
     end

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

@@ -10,13 +10,13 @@ module Doorkeeper
 
     self.store_in :oauth_access_grants
 
-    field :resource_owner_id, :type => Integer
-    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 :resource_owner_id, type: Integer
+    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, :unique => true
+    index :token, unique: true
   end
 end

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

@@ -10,27 +10,27 @@ module Doorkeeper
 
     self.store_in :oauth_access_tokens
 
-    field :resource_owner_id, :type => Integer
-    field :token, :type => String
-    field :expires_in, :type => Integer
-    field :revoked_at, :type => DateTime
+    field :resource_owner_id, type: Integer
+    field :token, type: String
+    field :expires_in, type: Integer
+    field :revoked_at, type: DateTime
 
-    index :token, :unique => true
-    index :refresh_token, :unique => true, :sparse => true
+    index :token, unique: true
+    index :refresh_token, 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/mongoid2/application.rb

@@ -5,17 +5,17 @@ module Doorkeeper
 
     self.store_in :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, :unique => true
+    index :uid, 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