grape_oauth2 0.1.1 → 0.2.0

data/lib/grape_oauth2/mixins/mongoid/client.rb

@@ -1,41 +1,44 @@
-module Grape
-  module OAuth2
-    module Mongoid
-      # Grape::OAuth2 Client role mixin for Mongoid ORM.
-      # Includes all the required API, associations, validations and callbacks.
-      module Client
-        extend ActiveSupport::Concern
-
-        included do
-          include ::Mongoid::Document
-          include ::Mongoid::Timestamps
-
-          field :name, type: String
-          field :key, type: String
-          field :secret, type: String
-          field :redirect_uri, type: String
-
-          before_validation :generate_keys, on: :create
-
-          validates :key, :secret, presence: true
-          validates :key, uniqueness: true
-
-          def self.authenticate(key, secret = nil)
-            if secret.nil?
-              Application.find_by(key: key)
-            else
-              Application.find_by(key: key, secret: secret)
-            end
-          end
-
-          protected
-
-          def generate_keys
-            self.key = Grape::OAuth2::UniqueToken.generate if key.blank?
-            self.secret = Grape::OAuth2::UniqueToken.generate if secret.blank?
-          end
-        end
-      end
-    end
-  end
-end
+module Grape
+  module OAuth2
+    module Mongoid
+      # Grape::OAuth2 Client role mixin for Mongoid ORM.
+      # Includes all the required API, associations, validations and callbacks.
+      module Client
+        extend ActiveSupport::Concern
+
+        included do
+          include ::Mongoid::Document
+          include ::Mongoid::Timestamps
+
+          has_many :access_tokens, class_name: Grape::OAuth2.config.access_token_class_name,
+                                   foreign_key: :client_id, dependent: :delete
+
+          field :name, type: String
+          field :key, type: String
+          field :secret, type: String
+          field :redirect_uri, type: String
+
+          before_validation :generate_keys, on: :create
+
+          validates :key, :secret, presence: true
+          validates :key, uniqueness: true
+
+          def self.authenticate(key, secret = nil)
+            if secret.nil?
+              find_by(key: key)
+            else
+              find_by(key: key, secret: secret)
+            end
+          end
+
+          protected
+
+          def generate_keys
+            self.key = Grape::OAuth2::UniqueToken.generate if key.blank?
+            self.secret = Grape::OAuth2::UniqueToken.generate if secret.blank?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grape_oauth2/mixins/sequel/access_grant.rb

@@ -1,68 +1,68 @@
-module Grape
-  module OAuth2
-    module Sequel
-      # Grape::OAuth2 Authorization Grant role mixin for Sequel toolkit.
-      # Includes all the required API, associations, validations and callbacks.
-      module AccessGrant
-        extend ActiveSupport::Concern
-
-        included do
-          plugin :validation_helpers
-          plugin :timestamps
-
-          many_to_one :client, class: Grape::OAuth2.config.client_class_name, key: :client_id
-          many_to_one :resource_owner, class: Grape::OAuth2.config.resource_owner_class_name, key: :resource_owner_id
-
-          def before_validation
-            if new?
-              generate_token
-              setup_expiration
-            end
-
-            super
-          end
-
-          class << self
-            def create_for(client, resource_owner, redirect_uri, scopes = nil)
-              create(
-                client_id: client.id,
-                resource_owner_id: resource_owner && resource_owner.id,
-                redirect_uri: redirect_uri,
-                scopes: scopes.to_s
-              )
-            end
-          end
-
-          def validate
-            super
-            validates_presence [:token, :client_id]
-            validates_unique [:token]
-          end
-
-          def expired?
-            expires_at && Time.now.utc > expires_at
-          end
-
-          def revoked?
-            revoked_at && revoked_at <= Time.now.utc
-          end
-
-          def revoke!(revoked_at = Time.now)
-            set(revoked_at: revoked_at.utc)
-            save(columns: [:revoked_at], validate: false)
-          end
-
-          protected
-
-          def generate_token
-            self.token = Grape::OAuth2.config.token_generator.generate(values)
-          end
-
-          def setup_expiration
-            self.expires_at = Time.now.utc + Grape::OAuth2.config.authorization_code_lifetime if expires_at.nil?
-          end
-        end
-      end
-    end
-  end
-end
+module Grape
+  module OAuth2
+    module Sequel
+      # Grape::OAuth2 Authorization Grant role mixin for Sequel toolkit.
+      # Includes all the required API, associations, validations and callbacks.
+      module AccessGrant
+        extend ActiveSupport::Concern
+
+        included do
+          plugin :validation_helpers
+          plugin :timestamps
+
+          many_to_one :client, class: Grape::OAuth2.config.client_class_name, key: :client_id
+          many_to_one :resource_owner, class: Grape::OAuth2.config.resource_owner_class_name, key: :resource_owner_id
+
+          def before_validation
+            if new?
+              generate_token
+              setup_expiration
+            end
+
+            super
+          end
+
+          class << self
+            def create_for(client, resource_owner, redirect_uri, scopes = nil)
+              create(
+                client_id: client.id,
+                resource_owner_id: resource_owner && resource_owner.id,
+                redirect_uri: redirect_uri,
+                scopes: scopes.to_s
+              )
+            end
+          end
+
+          def validate
+            super
+            validates_presence %i[token client_id]
+            validates_unique [:token]
+          end
+
+          def expired?
+            expires_at && Time.now.utc > expires_at
+          end
+
+          def revoked?
+            revoked_at && revoked_at <= Time.now.utc
+          end
+
+          def revoke!(revoked_at = Time.now)
+            set(revoked_at: revoked_at.utc)
+            save(columns: [:revoked_at], validate: false)
+          end
+
+          protected
+
+          def generate_token
+            self.token = Grape::OAuth2.config.token_generator.generate(values)
+          end
+
+          def setup_expiration
+            self.expires_at = Time.now.utc + Grape::OAuth2.config.authorization_code_lifetime if expires_at.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grape_oauth2/mixins/sequel/access_token.rb

