grape_oauth2 0.1.1 → 0.2.0

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

@@ -1,47 +1,47 @@
-module Grape
-  module OAuth2
-    module ActiveRecord
-      # Grape::OAuth2 Authorization Grant role mixin for ActiveRecord.
-      # Includes all the required API, associations, validations and callbacks.
-      module AccessGrant
-        extend ActiveSupport::Concern
-
-        included do
-          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name,
-                              foreign_key: :client_id
-
-          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name,
-                                      foreign_key: :resource_owner_id
-
-          # resource_owner_id - required!
-          validates :client_id, :redirect_uri, presence: true
-          validates :token, presence: true, uniqueness: true
-
-          before_validation :generate_token, on: :create
-          before_validation :setup_expiration, on: :create
-
-          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
-
-          protected
-
-          def generate_token
-            self.token = Grape::OAuth2.config.token_generator.generate(attributes)
-          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 ActiveRecord
+      # Grape::OAuth2 Authorization Grant role mixin for ActiveRecord.
+      # Includes all the required API, associations, validations and callbacks.
+      module AccessGrant
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name,
+                              foreign_key: :client_id
+
+          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name,
+                                      foreign_key: :resource_owner_id
+
+          # resource_owner_id - required!
+          validates :client_id, :redirect_uri, presence: true
+          validates :token, presence: true, uniqueness: true
+
+          before_validation :generate_token, on: :create
+          before_validation :setup_expiration, on: :create
+
+          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
+
+          protected
+
+          def generate_token
+            self.token = Grape::OAuth2.config.token_generator.generate(attributes)
+          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/active_record/access_token.rb

@@ -1,75 +1,75 @@
-module Grape
-  module OAuth2
-    module ActiveRecord
-      # Grape::OAuth2 Access Token role mixin for ActiveRecord.
-      # Includes all the required API, associations, validations and callbacks.
-      module AccessToken
-        extend ActiveSupport::Concern
-
-        included do
-          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name,
-                              foreign_key: :client_id
-
-          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name,
-                                      foreign_key: :resource_owner_id
-
-          validates :token, presence: true, uniqueness: true
-
-          before_validation :setup_expiration, on: :create
-          before_validation :generate_tokens, on: :create
-
-          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
-                find_by(refresh_token: token.to_s)
-              else
-                find_by(token: token.to_s)
-              end
-            end
-          end
-
-          def expired?
-            !expires_at.nil? && Time.now.utc > expires_at
-          end
-
-          def revoked?
-            !revoked_at.nil? && revoked_at <= Time.now.utc
-          end
-
-          def revoke!(revoked_at = Time.now)
-            update_column :revoked_at, revoked_at.utc
-          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(attributes) 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 ActiveRecord
+      # Grape::OAuth2 Access Token role mixin for ActiveRecord.
+      # Includes all the required API, associations, validations and callbacks.
+      module AccessToken
+        extend ActiveSupport::Concern
+
+        included do
+          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name,
+                              foreign_key: :client_id
+
+          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name,
+                                      foreign_key: :resource_owner_id
+
+          validates :token, presence: true, uniqueness: true
+
+          before_validation :setup_expiration, on: :create
+          before_validation :generate_tokens, on: :create
+
+          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
+                find_by(refresh_token: token.to_s)
+              else
+                find_by(token: token.to_s)
+              end
+            end
+          end
+
+          def expired?
+            !expires_at.nil? && Time.now.utc > expires_at
+          end
+
+          def revoked?
+            !revoked_at.nil? && revoked_at <= Time.now.utc
+          end
+
+          def revoke!(revoked_at = Time.now)
+            update_column :revoked_at, revoked_at.utc
+          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(attributes) 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/active_record/client.rb

@@ -1,35 +1,36 @@
-module Grape
-  module OAuth2
-    module ActiveRecord
-      # Grape::OAuth2 Client role mixin for ActiveRecord.
-      # Includes all the required API, associations, validations and callbacks.
-      module Client
-        extend ActiveSupport::Concern
-
-        included do
-          has_many :access_tokens, class_name: Grape::OAuth2.config.access_token_class_name, foreign_key: :client_id
-
-          validates :key, :secret, presence: true
-          validates :key, uniqueness: true
-
-          before_validation :generate_keys, on: :create
-
-          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
+module Grape
+  module OAuth2
+    module ActiveRecord
+      # Grape::OAuth2 Client role mixin for ActiveRecord.
+      # Includes all the required API, associations, validations and callbacks.
+      module Client
+        extend ActiveSupport::Concern
+
+        included do
+          has_many :access_tokens, class_name: Grape::OAuth2.config.access_token_class_name,
+                                   foreign_key: :client_id, dependent: :delete_all
+
+          validates :key, :secret, presence: true
+          validates :key, uniqueness: true
+
+          before_validation :generate_keys, on: :create
+
+          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/mongoid/access_grant.rb

