devise-argon2 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7542aed226ac27c831a5f6acdbb6011fe8b6632e83a60902341c4f44bad38b27
-  data.tar.gz: 63891613bb7343641df64221d56533f646543c8eb0c8b3f9fe32186a4f4c46df
+  metadata.gz: b13e34bfd72f10cc708b067b1153dc9cb8b3aa9a904e47bc25c8d2a75acc7f62
+  data.tar.gz: 8f925ef0029619168d1d01bef19adb9769b503c8b68bc1b94997f222aa86c989
 SHA512:
-  metadata.gz: 958d4df9feceff3bb4b28c85eed86f0072cd9914ba7f00cfdc26379def7af570647812fb72e14303b02ad435d4e8450d6cbc63b76a7b23380de1218828fac365
-  data.tar.gz: f639d484fe68ff7d39df88511a06c15b4518ddce58cf02057d39f99524aa5942af83427bb2268f66fe2facd36c30cb72477782f903d2d17e1dfd8f7e644a4fc7
+  metadata.gz: 512b621099a74b85a1dd79ca5f9108cb9cf8105fd499b14c78c4d2fb6e1de2c8edbb8eabc3be94a5d783ef2f2dcb5d0a063bdeb9ddf8c1ffdbc27a3368c61027
+  data.tar.gz: 25e032a128c02cb60012f3e20654e049a84cec7cbebbcbbfe0f1588f71d6b63a9158b7b5ec1ceeb0c77b4e103c89f9fca9d4d38e0c21029228e06e03c7483356

data/.github/workflows/test.yml

@@ -7,68 +7,36 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3']
-        rails-version: ['~> 6.1', '~> 7.0', '~> 7.1', '~> 7.2', '8.0.0.beta1']
+        ruby-version: ['3.1', '3.2', '3.3', '3.4']
+        rails-version: ['~> 7.2', '~> 8.0', '~> 8.1']
         argon2-version: ['2.2', '2.3']
+        devise-version: ['~> 4.9', 'main']
         orm:
           - adapter: active_record
           - adapter: mongoid
-            mongoid-version: 9.0.2
+            mongoid-version: 9.0.3
           - adapter: mongoid
-            mongoid-version: 8.1.6
-          - adapter: mongoid
-            mongoid-version: 8.0.8
-          - adapter: mongoid
-            mongoid-version: 7.5.4
+            mongoid-version: 8.1.7
         exclude:
-          - rails-version: '~> 7.2'
-            ruby-version: '2.7'
-          - rails-version: '~> 7.2'
-            ruby-version: '3.0'
-          - rails-version: '8.0.0.beta1'
-            ruby-version: '2.7'
-          - rails-version: '8.0.0.beta1'
-            ruby-version: '3.0'
-          - rails-version: '8.0.0.beta1'
+          - rails-version: '~> 8.1'
+            ruby-version: '3.1'
+          - rails-version: '~> 8.0'
             ruby-version: '3.1'
           - orm:
               adapter: mongoid
-            rails-version: '8.0.0.beta1'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            ruby-version: '3.3'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            ruby-version: '3.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            ruby-version: '3.3'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            ruby-version: '3.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 8.0.8
-            rails-version: '~> 7.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            rails-version: '~> 7.2'
-          - orm:
-              adapter: mongoid
-              mongoid-version: 7.5.4
-            rails-version: '~> 7.1'
+            rails-version: '~> 8.1'
     env:
-      RAILS_VERSION: ${{ matrix.rails-version  || '~> 7.0'}}
+      RAILS_VERSION: ${{ matrix.rails-version  || '~> 8.0'}}
       MONGOID_VERSION: ${{ matrix.orm.mongoid-version || '8.1.6'}}
       ORM: ${{ matrix.orm.adapter }}
       ARGON2_VERSION: ${{ matrix.argon2-version }}
       DEVISE_VERSION: ${{ matrix.devise-version || '~> 4.9' }}
     steps:
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ secrets.DOCKERHUB_USERNAME }}
+        password: ${{ secrets.DOCKERHUB_TOKEN }}
     - uses: actions/checkout@v4
     - name: Set up Ruby ${{ matrix.ruby-version }}
       uses: ruby/setup-ruby@v1