@@ -1,86 +1,86 @@
-module Grape
-  module OAuth2
-    module Sequel
-      # Grape::OAuth2 Access Token role mixin for Sequel toolkit.
-      # Includes all the required API, associations, validations and callbacks.
-      module AccessToken
-        extend ActiveSupport::Concern
-
-        included do
-          plugin :validation_helpers
-          plugin :timestamps
-
-          many_to_one :client, class: Grape::OAuth2.config.client_class_name, key: :client_id
-          many_to_one :resource_owner, class: Grape::OAuth2.config.resource_owner_class_name, key: :resource_owner_id
-
-          def before_validation
-            if new?
-              setup_expiration
-              generate_tokens
-            end
-
-            super
-          end
-
-          def validate
-            super
-            validates_presence :token
-            validates_unique :token
-          end
-
-          class << self
-            def create_for(client, resource_owner, scopes = nil)
-              create(
-                client: client,
-                resource_owner: resource_owner,
-                scopes: scopes.to_s
-              )
-            end
-
-            def authenticate(token, type: :access_token)
-              if type && type.to_sym == :refresh_token
-                first(refresh_token: token.to_s)
-              else
-                first(token: token.to_s)
-              end
-            end
-          end
-
-          def expired?
-            !expires_at.nil? && Time.now.utc > expires_at.utc
-          end
-
-          def revoked?
-            !revoked_at.nil? && revoked_at <= Time.now.utc
-          end
-
-          def revoke!(revoked_at = Time.now)
-            set(revoked_at: revoked_at.utc)
-            save(columns: [:revoked_at], validate: false)
-          end
-
-          def to_bearer_token
-            {
-              access_token: token,
-              expires_in: expires_at && Grape::OAuth2.config.access_token_lifetime.to_i,
-              refresh_token: refresh_token,
-              scope: scopes
-            }
-          end
-
-          protected
-
-          def generate_tokens
-            self.token = Grape::OAuth2.config.token_generator.generate(values) if token.blank?
-            self.refresh_token = Grape::OAuth2::UniqueToken.generate if Grape::OAuth2.config.issue_refresh_token
-          end
-
-          def setup_expiration
-            expires_in = Grape::OAuth2.config.access_token_lifetime
-            self.expires_at = Time.now + expires_in if expires_at.nil? && !expires_in.nil?
-          end
-        end
-      end
-    end
-  end
-end
+module Grape
+  module OAuth2
+    module Sequel
+      # Grape::OAuth2 Access Token role mixin for Sequel toolkit.
+      # Includes all the required API, associations, validations and callbacks.
+      module AccessToken
+        extend ActiveSupport::Concern
+
+        included do
+          plugin :validation_helpers
+          plugin :timestamps
+
+          many_to_one :client, class: Grape::OAuth2.config.client_class_name, key: :client_id
+          many_to_one :resource_owner, class: Grape::OAuth2.config.resource_owner_class_name, key: :resource_owner_id
+
+          def before_validation
+            if new?
+              setup_expiration
+              generate_tokens
+            end
+
+            super
+          end
+
+          def validate
+            super
+            validates_presence :token
+            validates_unique :token
+          end
+
+          class << self
+            def create_for(client, resource_owner, scopes = nil)
+              create(
+                client: client,
+                resource_owner: resource_owner,
+                scopes: scopes.to_s
+              )
+            end
+
+            def authenticate(token, type: :access_token)
+              if type && type.to_sym == :refresh_token
+                first(refresh_token: token.to_s)
+              else
+                first(token: token.to_s)
+              end
+            end
+          end
+
+          def expired?
+            !expires_at.nil? && Time.now.utc > expires_at.utc
+          end
+
+          def revoked?
+            !revoked_at.nil? && revoked_at <= Time.now.utc
+          end
+
+          def revoke!(revoked_at = Time.now)
+            set(revoked_at: revoked_at.utc)
+            save(columns: [:revoked_at], validate: false)
+          end
+
+          def to_bearer_token
+            {
+              access_token: token,
+              expires_in: expires_at && Grape::OAuth2.config.access_token_lifetime.to_i,
+              refresh_token: refresh_token,
+              scope: scopes
+            }
+          end
+
+          protected
+
+          def generate_tokens
+            self.token = Grape::OAuth2.config.token_generator.generate(values) if token.blank?
+            self.refresh_token = Grape::OAuth2::UniqueToken.generate if Grape::OAuth2.config.issue_refresh_token
+          end
+
+          def setup_expiration
+            expires_in = Grape::OAuth2.config.access_token_lifetime
+            self.expires_at = Time.now + expires_in if expires_at.nil? && !expires_in.nil?
+          end
+        end
+      end
+    end
+  end
+end

