authentication-zero 0.0.7 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00f2558085051718c5d29c5aeb4f4f5ebb5daf9d6a165c0f8dd588771b73789a
-  data.tar.gz: c4c548e20a25306b3dc44cc46fd4c5dae7d798a8bce4dc352bf0bce314b33b53
+  metadata.gz: 0ea1c631f09f3da8a3b5e183d431e5596875bd04044b0a6e74a44943d7eabb8d
+  data.tar.gz: 8242c5411752b806bca65bf8b3ac0d457231b830381b5d0369e6ea2daa2374f0
 SHA512:
-  metadata.gz: d3ea2a5b31a39bd3aa1f029c96f5c24791d6df8da63b41384e806ad79887122497e1845c4b509c4caf8414ff48eb1a6830d438c0f6d9b31870fed145999f3d84
-  data.tar.gz: 57b4ff721d9c4af1d30aa50f2495869d31a3a8a0d5017ee3d78d12df257625716e5dad2ba58e05a73c0c8e7a70e42bc519fe6ed77301da6fd58da0a6dddc1395
+  metadata.gz: 4f73c08b89896448ceb9ce7b19df4d97a6c7ec20bfbd977c2b07b10ef20535a45a94015ccee0e13c23351388e69d0b10598a9c2ed4678858147753fdf78631d8
+  data.tar.gz: 02d3dfd0571bb4d8f20a91eeae99f5d430f747c8651751ad4eecb566b214488535d029e746c63ea6c5a76566fc4e115c88d2c1f8a4b3801d02d0d0edc896f1ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (0.0.7)
+    authentication-zero (0.0.11)
 
 GEM
   remote: https://rubygems.org/

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "0.0.7"
+  VERSION = "0.0.11"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -23,7 +23,7 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
     if options.api
       directory "views/password_mailer", "app/views/password_mailer"
     else
-      directory "views/html", "app/views"
+      directory "views", "app/views"
     end
   end
 

data/lib/generators/authentication/templates/controllers/api/password_resets_controller.rb.tt

@@ -1,9 +1,10 @@
 class PasswordResetsController < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]
   skip_before_action :authenticate
 
+  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]
+
   def edit
-    render json: { message: "Open this link in your device" }, status: :not_found
+    render json: { error: "Open this link in your device" }, status: :not_found
   end
 
   def create
@@ -24,7 +25,7 @@ class PasswordResetsController < ApplicationController
 
   private
     def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:token], purpose: "password_reset")
+      @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:sid], purpose: "password_reset")
     rescue ActiveSupport::MessageVerifier::InvalidSignature
       render json: { error: "Your token has expired, please request a new one" }, status: :bad_request
     end

data/lib/generators/authentication/templates/controllers/html/password_resets_controller.rb.tt

@@ -1,7 +1,8 @@
 class PasswordResetsController < ApplicationController
-  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]
   skip_before_action :authenticate
 
+  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]
+
   def new
   end
 
@@ -27,9 +28,9 @@ class PasswordResetsController < ApplicationController
 
   private
     def set_<%= singular_table_name %>
-      @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:token], purpose: "password_reset")
+      @<%= singular_table_name %> = <%= class_name %>.find_signed!(params[:sid], purpose: "password_reset")
     rescue ActiveSupport::MessageVerifier::InvalidSignature
-      redirect_to sign_in_path, alert: "Your token has expired, please request a new one"
+      redirect_to password_reset_new_path, alert: "Your token has expired, please request a new one"
     end
 
     def password_params

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

@@ -1,6 +1,6 @@
 class PasswordMailer < ApplicationMailer
   def reset
-    @token = params[:<%= singular_table_name %>].signed_id(purpose: "password_reset", expires_in: 15.minutes)
+    @signed_id = params[:<%= singular_table_name %>].signed_id(purpose: "password_reset", expires_in: 20.minutes)
     mail to: params[:<%= singular_table_name %>].email
   end
 end

data/lib/generators/authentication/templates/views/cancellations/new.html.erb.tt

@@ -1,11 +1,11 @@
 <h1>Want to close your account?</h1>
 
-<p>Your account will be immediately closed. You won’t be able to sign in anymore.</p>
+<p>Your account will be immediately closed. You won't be able to sign in anymore.</p>
 <p>Your data will be permanently deleted from our servers.</p>
 <p><%%= link_to "Back", root_path %></p>
 
 <br>
 
 <div>
-  <%%= button_to "OK, close my account", cancellation_path, method: :post %>
+  <%%= button_to "OK, close my account", cancellation_path %>
 </div>

data/lib/generators/authentication/templates/views/password_mailer/reset.html.erb.tt

@@ -1,7 +1,11 @@
-Hi <%%= params[:<%= singular_table_name %>].email %>,
+<p>Hey there,</p>
 
-Someone requested a reset of your password.
+<p>Can't remember your password for <strong><%%= params[:<%= singular_table_name %>].email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
 
