devise_invitable 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54bcb44af270be6f5192f01771df589f95045ee16206315e7784c16c49d93df5
-  data.tar.gz: 74fea42d1bae1ec385ca62291817679a59c3430fc6f4e609c966ee08db17c2d3
+  metadata.gz: e4a04ccc5139020fd72c805ab72b3a43468403afd18493c29bfee62093489218
+  data.tar.gz: af2428564b8f6242988fa1c71468efc05378aa8550a28c9e6b7f122528987dad
 SHA512:
-  metadata.gz: dd0dbba52b99e4117a02072d3f48fbb3623614697a5e972a4f99081351479c9a2846696752a112ffd63d9528631ef196763146af5cc2792996246bcdaa755a97
-  data.tar.gz: 406bdf51f7114cc26354cf682658a3f44cb192db2f94cb45d0c7fd72384774d1464678275aac671a973b1660031084c21b4a290279e8e52a9ea69109a8186068
+  metadata.gz: '03358597db4af64754b4c0f38837616762e0f3db4df414910f8989d42294e09ab17f342980a0650a80b18b73a761f78fadf21d84e34d997de0c79bfc880eb8dd'
+  data.tar.gz: 1162a02fac4275ca04dbb96a23b2f7e6db541ba1b3780ba6b6a25fbb067bba8dea534bd03ff15a45338a7c579e3eb967fb2ce4a24cb8e1afb4406508b7dd3708

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## Unreleased
 
+- Check invitation token uniqueness against the invitations store instead of
+  the resource table, which no longer has an `invitation_token` column after
+  running `devise_invitable:upgrade` ([#933](https://github.com/scambra/devise_invitable/issues/933))
+
 ## 3.0.2
 
 - Add `DeviseInvitable::Invitation#deliver` to send a skipped pending

data/lib/devise_invitable/models.rb

@@ -415,7 +415,9 @@ module Devise
         # Generates a new random token for invitation, and stores the time
         # this token is being generated
         def generate_invitation_token
-          raw, enc = Devise.token_generator.generate(self.class, :invitation_token)
+          # Tokens live in the invitations store, so check uniqueness there
+          # instead of on the resource, which may no longer have the column
+          raw, enc = Devise.token_generator.generate(DeviseInvitable::Invitation, :invitation_token)
           @raw_invitation_token = raw
           current_invitation.invitation_token = enc
         end

data/lib/devise_invitable/version.rb

@@ -1,3 +1,3 @@
 module DeviseInvitable
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

data/test/models/separate_invitations_test.rb

@@ -48,6 +48,20 @@ class SeparateInvitationsTest < ActiveSupport::TestCase
     end
   end
 
+  test 'invitation token uniqueness is checked against the invitations store' do
+    User.create_resource_on_invitation = false
+    Devise.stubs(:friendly_token).returns('taken-token', 'taken-token', 'free-token')
+
+    User.invite!(email: 'first@example.com')
+    User.invite!(email: 'second@example.com')
+
+    tokens = DeviseInvitable::Invitation.all.map(&:invitation_token)
+    assert_equal [
+      Devise.token_generator.digest(User, :invitation_token, 'taken-token'),
+      Devise.token_generator.digest(User, :invitation_token, 'free-token')
+    ].sort, tokens.sort
+  end
+
   test 'a failed later delivery remains unsent and can be retried' do
     User.create_resource_on_invitation = false
     invited = User.invite!(email: 'retry@example.com', skip_invitation: true)

data/test/rails_app/app/models/user.rb

@@ -18,13 +18,7 @@ class User < PARENT_MODEL_CLASS
     field :unconfirmed_email,    type: String # Only if using reconfirmable
 
     ## Invitable
-    field :invitation_token,       type: String
-    field :invitation_created_at,  type: Time
-    field :invitation_sent_at,     type: Time
-    field :invitation_accepted_at, type: Time
-    field :invitation_limit,       type: Integer
-    field :invited_by_id,          type: Integer
-    field :invited_by_type,        type: String
+    field :invitation_limit, type: Integer
 
     field :username
     field :profile_id

data/test/rails_app/db/migrate/20100401102949_create_tables.rb

@@ -20,18 +20,11 @@ class CreateTables < (Rails.version < '5.1' ? ActiveRecord::Migration : ActiveRe
       t.boolean :active
 
       ## Invitable
-      t.string   :invitation_token, :limit => 60
-      t.datetime :invitation_created_at
-      t.datetime :invitation_sent_at
-      t.datetime :invitation_accepted_at
       t.integer  :invitation_limit
-      t.integer  :invited_by_id
-      t.string   :invited_by_type
       t.integer :invitations_count, :default => 0
 
       t.timestamps :null => false
     end
-    add_index :users, :invitation_token, :unique => true
 
     create_table :devise_invitations do |t|
       t.string :invitation_token

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devise_invitable
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Sergio Cambra