revise_auth 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fac687711be2bb236ceab0cb252c397a71775ccd00bf3e2b77ab61888555d16
-  data.tar.gz: 4ce79cc15599316b649ea7e8ef3c1c54cd1c74f4ce0bb26685932b7c4c4e3303
+  metadata.gz: f5d5afd1201c6a751a50e0c153589fa552e949c45cad6da9f3147670e6aaf274
+  data.tar.gz: 9d546d451af57bbc97d4e6dbae0dc83b00b6818fa14210f1a32735f79295686e
 SHA512:
-  metadata.gz: 9cb6ca3ca5f50d741c5e5ee319f438f1912496ab4c1f025c6225f6b6297f5dc94b06d025ed2f95e75bc56f8dc2915e81f8cf05af2faa08fc8dc537f811fc0428
-  data.tar.gz: 5c861bee5d4506055a967a8d755ac6b3959ccdcd5b399544f00444330ef52fa99e83abe536bed22be4868fca47202332bec38e8dfa0ad75a442acfb11798d296
+  metadata.gz: 39331cdedcd79bc56c9237436bbf844ea5b1b863242b3cf4b5935a48bc492e2ebfdc8d5e5bc987f92b22556f58558876e418e94c2850d1eb0be659e54067ec1e
+  data.tar.gz: d1a39f4b6f81989be85657b540fcad3f0fbcb0a52ea3b184ea86263391ea204e192adf7038e164da190c03d6837da4c2ce8f3157779b6489cad65981e78f877f

data/README.md

@@ -14,7 +14,7 @@ bundle add "revise_auth"
 
 And then execute the following to generate a `User` model (optionally adding other fields such as `first_name` and `last_name`):
 ```bash
-$ rails g revise_auth:model first_name last_name
+$ rails g revise_auth:model User first_name last_name
 $ rails db:migrate
 ```
 

data/app/controllers/revise_auth/email_controller.rb

@@ -3,9 +3,8 @@ class ReviseAuth::EmailController < ReviseAuthController
 
   # GET /profile/email?confirmation_token=abcdef
   def show
-    if User.find_by(confirmation_token: params[:confirmation_token])&.confirm_email_change
+    if User.find_by_token_for(:email_verification, params[:confirmation_token])&.confirm_email_change
       flash[:notice] = I18n.t("revise_auth.email_confirmed")
-      user_signed_in?
       redirect_to(user_signed_in? ? profile_path : root_path)
     else
       redirect_to root_path, alert: I18n.t("revise_auth.email_confirm_failed")

data/app/mailers/revise_auth/mailer.rb

@@ -1,5 +1,8 @@
 class ReviseAuth::Mailer < ApplicationMailer
   def confirm_email
-    mail to: params[:user].unconfirmed_email
+    @user = params[:user]
+    @token = params[:token]
+
+    mail to: @user.unconfirmed_email
   end
 end

data/app/views/revise_auth/mailer/confirm_email.html.erb

@@ -1,7 +1,7 @@
-<p>Welcome <%= params[:user].unconfirmed_email %>!</p>
+<p>Welcome <%= @user.unconfirmed_email %>!</p>
 
 <p>You can confirm your account email through the link below:</p>
 
-<p><%= link_to 'Confirm my account', profile_email_url(confirmation_token: params[:user].confirmation_token) %></p>
+<p><%= link_to "Confirm my account", profile_email_url(confirmation_token: @token) %></p>
 
 <p>This link will expire in 24 hours.</p>

data/lib/generators/revise_auth/model_generator.rb

@@ -47,9 +47,7 @@ module ReviseAuth
         [
           "email:string:index",
           "password_digest:string",
-          "confirmation_token:string",
           "confirmed_at:datetime",
-          "confirmation_sent_at:datetime",
           "unconfirmed_email:string"
         ] + @original_attributes
       end

data/lib/revise_auth/model.rb

@@ -2,12 +2,16 @@ module ReviseAuth
   module Model
     extend ActiveSupport::Concern
 
-    included do
-      include Backports if Rails.gem_version < Gem::Version.new("7.1")
+    included do |base|
+      base.const_set :EMAIL_VERIFICATION_TOKEN_VALIDITY, 1.day
 
       has_secure_password
       has_secure_token :confirmation_token
 
+      generates_token_for :email_verification, expires_in: base.const_get(:EMAIL_VERIFICATION_TOKEN_VALIDITY) do
+        email
+      end
+
       validates :email, format: {with: URI::MailTo::EMAIL_REGEXP}, presence: true, uniqueness: true
       validates :unconfirmed_email, format: {with: URI::MailTo::EMAIL_REGEXP}, allow_blank: true
       validates_length_of :password, minimum: 12, allow_nil: true
@@ -20,29 +24,12 @@ module ReviseAuth
 
     # Generates a confirmation token and send email to the user
     def send_confirmation_instructions
-      update!(
-        confirmation_token: self.class.generate_unique_secure_token(length: ActiveRecord::SecureToken::MINIMUM_TOKEN_LENGTH),
-        confirmation_sent_at: Time.current
-      )
-      ReviseAuth::Mailer.with(user: self).confirm_email.deliver_later
+      token = generate_token_for(:email_verification)
+      ReviseAuth::Mailer.with(user: self, token: token).confirm_email.deliver_later
     end
 
-    # Confirms an email address change
     def confirm_email_change
-      if confirmation_period_expired?
-        false
-      else
-        update(
-          confirmed_at: Time.current,
-          email: unconfirmed_email,
-          unconfirmed_email: nil
-        )
-      end
-    end
-
-    # Checks whether the confirmation token is within the valid time
-    def confirmation_period_expired?
-      confirmation_sent_at.before?(1.day.ago)
+      update(confirmed_at: Time.current, email: unconfirmed_email)
     end
   end
 end

data/lib/revise_auth/version.rb

@@ -1,3 +1,3 @@
 module ReviseAuth
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/revise_auth.rb

@@ -4,7 +4,6 @@ require "revise_auth/routes"
 
 module ReviseAuth
   autoload :Authentication, "revise_auth/authentication"
-  autoload :Backports, "revise_auth/backports"
   autoload :Current, "revise_auth/current"
   autoload :Model, "revise_auth/model"
   autoload :RouteConstraint, "revise_auth/route_constraint"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revise_auth
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-05 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 7.1.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.4
+        version: 7.1.0.beta1
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -70,7 +70,6 @@ files:
 - lib/generators/revise_auth/views_generator.rb
 - lib/revise_auth.rb
 - lib/revise_auth/authentication.rb
-- lib/revise_auth/backports.rb
 - lib/revise_auth/current.rb
 - lib/revise_auth/engine.rb
 - lib/revise_auth/model.rb
@@ -100,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Simple authentication for Ruby on Rails apps

data/lib/revise_auth/backports.rb

@@ -1,24 +0,0 @@
-module ReviseAuth
-  module Backports
-    extend ActiveSupport::Concern
-
-    class_methods do
-      # Prevent timing-based enumeration attacks.
-      # This can be removed when Rails 7.1 is released.
-      def authenticate_by(attributes)
-        passwords, identifiers = attributes.to_h.partition do |name, value|
-          !has_attribute?(name) && has_attribute?("#{name}_digest")
-        end.map(&:to_h)
-
-        raise ArgumentError, "One or more password arguments are required" if passwords.empty?
-        raise ArgumentError, "One or more finder arguments are required" if identifiers.empty?
-        if (record = find_by(identifiers))
-          record if passwords.count { |name, value| record.send(:"authenticate_#{name}", value) } == passwords.size
-        else
-          new(passwords)
-          nil
-        end
-      end
-    end
-  end
-end