@@ -1,58 +1,58 @@
-module Grape
-  module OAuth2
-    module Mongoid
-      # Grape::OAuth2 Authorization Grant role mixin for Mongoid ORM.
-      # Includes all the required API, associations, validations and callbacks.
-      module AccessGrant
-        extend ActiveSupport::Concern
-
-        included do
-          include ::Mongoid::Document
-          include ::Mongoid::Timestamps
-
-          field :resource_owner_id, type: BSON::ObjectId
-          field :client_id, type: BSON::ObjectId
-
-          field :token, type: String
-          field :scopes, type: String
-          field :redirect_uri, type: String
-
-          field :expires_at, type: DateTime
-
-          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name,
-                              foreign_key: :client_id
-
-          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name,
-                                      foreign_key: :resource_owner_id, optional: true # required!
-
-          before_validation :generate_token, on: :create
-          before_validation :setup_expiration, on: :create
-
-          index({ token: 1 }, unique: true)
-          index({ refresh_token: 1 }, unique: true, sparse: true)
-
-          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
-
-          protected
-
-          def generate_token
-            self.token = Grape::OAuth2.config.token_generator.generate(attributes)
-          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 Mongoid
+      # Grape::OAuth2 Authorization Grant role mixin for Mongoid ORM.
+      # Includes all the required API, associations, validations and callbacks.
+      module AccessGrant
+        extend ActiveSupport::Concern
+
+        included do
+          include ::Mongoid::Document
+          include ::Mongoid::Timestamps
+
+          field :resource_owner_id, type: BSON::ObjectId
+          field :client_id, type: BSON::ObjectId
+
+          field :token, type: String
+          field :scopes, type: String
+          field :redirect_uri, type: String
+
+          field :expires_at, type: DateTime
+
+          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name,
+                              foreign_key: :client_id
+
+          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name,
+                                      foreign_key: :resource_owner_id, optional: true # required!
+
+          before_validation :generate_token, on: :create
+          before_validation :setup_expiration, on: :create
+
+          index({ token: 1 }, unique: true)
+          index({ refresh_token: 1 }, unique: true, sparse: true)
+
+          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
+
+          protected
+
+          def generate_token
+            self.token = Grape::OAuth2.config.token_generator.generate(attributes)
+          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/mongoid/access_token.rb

@@ -1,88 +1,88 @@
-module Grape
-  module OAuth2
-    module Mongoid
-      # Grape::OAuth2 Access Token role mixin for Mongoid ORM.
-      # Includes all the required API, associations, validations and callbacks.
-      module AccessToken
-        extend ActiveSupport::Concern
-
-        included do
-          include ::Mongoid::Document
-          include ::Mongoid::Timestamps
-
-          field :resource_owner_id, type: BSON::ObjectId
-          field :client_id, type: BSON::ObjectId
-
-          belongs_to :client, class_name: 'Application', foreign_key: :client_id, optional: true
-          belongs_to :resource_owner, class_name: 'User', foreign_key: :resource_owner_id, optional: true
-
-          field :token, type: String
-          field :refresh_token, type: String
-          field :scopes, type: String
-
-          field :expires_at, type: DateTime
-          field :revoked_at, type: DateTime
-
-          index({ token: 1 }, unique: true)
-          index({ refresh_token: 1 }, unique: true, sparse: true)
-
-          before_validation :setup_expiration, on: :create
-          before_validation :generate_tokens, on: :create
-
-          validates :token, presence: true, uniqueness: true
-
-          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
-                find_by(refresh_token: token.to_s)
-              else
-                find_by(token: token.to_s)
-              end
-            end
-          end
-
-          def expired?
-            !expires_at.nil? && Time.now.utc > expires_at
-          end
-
-          def revoked?
-            !revoked_at.nil? && revoked_at <= Time.now.utc
-          end
-
-          def revoke!(revoked_at = Time.now)
-            update_attribute :revoked_at, revoked_at.utc
-          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(attributes) 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 Mongoid
+      # Grape::OAuth2 Access Token role mixin for Mongoid ORM.
+      # Includes all the required API, associations, validations and callbacks.
+      module AccessToken
+        extend ActiveSupport::Concern
+
+        included do
+          include ::Mongoid::Document
+          include ::Mongoid::Timestamps
+
+          field :resource_owner_id, type: BSON::ObjectId
+          field :client_id, type: BSON::ObjectId
+
+          belongs_to :client, class_name: Grape::OAuth2.config.client_class_name, foreign_key: :client_id, optional: true
+          belongs_to :resource_owner, class_name: Grape::OAuth2.config.resource_owner_class_name, foreign_key: :resource_owner_id, optional: true
+
+          field :token, type: String
+          field :refresh_token, type: String
+          field :scopes, type: String
+
+          field :expires_at, type: DateTime
+          field :revoked_at, type: DateTime
+
+          index({ token: 1 }, unique: true)
+          index({ refresh_token: 1 }, unique: true, sparse: true)
+
+          before_validation :setup_expiration, on: :create
+          before_validation :generate_tokens, on: :create
+
+          validates :token, presence: true, uniqueness: true
+
+          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
+                find_by(refresh_token: token.to_s)
+              else
+                find_by(token: token.to_s)
+              end
+            end
+          end
+
+          def expired?
+            !expires_at.nil? && Time.now.utc > expires_at
+          end
+
+          def revoked?
+            !revoked_at.nil? && revoked_at <= Time.now.utc
+          end
+
+          def revoke!(revoked_at = Time.now)
+            update_attribute :revoked_at, revoked_at.utc
+          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(attributes) 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