data/lib/grape_oauth2/mixins/sequel/client.rb

@@ -1,46 +1,54 @@
-module Grape
-  module OAuth2
-    module Sequel
-      # Grape::OAuth2 Client role mixin for Sequel toolkit.
-      # Includes all the required API, associations, validations and callbacks.
-      module Client
-        extend ActiveSupport::Concern
-
-        included do
-          plugin :validation_helpers
-          plugin :timestamps
-
-          set_allowed_columns :name, :redirect_uri
-
-          one_to_many :access_tokens, class: Grape::OAuth2.config.access_token_class_name, key: :client_id
-
-          def before_validation
-            generate_keys if new?
-            super
-          end
-
-          def validate
-            super
-            validates_presence [:key, :secret]
-            validates_unique :key
-          end
-
-          def self.authenticate(key, secret = nil)
-            if secret.nil?
-              find(key: key)
-            else
-              find(key: key, secret: secret)
-            end
-          end
-
-          protected
-
-          def generate_keys
-            self.key = Grape::OAuth2::UniqueToken.generate if key.blank?
-            self.secret = Grape::OAuth2::UniqueToken.generate if secret.blank?
-          end
-        end
-      end
-    end
-  end
-end
+module Grape
+  module OAuth2
+    module Sequel
+      # Grape::OAuth2 Client role mixin for Sequel toolkit.
+      # Includes all the required API, associations, validations and callbacks.
+      module Client
+        extend ActiveSupport::Concern
+
+        included do
+          plugin :validation_helpers
+          plugin :timestamps
+          plugin :association_dependencies
+
+          # Sequel 4.47 deprecated #set_allowed_columns
+          if (::Sequel::MAJOR >= 4 && ::Sequel::MINOR >= 47) || ::Sequel::MAJOR >= 5
+            plugin :whitelist_security
+          end
+
+          set_allowed_columns :name, :redirect_uri
+
+          one_to_many :access_tokens, class: Grape::OAuth2.config.access_token_class_name, key: :client_id
+
+          add_association_dependencies access_tokens: :delete
+
+          def before_validation
+            generate_keys if new?
+            super
+          end
+
+          def validate
+            super
+            validates_presence %i[key secret]
+            validates_unique :key
+          end
+
+          def self.authenticate(key, secret = nil)
+            if secret.nil?
+              find(key: key)
+            else
+              find(key: key, secret: secret)
+            end
+          end
+
+          protected
+
+          def generate_keys
+            self.key = Grape::OAuth2::UniqueToken.generate if key.blank?
+            self.secret = Grape::OAuth2::UniqueToken.generate if secret.blank?
+          end
+        end
+      end
+    end
+  end
+end