-If this was you, click the link to reset your password. The link will expire automatically in 15 minutes.
+<p><%%= link_to "Reset my password", password_reset_edit_url(sid: @signed_id) %></p>
 
-<%%= link_to "Reset password", password_reset_edit_url(token: @token) %>
+<p>If you did not request a password reset you can safely ignore this email, it expires in 20 minutes. Only someone with access to this email account can reset your password.</p>
+
+<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/views/password_mailer/reset.text.erb.tt

@@ -1,7 +1,9 @@
-Hi <%%= params[:<%= singular_table_name %>].email %>,
+Hey there,
 
-Someone requested a reset of your password.
+Can't remember your password for <%%= params[:<%= singular_table_name %>].email %>? That's OK, it happens. Just hit the link below to set a new one.
 
-If this was you, click the link to reset your password. The link will expire automatically in 15 minutes.
+[Reset my password]<%%= password_reset_edit_url(sid: @signed_id) %>
 
-<%%= password_reset_edit_url(token: @token) %>
+If you did not request a password reset you can safely ignore this email, it expires in 20 minutes. Only someone with access to this email account can reset your password.
+
+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/views/password_resets/edit.html.erb.tt

@@ -1,6 +1,6 @@
 <h1>Reset your password</h1>
 
-<%%= form_with(model: @<%= model_resource_name %>, url: password_reset_path(token: params[:token])) do |form| %>
+<%%= form_with(model: @<%= model_resource_name %>, url: password_reset_path) do |form| %>
   <%% if @<%= singular_table_name %>.errors.any? %>
     <div style="color: red">
       <h2><%%= pluralize(@<%= singular_table_name %>.errors.count, "error") %> prohibited this <%= singular_table_name %> from being saved:</h2>
@@ -13,24 +13,20 @@
     </div>
   <%% end %>
 
+  <%%= hidden_field_tag :sid, params[:sid] %>
+
   <div>
-    <%%= form.label :password, "New password (8 characters minimum)", style: "display: block" %>
+    <%%= form.label :password, "New password", style: "display: block" %>
     <%%= form.password_field :password, autofocus: true, autocomplete: "new-password" %>
+    <div>8 characters minimum.</div>
   </div>
 
   <div>
-    <%%= form.label :password_confirmation, style: "display: block" %>
+    <%%= form.label :password_confirmation, "Confirm new password", style: "display: block" %>
     <%%= form.password_field :password_confirmation, autocomplete: "new-password" %>
   </div>
 
   <div>
-    <%%= form.submit "Reset password" %>
+    <%%= form.submit "Save changes" %>
   </div>
 <%% end %>
-
-<br>
-
-<div>
-  <%%= link_to "Sign in", sign_in_path %> |
-  <%%= link_to "Sign up", sign_up_path %>
-</div>

data/lib/generators/authentication/templates/views/password_resets/new.html.erb.tt

@@ -5,17 +5,10 @@
 <%%= form_with(url: password_reset_path) do |form| %>
   <div>
     <%%= form.label :email, style: "display: block" %>
-    <%%= form.email_field :email, autofocus: true, required: true, autocomplete: "email" %>
+    <%%= form.email_field :email, autofocus: true, required: true %>
   </div>
 
   <div>
     <%%= form.submit "Send password reset email" %>
   </div>
 <%% end %>
-
-<br>
-
-<div>
-  <%%= link_to "Sign in", sign_in_path %> |
-  <%%= link_to "Sign up", sign_up_path %>
-</div>

data/lib/generators/authentication/templates/views/passwords/edit.html.erb.tt

@@ -21,12 +21,13 @@
   </div>
 
   <div>
-    <%%= form.label :password, "New password (8 characters minimum)", style: "display: block" %>
+    <%%= form.label :password, "New password", style: "display: block" %>
     <%%= form.password_field :password, autocomplete: "new-password" %>
+    <div>8 characters minimum.</div>
   </div>
 
   <div>
-    <%%= form.label :password_confirmation, style: "display: block" %>
+    <%%= form.label :password_confirmation, "Confirm new password", style: "display: block" %>
     <%%= form.password_field :password_confirmation, autocomplete: "new-password" %>
   </div>
 

data/lib/generators/authentication/templates/views/registrations/new.html.erb.tt

@@ -19,8 +19,9 @@
   </div>
 
   <div>
-    <%%= form.label :password, "Password (8 characters minimum)", style: "display: block" %>
+    <%%= form.label :password, style: "display: block" %>
     <%%= form.password_field :password, autocomplete: "new-password" %>
+    <div>8 characters minimum.</div>
   </div>
 
   <div>
@@ -32,9 +33,3 @@
     <%%= form.submit "Sign up" %>
   </div>
 <%% end %>
-
-<br>
-
-<div>
-  <%%= link_to "Sign in", sign_in_path %>
-</div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.11
 platform: ruby
 authors:
 - Nixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-15 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: