authentication-zero 2.11.1 → 2.12.1

data/lib/generators/authentication/templates/test_unit/controllers/api/sessions_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class SessionsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %>, @token = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user, @token = sign_in_as(users(:lazaro_nixon))
   end
 
   def default_headers
@@ -15,24 +15,24 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should show session" do
-    get session_url(@<%= singular_table_name %>.sessions.last), headers: default_headers
+    get session_url(@user.sessions.last), headers: default_headers
     assert_response :success
   end
 
   test "should sign in" do
-    post sign_in_url, params: { email: @<%= singular_table_name %>.email, password: "Secret1*3*5*" }
+    post sign_in_url, params: { email: @user.email, password: "Secret1*3*5*" }
 
-    assert_enqueued_email_with SessionMailer, :signed_in_notification, args: { session: @<%= singular_table_name %>.sessions.last }
+    assert_enqueued_email_with SessionMailer, :signed_in_notification, args: { session: @user.sessions.last }
     assert_response :created
   end
 
   test "should not sign in with wrong credentials" do
-    post sign_in_url, params: { email: @<%= singular_table_name %>.email, password: "SecretWrong1*3" }
+    post sign_in_url, params: { email: @user.email, password: "SecretWrong1*3" }
     assert_response :unauthorized
   end
 
   test "should sign out" do
-    delete session_url(@<%= singular_table_name %>.sessions.last), headers: default_headers
+    delete session_url(@user.sessions.last), headers: default_headers
     assert_response :no_content
   end
 end

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/email_verifications_controller_test.rb.tt

@@ -2,15 +2,15 @@ require "test_helper"
 
 class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
-    @sid = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 20.minutes)
-    @sid_exp = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 0.minutes)
+    @user = sign_in_as(users(:lazaro_nixon))
+    @sid = @user.signed_id(purpose: @user.email, expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: @user.email, expires_in: 0.minutes)
 
-    @<%= singular_table_name %>.update! verified: false
+    @user.update! verified: false
   end
 
   test "should send a verification email" do
-    assert_enqueued_email_with IdentityMailer, :email_verify_confirmation, args: { <%= singular_table_name %>: @<%= singular_table_name %> } do
+    assert_enqueued_email_with UserMailer, :email_verify_confirmation, args: { user: @user } do
       post identity_email_verification_url
     end
 
@@ -18,21 +18,21 @@ class Identity::EmailVerificationsControllerTest < ActionDispatch::IntegrationTe
   end
 
   test "should verify email" do
-    get edit_identity_email_verification_url(token: @sid, email: @<%= singular_table_name %>.email)
+    get edit_identity_email_verification_url(token: @sid, email: @user.email)
     assert_redirected_to root_url
   end
 
   test "should not verify email with expired token" do
-    get edit_identity_email_verification_url(token: @sid_exp, email: @<%= singular_table_name %>.email)
+    get edit_identity_email_verification_url(token: @sid_exp, email: @user.email)
 
     assert_redirected_to edit_identity_email_url
     assert_equal "That email verification link is invalid", flash[:alert]
   end
 
   test "should not verify email with previous token" do
-    @<%= singular_table_name %>.update! email: "other_email@hey.com"
+    @user.update! email: "other_email@hey.com"
 
-    get edit_identity_email_verification_url(token: @sid, email: @<%= singular_table_name %>.email_previously_was)
+    get edit_identity_email_verification_url(token: @sid, email: @user.email_previously_was)
 
     assert_redirected_to edit_identity_email_url
     assert_equal "That email verification link is invalid", flash[:alert]

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/emails_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Identity::EmailsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user = sign_in_as(users(:lazaro_nixon))
   end
 
   test "should get edit" do

data/lib/generators/authentication/templates/test_unit/controllers/html/identity/password_resets_controller_test.rb.tt

@@ -2,9 +2,9 @@ require "test_helper"
 
 class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = <%= table_name %>(:lazaro_nixon)
-    @sid = @<%= singular_table_name %>.signed_id(purpose: :password_reset, expires_in: 20.minutes)
-    @sid_exp = @<%= singular_table_name %>.signed_id(purpose: :password_reset, expires_in: 0.minutes)
+    @user = users(:lazaro_nixon)
+    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @sid_exp = @user.signed_id(purpose: :password_reset, expires_in: 0.minutes)
   end
 
   test "should get new" do