data/.gitignore

@@ -18,4 +18,5 @@ spec/rails_app/db/test.sqlite3*
 test/tmp
 test/version_tmp
 tmp
-.ruby-gemset
+.ruby-gemset
+.idea

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## [2.0.3] - 2025-03-23
+
+### Fixed
+- Fix bug where users would not be migrated from v1 when setting a password manually. (#21)
+
 ## [2.0.2] - 2024-09-30
 
 ### Changed

data/Gemfile

@@ -5,16 +5,17 @@ gemspec
 gem 'rspec'
 gem 'simplecov'
 gem 'activerecord'
-gem 'rails', ENV['RAILS_VERSION'] || '~> 7.0'
+gem 'rails', ENV['RAILS_VERSION'] || '~> 8.0'
 gem 'argon2', ENV['ARGON2_VERSION'] || '~> 2.3'
-gem 'devise', ENV['DEVISE_VERSION'] || '~> 4.9'
+
+if ENV['DEVISE_VERSION'] == 'main'
+  gem 'devise', github: 'heartcombo/devise'
+else
+  gem 'devise', ENV['DEVISE_VERSION'] || '~> 4.9'
+end
 
 if ENV['ORM'] == 'mongoid'
   gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.5'
 end
 
-if ENV['RAILS_VERSION'] == '8.0.0.beta1'
-  gem 'sqlite3', '~> 2.1'
-else
-  gem 'sqlite3', '~> 1.6', '>= 1.6.6'
-end
+gem 'sqlite3', '~> 2.8'

data/devise-argon2.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'devise', '~> 4.0'
+  gem.add_dependency 'devise', '>= 4.0'
   gem.add_dependency 'argon2', '~> 2.1'
 
 

data/lib/devise-argon2/model.rb

@@ -38,6 +38,11 @@ module Devise
         is_valid
       end
 
+      def password=(new_password)
+        self.password_salt = nil if migrate_hash_from_devise_argon2_v1?
+        super
+      end
+
       protected
 
       def password_digest(password)

data/lib/devise-argon2/version.rb

@@ -1,5 +1,5 @@
 module Devise
   module Argon2
-    ARGON2_VERSION = '2.0.2'
+    ARGON2_VERSION = '2.0.4'
   end
 end

data/spec/devise-argon2_spec.rb

@@ -302,4 +302,38 @@ describe Devise::Models::Argon2 do
       )
     end
   end
+
+  describe 'password reset' do
+    NEW_PASSWORD = 'new password'
+
+    shared_examples 'ways of resetting the password' do
+      it 'can be done via password_reset' do
+        user.reset_password(NEW_PASSWORD, NEW_PASSWORD)
+        expect(user.valid_password?(NEW_PASSWORD)).to be true
+      end
+
+      it 'can be done via password=' do
+        user.password = NEW_PASSWORD
+        expect(user.valid_password?(NEW_PASSWORD)).to be true
+      end
+    end
+
+    context 'encrypted_password is hashed with the current version of devise-argon2' do
+      include_examples 'ways of resetting the password'
+    end
+
+    context 'encrypted_password is hashed with version 1 of devise-argon2' do
+      let(:user) { OldUser.new(password: CORRECT_PASSWORD) }
+
+      before do
+        Devise.argon2_options.merge!({ migrate_from_devise_argon2_v1: true })
+        user.password_salt = 'devise-argon2 v1 salt'
+        user.encrypted_password = ::Argon2::Password.create(
+          "#{CORRECT_PASSWORD}#{user.password_salt}#{Devise.pepper}"
+        )
+      end
+
+      include_examples 'ways of resetting the password'
+    end
+  end
 end

