doorkeeper 1.4.2 → 2.0.0.alpha1

data/lib/doorkeeper/orm/mongo_mapper.rb

@@ -0,0 +1,11 @@
+module Doorkeeper
+  module Orm
+    module MongoMapper
+      def self.initialize_models!
+        require 'doorkeeper/orm/mongo_mapper/access_grant'
+        require 'doorkeeper/orm/mongo_mapper/access_token'
+        require 'doorkeeper/orm/mongo_mapper/application'
+      end
+    end
+  end
+end

data/lib/doorkeeper/{models → orm}/mongo_mapper/access_grant.rb

@@ -1,6 +1,9 @@
 module Doorkeeper
   class AccessGrant
     include MongoMapper::Document
+
+    include AccessGrantMixin
+
     safe
     timestamps!
 
@@ -9,14 +12,10 @@ module Doorkeeper
     key :resource_owner_id, ObjectId
     key :application_id,    ObjectId
     key :token,             String
+    key :scopes,            String
     key :expires_in,        Integer
     key :redirect_uri,      String
     key :revoked_at,        DateTime
-    key :scopes,            String
-
-    def scopes=(value)
-      write_attribute :scopes, value if value.present?
-    end
 
     def self.create_indexes
       ensure_index :token, unique: true

data/lib/doorkeeper/{models → orm}/mongo_mapper/access_token.rb

@@ -1,21 +1,22 @@
 module Doorkeeper
   class AccessToken
     include MongoMapper::Document
+
+    include AccessTokenMixin
+
     safe
     timestamps!
 
     set_collection_name 'oauth_access_tokens'
 
     key :resource_owner_id, ObjectId
+    key :application_id,    ObjectId
     key :token,             String
+    key :refresh_token,     String
     key :expires_in,        Integer
     key :revoked_at,        DateTime
     key :scopes,            String
 
-    def scopes=(value)
-      write_attribute :scopes, value if value.present?
-    end
-
     def self.last
       self.sort(:created_at).last
     end
@@ -36,10 +37,6 @@ module Doorkeeper
     end
     private_class_method :last_authorized_token_for
 
-    def refresh_token
-      self[:refresh_token]
-    end
-
     def self.create_indexes
       ensure_index :token, unique: true
       ensure_index [[:refresh_token, 1]], unique: true, sparse: true

data/lib/doorkeeper/{models → orm}/mongo_mapper/application.rb

@@ -1,6 +1,9 @@
 module Doorkeeper
   class Application
     include MongoMapper::Document
+
+    include ApplicationMixin
+
     safe
     timestamps!
 
@@ -14,10 +17,6 @@ module Doorkeeper
     key :redirect_uri, String
     key :scopes,       String
 
-    def scopes=(value)
-      write_attribute :scopes, value if value.present?
-    end
-
     def self.authorized_for(resource_owner)
       ids = AccessToken.where(resource_owner_id: resource_owner.id, revoked_at: nil).map(&:application_id)
       find(ids)

data/lib/doorkeeper/orm/mongoid2.rb

@@ -0,0 +1,11 @@
+module Doorkeeper
+  module Orm
+    module Mongoid2
+      def self.initialize_models!
+        require 'doorkeeper/orm/mongoid2/access_grant'
+        require 'doorkeeper/orm/mongoid2/access_token'
+        require 'doorkeeper/orm/mongoid2/application'
+      end
+    end
+  end
+end

data/lib/doorkeeper/{models → orm}/mongoid2/access_grant.rb

@@ -1,15 +1,17 @@
-require 'doorkeeper/models/mongoid/scopes'
+require 'doorkeeper/orm/mongoid2/concerns/scopes'
 
 module Doorkeeper
   class AccessGrant
     include Mongoid::Document
     include Mongoid::Timestamps
-    include Models::Mongoid::Scopes
+
+    include AccessGrantMixin
+    include Models::Mongoid2::Scopes
 
     self.store_in :oauth_access_grants
 
     field :resource_owner_id, type: Integer