@@ -18,8 +18,8 @@ class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with IdentityMailer, :password_reset_provision, args: { <%= singular_table_name %>: @<%= singular_table_name %> } do
-      post identity_password_reset_url, params: { email: @<%= singular_table_name %>.email }
+    assert_enqueued_email_with UserMailer, :password_reset_provision, args: { user: @user } do
+      post identity_password_reset_url, params: { email: @user.email }
     end
 
     assert_redirected_to sign_in_url
@@ -35,10 +35,10 @@ class Identity::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should not send a password reset email to a unverified email" do
-    @<%= singular_table_name %>.update! verified: false
+    @user.update! verified: false
 
     assert_no_enqueued_emails do
-      post identity_password_reset_url, params: { email: @<%= singular_table_name %>.email }
+      post identity_password_reset_url, params: { email: @user.email }
     end
 
     assert_redirected_to new_identity_password_reset_url

data/lib/generators/authentication/templates/test_unit/controllers/html/passwords_controller_test.rb.tt

@@ -2,7 +2,7 @@ require "test_helper"
 
 class PasswordsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user = sign_in_as(users(:lazaro_nixon))
   end
 
   test "should get edit" do

data/lib/generators/authentication/templates/test_unit/controllers/html/registrations_controller_test.rb.tt

@@ -7,7 +7,7 @@ class RegistrationsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should sign up" do
-    assert_difference("<%= class_name %>.count") do
+    assert_difference("User.count") do
       post sign_up_url, params: { email: "lazaronixon@hey.com", password: "Secret1*3*5*", password_confirmation: "Secret1*3*5*" }
     end
 

data/lib/generators/authentication/templates/test_unit/controllers/html/sessions_controller_test.rb.tt

@@ -2,11 +2,11 @@ require "test_helper"
 
 class SessionsControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @<%= singular_table_name %> = <%= table_name %>(:lazaro_nixon)
+    @user = users(:lazaro_nixon)
   end
 
   test "should get index" do
-    sign_in_as @<%= singular_table_name %>
+    sign_in_as @user
 
     get sessions_url
     assert_response :success
@@ -18,8 +18,8 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should sign in" do
-    post sign_in_url, params: { email: @<%= singular_table_name %>.email, password: "Secret1*3*5*" }
-    assert_enqueued_email_with SessionMailer, :signed_in_notification, args: { session: @<%= singular_table_name %>.sessions.last }
+    post sign_in_url, params: { email: @user.email, password: "Secret1*3*5*" }
+    assert_enqueued_email_with SessionMailer, :signed_in_notification, args: { session: @user.sessions.last }
 
     assert_redirected_to root_url
 
@@ -28,8 +28,8 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should not sign in with wrong credentials" do
-    post sign_in_url, params: { email: @<%= singular_table_name %>.email, password: "SecretWrong1*3" }
-    assert_redirected_to sign_in_url(email_hint: @<%= singular_table_name %>.email)
+    post sign_in_url, params: { email: @user.email, password: "SecretWrong1*3" }
+    assert_redirected_to sign_in_url(email_hint: @user.email)
     assert_equal "That email or password is incorrect", flash[:alert]
 
     get root_url
@@ -37,9 +37,9 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should sign out" do
-    sign_in_as @<%= singular_table_name %>
+    sign_in_as @user
 
-    delete session_url(@<%= singular_table_name %>.sessions.last)
+    delete session_url(@user.sessions.last)
     assert_redirected_to sessions_url
 
     follow_redirect!

data/lib/generators/authentication/templates/test_unit/system/identity/emails_test.rb.tt

@@ -2,7 +2,7 @@ require "application_system_test_case"
 
 class Identity::EmailsTest < ApplicationSystemTestCase
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user = sign_in_as(users(:lazaro_nixon))
   end
 
   test "updating the email" do
@@ -16,7 +16,7 @@ class Identity::EmailsTest < ApplicationSystemTestCase
   end
 
   test "sending a verification email" do
-    @<%= singular_table_name %>.update! verified: false
+    @user.update! verified: false
 
     click_on "Change email address"
     click_on "Re-send verification email"

data/lib/generators/authentication/templates/test_unit/system/identity/password_resets_test.rb.tt

@@ -2,15 +2,15 @@ require "application_system_test_case"
 
 class Identity::PasswordResetsTest < ApplicationSystemTestCase
   setup do
-    @<%= singular_table_name %> = <%= table_name %>(:lazaro_nixon)
-    @sid = @<%= singular_table_name %>.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @user = users(:lazaro_nixon)
+    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
   end
 
   test "sending a password reset email" do
     visit sign_in_url
     click_on "Forgot your password?"
 
-    fill_in "Email", with: @<%= singular_table_name %>.email
+    fill_in "Email", with: @user.email
     click_on "Send password reset email"
 
     assert_text "Check your email for reset instructions"

data/lib/generators/authentication/templates/test_unit/system/passwords_test.rb.tt

@@ -2,7 +2,7 @@ require "application_system_test_case"
 
 class PasswordsTest < ApplicationSystemTestCase
   setup do
-    @<%= singular_table_name %> = sign_in_as(<%= table_name %>(:lazaro_nixon))
+    @user = sign_in_as(users(:lazaro_nixon))
   end
 
   test "updating the password" do

data/lib/generators/authentication/templates/test_unit/system/sessions_test.rb.tt

@@ -2,11 +2,11 @@ require "application_system_test_case"
 
 class SessionsTest < ApplicationSystemTestCase
   setup do
-    @<%= singular_table_name %> = <%= table_name %>(:lazaro_nixon)
+    @user = users(:lazaro_nixon)
   end
 
   test "visiting the index" do
-    sign_in_as @<%= singular_table_name %>
+    sign_in_as @user
 
     click_on "Devices & Sessions"
     assert_selector "h1", text: "Sessions"
@@ -14,7 +14,7 @@ class SessionsTest < ApplicationSystemTestCase
 
   test "signing in" do
     visit sign_in_url
-    fill_in "Email", with: @<%= singular_table_name %>.email
+    fill_in "Email", with: @user.email
     fill_in "Password", with: "Secret1*3*5*"
     click_on "Sign in"
 
@@ -22,7 +22,7 @@ class SessionsTest < ApplicationSystemTestCase
   end
 
   test "signing out" do
-    sign_in_as @<%= singular_table_name %>
+    sign_in_as @user
 
     click_on "Log out"
     assert_text "That session has been logged out"

data/lib/generators/authentication/templates/test_unit/test_helper.rb.tt

@@ -11,12 +11,12 @@ class ActiveSupport::TestCase
 
   # Add more helper methods to be used by all tests here...
   <%- if options.api? -%>
-  def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "Secret1*3*5*" }); [<%= singular_table_name %>, response.headers["X-Session-Token"]]
+  def sign_in_as(user)
+    post(sign_in_url, params: { email: user.email, password: "Secret1*3*5*" }); [user, response.headers["X-Session-Token"]]
   end
   <%- else -%>
-  def sign_in_as(<%= singular_table_name %>)
-    post(sign_in_url, params: { email: <%= singular_table_name %>.email, password: "Secret1*3*5*" }); <%= singular_table_name %>
+  def sign_in_as(user)
+    post(sign_in_url, params: { email: user.email, password: "Secret1*3*5*" }); user
   end
   <%- end -%>
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 2.11.1
+  version: 2.12.1
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2022-04-14 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -57,14 +57,10 @@ files:
 - lib/generators/authentication/templates/controllers/html/sessions_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/two_factor_authentication/challenges_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/two_factor_authentication/totps_controller.rb.tt
-- lib/generators/authentication/templates/erb/authentications/events/index.html.erb
+- lib/generators/authentication/templates/erb/authentications/events/index.html.erb.tt
 - lib/generators/authentication/templates/erb/identity/emails/edit.html.erb.tt
 - lib/generators/authentication/templates/erb/identity/password_resets/edit.html.erb.tt
 - lib/generators/authentication/templates/erb/identity/password_resets/new.html.erb.tt
-- lib/generators/authentication/templates/erb/identity_mailer/email_verify_confirmation.html.erb.tt
-- lib/generators/authentication/templates/erb/identity_mailer/email_verify_confirmation.text.erb.tt
-- lib/generators/authentication/templates/erb/identity_mailer/password_reset_provision.html.erb.tt
-- lib/generators/authentication/templates/erb/identity_mailer/password_reset_provision.text.erb.tt
 - lib/generators/authentication/templates/erb/passwords/edit.html.erb.tt
 - lib/generators/authentication/templates/erb/registrations/new.html.erb.tt
 - lib/generators/authentication/templates/erb/session_mailer/signed_in_notification.html.erb.tt
@@ -74,16 +70,20 @@ files:
 - lib/generators/authentication/templates/erb/sessions/sudos/new.html.erb.tt
 - lib/generators/authentication/templates/erb/two_factor_authentication/challenges/new.html.erb.tt
 - lib/generators/authentication/templates/erb/two_factor_authentication/totps/new.html.erb.tt