data/spec/rails_app/app/active_record/old_user.rb

@@ -1,3 +1,3 @@
 class OldUser < ActiveRecord::Base
-  devise :database_authenticatable, :argon2
+  devise :database_authenticatable, :recoverable, :argon2
 end

data/spec/rails_app/app/active_record/user.rb

@@ -1,3 +1,3 @@
 class User < ActiveRecord::Base
-  devise :database_authenticatable, :argon2
+  devise :database_authenticatable, :recoverable, :argon2
 end

data/spec/rails_app/app/mongoid/old_user.rb

@@ -1,7 +1,7 @@
 class OldUser
   include Mongoid::Document
   
-  devise :database_authenticatable, :argon2
+  devise :database_authenticatable, :recoverable, :argon2
 
   field :email,              type: String, default: ""
   field :encrypted_password, type: String, default: ""

data/spec/rails_app/app/mongoid/user.rb

@@ -1,7 +1,7 @@
 class User
   include Mongoid::Document
   
-  devise :database_authenticatable, :argon2
+  devise :database_authenticatable, :recoverable, :argon2
 
   field :email,              type: String, default: ""
   field :encrypted_password, type: String, default: ""

data/spec/rails_app/db/migrate/20250319085725_add_recoverable_fields_to_users.rb

@@ -0,0 +1,6 @@
+class AddRecoverableFieldsToUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :users, :reset_password_token, :string
+    add_column :users, :reset_password_sent_at, :datetime
+  end
+end

data/spec/rails_app/db/migrate/20250319085738_add_recoverable_fields_to_old_users.rb

@@ -0,0 +1,6 @@
+class AddRecoverableFieldsToOldUsers < ActiveRecord::Migration[7.2]
+  def change
+    add_column :old_users, :reset_password_token, :string
+    add_column :old_users, :reset_password_sent_at, :datetime
+  end
+end

data/spec/rails_app/db/schema.rb

@@ -10,13 +10,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2023_10_04_084147) do
+ActiveRecord::Schema.define(version: 2025_03_19_085738) do
   create_table "old_users", force: :cascade do |t|
     t.string "email", default: "", null: false
     t.string "encrypted_password", default: "", null: false
     t.string "password_salt"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
     t.index ["email"], name: "index_old_users_on_email", unique: true
   end
 
@@ -25,7 +27,8 @@ ActiveRecord::Schema.define(version: 2023_10_04_084147) do
     t.string "encrypted_password", default: "", null: false
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "reset_password_token"
+    t.datetime "reset_password_sent_at"
     t.index ["email"], name: "index_users_on_email", unique: true
   end
-
 end

metadata

@@ -1,28 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: devise-argon2
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Tamas Erdos
 - Moritz Höppner
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
@@ -81,6 +80,8 @@ files:
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/migrate/20230617201921_devise_create_users.rb
 - spec/rails_app/db/migrate/20231004084147_devise_create_old_users.rb
+- spec/rails_app/db/migrate/20250319085725_add_recoverable_fields_to_users.rb
+- spec/rails_app/db/migrate/20250319085738_add_recoverable_fields_to_old_users.rb
 - spec/rails_app/db/schema.rb
 - spec/spec_helper.rb
 homepage: https://github.com/erdostom/devise-argon2
@@ -103,8 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Enables Devise to hash passwords with Argon2id
 test_files:
@@ -131,5 +131,7 @@ test_files:
 - spec/rails_app/config/routes.rb
 - spec/rails_app/db/migrate/20230617201921_devise_create_users.rb
 - spec/rails_app/db/migrate/20231004084147_devise_create_old_users.rb
+- spec/rails_app/db/migrate/20250319085725_add_recoverable_fields_to_users.rb
+- spec/rails_app/db/migrate/20250319085738_add_recoverable_fields_to_old_users.rb
 - spec/rails_app/db/schema.rb
 - spec/spec_helper.rb