-    field :application_id, type: Hash
+    field :application_id, type: BSON::ObjectId
     field :token, type: String
     field :expires_in, type: Integer
     field :redirect_uri, type: String

data/lib/doorkeeper/{models → orm}/mongoid2/access_token.rb

@@ -1,15 +1,19 @@
-require 'doorkeeper/models/mongoid/scopes'
+require 'doorkeeper/orm/mongoid2/concerns/scopes'
 
 module Doorkeeper
   class AccessToken
     include Mongoid::Document
     include Mongoid::Timestamps
-    include Models::Mongoid::Scopes
+
+    include AccessTokenMixin
+    include Models::Mongoid2::Scopes
 
     self.store_in :oauth_access_tokens
 
     field :resource_owner_id, type: Integer
+    field :application_id, type: BSON::ObjectId
     field :token, type: String
+    field :refresh_token, type: String
     field :expires_in, type: Integer
     field :revoked_at, type: DateTime
 
@@ -22,18 +26,11 @@ module Doorkeeper
     end
     private_class_method :delete_all_for
 
-    def self.last_authorized_token_for(application_id, 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
+    def self.order_method
+      :order_by
     end
-    private_class_method :last_authorized_token_for
-
-    def refresh_token
-      self[:refresh_token]
+    def self.created_at_desc
+      [:created_at, :desc]
     end
   end
 end

data/lib/doorkeeper/{models → orm}/mongoid2/application.rb

@@ -3,6 +3,8 @@ module Doorkeeper
     include Mongoid::Document
     include Mongoid::Timestamps
 
+    include ApplicationMixin
+
     self.store_in :oauth_applications
 
     field :name, type: String

data/lib/doorkeeper/orm/mongoid2/concerns/scopes.rb

@@ -0,0 +1,30 @@
+module Doorkeeper
+  module Models
+    module Mongoid2
+      module Scopes
+        extend ActiveSupport::Concern
+
+        # It's strange that if not define these after included will raise error
+        # in Mongoid 2 and 3, but 4 works well see:
+        # https://travis-ci.org/jasl/doorkeeper/builds/31586902
+        included do
+          def scopes
+            OAuth::Scopes.from_string(self[:scopes])
+          end
+
+          def scopes_string
+            self[:scopes]
+          end
+
+          def includes_scope?(*required_scopes)
+            required_scopes.blank? || required_scopes.any? { |s| scopes.exists?(s.to_s) }
+          end
+
+          def scopes=(value)
+            write_attribute :scopes, value if value.present?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid3.rb

@@ -0,0 +1,11 @@
+module Doorkeeper
+  module Orm
+    module Mongoid3
+      def self.initialize_models!
+        require 'doorkeeper/orm/mongoid3/access_grant'
+        require 'doorkeeper/orm/mongoid3/access_token'
+        require 'doorkeeper/orm/mongoid3/application'
+      end
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid3/access_grant.rb

@@ -0,0 +1,22 @@
+require 'doorkeeper/orm/mongoid3/concerns/scopes'
+
+module Doorkeeper
+  class AccessGrant
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include AccessGrantMixin
+    include Models::Mongoid3::Scopes
+
+    self.store_in collection: :oauth_access_grants
+
+    field :resource_owner_id, type: Moped::BSON::ObjectId
+    field :application_id, type: Moped::BSON::ObjectId
+    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
+end

data/lib/doorkeeper/orm/mongoid3/access_token.rb

@@ -0,0 +1,36 @@
+require 'doorkeeper/orm/mongoid3/concerns/scopes'
+
+module Doorkeeper
+  class AccessToken
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include AccessTokenMixin
+    include Models::Mongoid3::Scopes
+
+    self.store_in collection: :oauth_access_tokens
+
+    field :resource_owner_id, type: Moped::BSON::ObjectId
+    field :application_id, type: Moped::BSON::ObjectId
+    field :token, type: String
+    field :refresh_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
+    end
+    private_class_method :delete_all_for
+
+    def self.order_method
+      :order_by
+    end
+    def self.created_at_desc
+      [:created_at, :desc]
+    end
+  end
+end

data/lib/doorkeeper/{models/mongoid3_4 → orm/mongoid3}/application.rb

@@ -3,6 +3,8 @@ module Doorkeeper
     include Mongoid::Document
     include Mongoid::Timestamps
 
+    include ApplicationMixin
+
     self.store_in collection: :oauth_applications
 
     field :name, type: String

data/lib/doorkeeper/orm/mongoid3/concerns/scopes.rb

@@ -0,0 +1,30 @@
+module Doorkeeper
+  module Models
+    module Mongoid3
+      module Scopes
+        extend ActiveSupport::Concern
+
+        # It's strange that if not define these after included will raise error
+        # in Mongoid 2 and 3, but 4 works well see:
+        # https://travis-ci.org/jasl/doorkeeper/builds/31586902
+        included do
+          def scopes
+            OAuth::Scopes.from_string(self[:scopes])
+          end
+
+          def scopes_string
+            self[:scopes]
+          end
+
+          def includes_scope?(*required_scopes)
+            required_scopes.blank? || required_scopes.any? { |s| scopes.exists?(s.to_s) }
+          end
+
+          def scopes=(value)
+            write_attribute :scopes, value if value.present?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid4.rb

@@ -0,0 +1,11 @@
+module Doorkeeper
+  module Orm
+    module Mongoid4
+      def self.initialize_models!
+        require 'doorkeeper/orm/mongoid4/access_grant'
+        require 'doorkeeper/orm/mongoid4/access_token'
+        require 'doorkeeper/orm/mongoid4/application'
+      end
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid4/access_grant.rb

@@ -0,0 +1,22 @@
+require 'doorkeeper/orm/mongoid4/concerns/scopes'
+
+module Doorkeeper
+  class AccessGrant
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include AccessGrantMixin
+    include Models::Mongoid4::Scopes
+
+    self.store_in collection: :oauth_access_grants
+
+    field :resource_owner_id, type: BSON::ObjectId
+    field :application_id, type: BSON::ObjectId
+    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
+end

data/lib/doorkeeper/orm/mongoid4/access_token.rb

@@ -0,0 +1,36 @@
+require 'doorkeeper/orm/mongoid4/concerns/scopes'
+
+module Doorkeeper
+  class AccessToken
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include AccessTokenMixin
+    include Models::Mongoid4::Scopes
+
+    self.store_in collection: :oauth_access_tokens
+
+    field :resource_owner_id, type: BSON::ObjectId
+    field :application_id, type: BSON::ObjectId
+    field :token, type: String
+    field :refresh_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
+    end
+    private_class_method :delete_all_for
+
+    def self.order_method
+      :order_by
+    end
+    def self.created_at_desc
+      [:created_at, :desc]
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid4/application.rb

@@ -0,0 +1,24 @@
+module Doorkeeper
+  class Application
+    include Mongoid::Document
+    include Mongoid::Timestamps
+
+    include ApplicationMixin
+
+    self.store_in collection: :oauth_applications
+
+    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'
+
+    def self.authorized_for(resource_owner)
+      ids = AccessToken.where(resource_owner_id: resource_owner.id, revoked_at: nil).map(&:application_id)
+      find(ids)
+    end
+  end
+end

data/lib/doorkeeper/orm/mongoid4/concerns/scopes.rb

@@ -0,0 +1,17 @@
+module Doorkeeper
+  module Models
+    module Mongoid4
+      module Scopes
+        extend ActiveSupport::Concern
+
+        included do
+          field :scopes, type: String
+        end
+
+        def scopes=(value)
+          write_attribute :scopes, value if value.present?
+        end
+      end
+    end
+  end
+end