-- lib/generators/authentication/templates/mailers/identity_mailer.rb.tt
+- lib/generators/authentication/templates/erb/user_mailer/email_verify_confirmation.html.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/email_verify_confirmation.text.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/password_reset_provision.html.erb.tt
+- lib/generators/authentication/templates/erb/user_mailer/password_reset_provision.text.erb.tt
 - lib/generators/authentication/templates/mailers/session_mailer.rb.tt
+- lib/generators/authentication/templates/mailers/user_mailer.rb.tt
 - lib/generators/authentication/templates/migrations/create_events_migration.rb.tt
 - lib/generators/authentication/templates/migrations/create_sessions_migration.rb.tt
-- lib/generators/authentication/templates/migrations/create_table_migration.rb.tt
+- lib/generators/authentication/templates/migrations/create_users_migration.rb.tt
 - lib/generators/authentication/templates/models/current.rb.tt
 - lib/generators/authentication/templates/models/event.rb.tt
 - lib/generators/authentication/templates/models/locking.rb.tt
-- lib/generators/authentication/templates/models/model.rb.tt
 - lib/generators/authentication/templates/models/session.rb.tt
+- lib/generators/authentication/templates/models/user.rb.tt
 - lib/generators/authentication/templates/test_unit/application_system_test_case.rb.tt
 - lib/generators/authentication/templates/test_unit/controllers/api/identity/email_verifications_controller_test.rb.tt
 - lib/generators/authentication/templates/test_unit/controllers/api/identity/emails_controller_test.rb.tt
@@ -97,13 +97,13 @@ files:
 - lib/generators/authentication/templates/test_unit/controllers/html/passwords_controller_test.rb.tt
 - lib/generators/authentication/templates/test_unit/controllers/html/registrations_controller_test.rb.tt
 - lib/generators/authentication/templates/test_unit/controllers/html/sessions_controller_test.rb.tt
-- lib/generators/authentication/templates/test_unit/fixtures.yml.tt
 - lib/generators/authentication/templates/test_unit/system/identity/emails_test.rb.tt
 - lib/generators/authentication/templates/test_unit/system/identity/password_resets_test.rb.tt
 - lib/generators/authentication/templates/test_unit/system/passwords_test.rb.tt
 - lib/generators/authentication/templates/test_unit/system/registrations_test.rb.tt
 - lib/generators/authentication/templates/test_unit/system/sessions_test.rb.tt
 - lib/generators/authentication/templates/test_unit/test_helper.rb.tt
+- lib/generators/authentication/templates/test_unit/users.yml.tt
 homepage: https://github.com/lazaronixon/authentication-zero
 licenses:
 - MIT

data/lib/generators/authentication/templates/erb/identity_mailer/email_verify_confirmation.html.erb.tt

@@ -1,11 +0,0 @@
-<p>Hey there,</p>
-
-<p>This is to confirm that <%%= @<%= singular_table_name %>.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.</p>
-
-<p><strong>You must hit the link below to confirm that you received this email.</strong></p>
-
-<%%= link_to "Yes, use this email for my account", edit_identity_email_verification_url(token: @signed_id, email: @<%= singular_table_name %>.email) %>
-
-<hr>
-
-<p>Have questions or need help? Just reply to this email and our support team will help you sort it out.</p>

data/lib/generators/authentication/templates/erb/identity_mailer/email_verify_confirmation.text.erb.tt

@@ -1,9 +0,0 @@
-Hey there,
-
-This is to confirm that <%%= @<%= singular_table_name %>.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.
-
-You must hit the link below to confirm that you received this email.
-
-[Yes, use this email for my account]<%%= edit_identity_email_verification_url(token: @signed_id, email: @<%= singular_table_name %>.email) %>
-
-Have questions or need help? Just reply to this email and our support team will help you sort it out.

data/lib/generators/authentication/templates/mailers/identity_mailer.rb.tt

@@ -1,15 +0,0 @@
-class IdentityMailer < ApplicationMailer
-  def password_reset_provision
-    @<%= singular_table_name %> = params[:<%= singular_table_name %>]
-    @signed_id = @<%= singular_table_name %>.signed_id(purpose: :password_reset, expires_in: 20.minutes)
-
-    mail to: @<%= singular_table_name %>.email, subject: "Reset your password"
-  end
-
-  def email_verify_confirmation
-    @<%= singular_table_name %> = params[:<%= singular_table_name %>]
-    @signed_id = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 2.days)
-
-    mail to: @<%= singular_table_name %>.email, subject: "Verify your email"
-  end
-end