revise_auth 0.4.0 → 0.5.0

data/config/locales/zh-TW.yml

@@ -1,16 +1,64 @@
+---
 zh-TW:
+  activerecord:
+    attributes:
+      user:
+        email: Email
+        password: Password
+        password_challenge: Current password
+        password_confirmation: Password confirmation
   revise_auth:
-    account_deleted: "您的帳號已經被刪除"
-    account_updated: "帳號更新成功"
-
-    invalid_email_or_password: "錯誤的信箱或是密碼"
-    sign_up_or_login: "需要註冊或是登入才能進行"
-
-    # Password changes
-    password_changed: "您的密碼已經成功地更新"
-    incorrect_password: "您現在輸入的密碼不正確, 請重新嘗試"
-
-    # Email confirmations
-    email_confirmed: "您的電子信箱已經成功地通過驗證"
-    email_confirm_failed: "無法驗證您的電子信箱"
-    confirmation_email_sent: "電子信箱驗證信已寄往 %{email}"
+    email:
+      show:
+        email_confirm_failed: 無法驗證您的電子信箱
+        email_confirmed: 您的電子信箱已經成功地通過驗證
+      update:
+        confirmation_email_sent: 電子信箱驗證信已寄往 %{email}
+    mailer:
+      confirm_email:
+        confirm: Confirm my account
+        confirm_below: 'You can confirm your account email through the link below:'
+        expiration_notice: This link will expire in 24 hours.
+        welcome: Welcome %{email}!
+      password_reset:
+        expiration_notice: This link will expire in 1 hour.
+        reset_password: Reset my password
+        reset_password_below: We've received a password reset request for your login. If this was you just visit the link below to finish up. If it wasn't you, you can simply ignore this email.
+    password:
+      update:
+        incorrect_password: 您現在輸入的密碼不正確, 請重新嘗試
+        password_changed: 您的密碼已經成功地更新
+    password_resets:
+      create:
+        password_reset_sent: An email with password reset instructions has been sent if that account exists.
+      edit:
+        invalid_password_link: The provided password reset link is invalid.
+        reset_password: Reset password
+      new:
+        send_password_reset_instructions: Send Password Reset Instructions
+    registrations:
+      destroy:
+        account_deleted: 您的帳號已經被刪除
+      edit:
+        change_email_address: Change Email Address
+        change_password: Change Password
+        confirm: Are you sure?
+        confirmation_instructions: To change your email, we will send a confirmation email to your new address to complete the change.
+        current_email_address: 'Your email address is: %{email}.'
+        delete_account: Delete my account
+        new_email: New Email
+        new_password: New password
+        profile: Profile
+        save: Save Changes
+        waiting_confirmation: Waiting for confirmation of %{email}.
+      new:
+        sign_up: Sign up
+      update:
+        account_updated: 帳號更新成功
+    sessions:
+      create:
+        invalid_email_or_password: 錯誤的信箱或是密碼
+      new:
+        log_in: Log in
+        reset_password: Reset your password
+    sign_up_or_login: 需要註冊或是登入才能進行

data/lib/generators/revise_auth/model_generator.rb

@@ -1,32 +1,27 @@
 module ReviseAuth
   module Generators
-    class ModelGenerator < Rails::Generators::NamedBase
-      include Rails::Generators::ResourceHelpers
-
-      desc "Generates a model for authentication, default User"
+    class ModelGenerator < Rails::Generators::Base
+      desc "Generates the User model for authentication"
 
       source_root File.expand_path("templates", __dir__)
 
-      argument :name, required: false, default: "User"
-      argument :attributes, type: :array, default: [], banner: "field:type field:type"
-
-      def initialize(args, *options)
-        @original_attributes = args[1..] || []
-        super
+      argument :attributes, type: :array, default: [], banner: "field[:type][:index] field[:type][:index]"
+      hook_for :orm, required: true, desc: "ORM to be invoked" do |instance, model|
+        instance.invoke model, ["User", "email:string:uniq", "password_digest:string", "confirmed_at:datetime", "unconfirmed_email:string", *instance.attributes]
       end
 
-      def generate_model
-        generate :model, name, *model_attributes
+      def change_attributes_null
+        return unless behavior == :invoke
+        gsub_file migration_path, /t\.string :email$/, "t.string :email, null: false"
+        gsub_file migration_path, /t\.string :password_digest$/, "t.string :password_digest, null: false"
       end
 
       def add_revise_auth_model
-        inject_into_class model_path, class_name, "  include ReviseAuth::Model\n"
+        inject_into_class "app/models/user.rb", "User", "  include ReviseAuth::Model\n" if behavior == :invoke
       end
 
-      def add_uniq_to_email_index
-        insert_into_file migration_path, after: "#{name.downcase.pluralize}, :email", force: true do
-          ", unique: true"
-        end
+      def copy_initializer
+        template "initializer.rb", "config/initializers/revise_auth.rb"
       end
 
       def done
@@ -38,19 +33,6 @@ module ReviseAuth
       def migration_path
         @migration_path ||= Dir.glob(Rails.root.join("db/migrate/*")).max_by { |f| File.mtime(f) }
       end
-
-      def model_path
-        @model_path ||= File.join("app", "models", "#{file_path}.rb")
-      end
-
-      def model_attributes
-        [
-          "email:string:index",
-          "password_digest:string",
-          "confirmed_at:datetime",
-          "unconfirmed_email:string"
-        ] + @original_attributes
-      end
     end
   end
 end

data/lib/generators/revise_auth/templates/README

@@ -1,4 +1,7 @@
-🚚 Your Revise auth database model has been generated!
+🚚 Your ReviseAuth User has been generated!
 
 Next step:
   Run "rails db:migrate"
+
+To customize views:
+  Run "rails generate revise_auth:views"

data/lib/generators/revise_auth/templates/initializer.rb

@@ -0,0 +1,5 @@
+ReviseAuth.configure do |config|
+  # Customize the params for registration and update profile.
+  # config.sign_up_params += [:time_zone]
+  # config.update_params += [:time_zone]
+end

data/lib/revise_auth/model.rb

@@ -7,7 +7,6 @@ module ReviseAuth
       base.const_set :PASSWORD_RESET_TOKEN_VALIDITY, 1.hour
 
       has_secure_password
-      has_secure_token :confirmation_token
 
       generates_token_for :password_reset, expires_in: base.const_get(:PASSWORD_RESET_TOKEN_VALIDITY) do
         BCrypt::Password.new(password_digest).salt[-10..]
@@ -31,8 +30,14 @@ module ReviseAuth
       ReviseAuth::Mailer.with(user: self, token: token).confirm_email.deliver_later
     end
 
+    # Generates a password reset token and send email to the user
+    def send_password_reset_instructions
+      token = generate_token_for(:password_reset)
+      ReviseAuth::Mailer.with(user: self, token: token).password_reset.deliver_later
+    end
+
     def confirm_email_change
-      update(confirmed_at: Time.current, email: unconfirmed_email)
+      update(confirmed_at: Time.current, email: unconfirmed_email, unconfirmed_email: nil)
     end
   end
 end

data/lib/revise_auth/route_constraint.rb

@@ -8,6 +8,8 @@ module ReviseAuth
 
     include Authentication
 
+    delegate :session, to: :@request
+
     def initialize(request)
       @request = request
     end

data/lib/revise_auth/routes.rb

@@ -1,5 +1,7 @@
 module ActionDispatch::Routing
   class Mapper
+    # Adds helpers for config/routes.rb to constraint routes with authentication
+
     def revise_auth
       scope module: :revise_auth do
         revise_registration
@@ -21,10 +23,11 @@ module ActionDispatch::Routing
       end
     end
 
-    # Adds helpers for config/routes.rb to constraint routes with authentication
-    #
-    def authenticated
-      constraints ->(request) { ReviseAuth::RouteConstraint.new(request).user_signed_in? } do
+    def authenticated(block = nil)
+      constraints ->(request) {
+        rc = ReviseAuth::RouteConstraint.new(request)
+        rc.user_signed_in? && (block.nil? || block.call(rc.current_user))
+      } do
         yield
       end
     end

data/lib/revise_auth/version.rb

@@ -1,3 +1,3 @@
 module ReviseAuth
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/revise_auth.rb

@@ -7,4 +7,9 @@ module ReviseAuth
   autoload :Current, "revise_auth/current"
   autoload :Model, "revise_auth/model"
   autoload :RouteConstraint, "revise_auth/route_constraint"
+
+  include ActiveSupport::Configurable
+
+  config_accessor :sign_up_params, default: [:name, :email, :password, :password_confirmation]
+  config_accessor :update_params, default: [:name]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: revise_auth
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Oliver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-27 00:00:00.000000000 Z
+date: 2024-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -62,9 +62,12 @@ files:
 - app/views/revise_auth/registrations/edit.html.erb
 - app/views/revise_auth/registrations/new.html.erb
 - app/views/revise_auth/sessions/new.html.erb
+- config/i18n-tasks.yml
+- config/locales/cs.yml
 - config/locales/de.yml
 - config/locales/el.yml
 - config/locales/en.yml
+- config/locales/es.yml
 - config/locales/fr.yml
 - config/locales/nl.yml
 - config/locales/pt.yml
@@ -72,6 +75,7 @@ files:
 - config/locales/zh-TW.yml
 - lib/generators/revise_auth/model_generator.rb
 - lib/generators/revise_auth/templates/README
+- lib/generators/revise_auth/templates/initializer.rb
 - lib/generators/revise_auth/views_generator.rb
 - lib/revise_auth.rb
 - lib/revise_auth/authentication.rb
@@ -104,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Simple authentication for Ruby on Rails apps