acts_as_tokenable 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 20f9b171ded1cb0f490e9d361ea3fbb6a961d485
-  data.tar.gz: cc83021bc9292f12b2e2c710ff53f48ff120c32d
+  metadata.gz: 6ff886775475e5a6aa7a916ebd039015bfd5d06d
+  data.tar.gz: dd441d8e815f55a4b4e0845b2969c9a108e01e43
 SHA512:
-  metadata.gz: da12ff38e37d095d08141c1d327b1e877a7d18bed0363a3583ec7ee23422fb91d69d9ec79b24b35f422f33dfb778bdd06de87f8c9bbfa9e5a4dade4c834735fd
-  data.tar.gz: c1411d46553033b774bc92b228146db07a607480d3a2b17cd302a9e1fa3466ff3bd80a4ae87ff6b1939b3a3578c1282eb652561602a90f9a2d480e0007f5a3a3
+  metadata.gz: 21b3021fb3d0ac2eabe30498fe25655f72e4bca6a172fe36d8cdafb55ce322d074390083b38627b613088a4e85c85711c88380c65a5d56e4cc449cfdba0b506a
+  data.tar.gz: 17371a358ade274565b7bee453711107de0331951a92254e9b80febb86fd33d713c4ee225bc5176b38e1df24fac4dd57714ae00f61e035157a547e0ed1ff6442

data/app/models/acts_as_tokenable/token.rb

@@ -1,19 +1,35 @@
+require 'securerandom'
+require 'bcrypt'
+
 module ActsAsTokenable
   class Token < ActiveRecord::Base
     before_update { false }
 
     belongs_to :tokenable, polymorphic: true
 
+    validates :token_id, presence: true, uniqueness: true
+    validates :token_hash, presence: true
+
     scope :active, -> { where('expires_at > ?', DateTime.now) }
 
-    before_create :generate_token
+    before_validation :generate_token_id
+    before_validation :generate_token_hash
 
     private
 
-      def generate_token
+      def generate_token_id
         begin
-          self.token = SecureRandom.urlsafe_base64(32, false)
-        end while self.class.exists?(token: self.token)
+          self.token_id = SecureRandom.hex(16)
+        end while self.class.exists?(token_id: self.token_id)
+      end
+
+      def generate_token_hash
+        secret = SecureRandom.urlsafe_base64(16)
+        self.token_hash = BCrypt::Password.create(secret, cost: cost)
+      end
+
+      def cost
+        Rails.env.test? ? 1 : 10
       end
   end
 end

data/db/migrate/20150609134016_create_acts_as_tokenable_tokens.rb

@@ -2,7 +2,8 @@ class CreateActsAsTokenableTokens < ActiveRecord::Migration
   def change
     create_table :acts_as_tokenable_tokens, :id => false do |t|
       t.belongs_to :tokenable, polymorphic: true, index: true, index: { name: 'acts_as_tokenable_tokens_polymorphic' }
-      t.string :token, unique: true
+      t.string :token_id, unique: true
+      t.string :token_hash
       t.datetime :expires_at
 
       t.timestamps null: false

data/lib/acts_as_tokenable/tokenable.rb

@@ -5,24 +5,32 @@ module ActsAsTokenable
         has_many :tokens, as: :tokenable, dependent: :destroy, class_name: '::ActsAsTokenable::Token', :foreign_key => :tokenable_id
 
         def add_token(options = {})
-          default_options = {
-            :expires_at => 30.days.from_now
-          }
-
           options = options.reverse_merge(default_options)
 
-          self.tokens.create(options).try(:token)
-        end
-
-        def has_token?(token)
-          self.tokens.active.find_by(:token => token).present?
+          self.tokens.create(options)
         end
 
         class << self
-          def find_by_token(token)
-            ActsAsTokenable::Token.active.find_by(:token => token).try(:tokenable)
+          def find_by_token(token_id, token_hash)
+            token = ActsAsTokenable::Token.active.find_by(:token_id => token_id)
+
+            return nil unless token
+
+            if ActiveSupport::SecurityUtils.secure_compare(token.token_hash, token_hash)
+              token.try(:tokenable)
+            else
+              nil
+            end
           end
         end
+
+        private
+
+          def default_options
+            {
+              :expires_at => 30.days.from_now
+            }
+          end
       end
     end
   end

data/lib/acts_as_tokenable/version.rb

@@ -1,3 +1,3 @@
 module ActsAsTokenable
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_tokenable
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Sergey Novikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-09 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.1
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.10
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement