authentication-zero 0.0.8 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07c68a23f93d453c769787635ca42269f5f36e7c7a6b23aef28e7d99c530770e
-  data.tar.gz: a636bcbea4839a311ece1ed5f9985f5b3c7802e10a90fe11a7a5a580c0383759
+  metadata.gz: c9a25e8862ad568105b15810d98b4efb68b1d7a69199c35ff7a726b991aeb21d
+  data.tar.gz: fd37bc06817fb23c8bd61c4cfe8635932be62ae94df89b5f5928f55b749e0a7d
 SHA512:
-  metadata.gz: 44f612049c4a25d7db96bd68ddeb5905e8aeb44a5d077c2d23e908877720b99a059da1750743383710d8843946263752db4614b05b9bee30e7eba7c1303e1e59
-  data.tar.gz: c08827199263f82df359d3d9fc4eeec04dd1087e2d24508ab531f8f55524cbab8af16cf3f2c5ca3d2099ff8da2a80b7988be6fe7affd8ca36b240035cbe74719
+  metadata.gz: 7c89d91c1e3b5259b2924b6c25ee09c094db9f71deb75944cf9387b45c7f3202cba8bc394539d1fc5c79038aeb5dbbbe74eed5b0ac4fd44c7f76377278380f24
+  data.tar.gz: 4f79e7af311270e7d995f8e07f3e2a73269c41b4fe17e31d7542e98547c96df4a6f55340d3575f05cd56e445582a9955443ca279ce8fe01f5fab4164d90c7d94

data/Gemfile.lock

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

data/README.md

@@ -31,11 +31,11 @@ Add these lines to your `app/views/home/index.html.erb`:
 <p>Signed as <%= Current.user.email %></p>
 
 <div>
-  <%= link_to "Change password", password_edit_path %>
+  <%= link_to "Change password", edit_passwords_path %>
 </div>
 
 <div>
-  <%= link_to "Cancel my account & delete my data", cancellation_new_path %>
+  <%= link_to "Cancel my account & delete my data", new_cancellations_path %>
 </div>
 
 <%= button_to "Log out", sign_out_path, method: :delete %>

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "0.0.8"
+  VERSION = "0.0.12"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -37,19 +37,14 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
   end
 
   def add_routes
-    route "get 'sign_up', to: 'registrations#new'" unless options.api?
+    route "resource :password_resets, only: [:new, :edit, :create, :update]"
+    route "resource :cancellations, only: [:new, :create]"
+    route "resource :passwords, only: [:update, :edit]"
+    route "delete 'sign_out', to: 'sessions#destroy'"
     route "post 'sign_up', to: 'registrations#create'"
-    route "get 'sign_in', to: 'sessions#new'" unless options.api?
+    route "get 'sign_up', to: 'registrations#new'" unless options.api?
     route "post 'sign_in', to: 'sessions#create'"
-    route "get 'password/edit', to: 'passwords#edit'" unless options.api?
-    route "patch 'password', to: 'passwords#update'"
-    route "get 'cancellation/new', to: 'cancellations#new'" unless options.api?
-    route "post 'cancellation', to: 'cancellations#destroy'"
-    route "get 'password_reset/new', to: 'password_resets#new'" unless options.api?
-    route "post 'password_reset', to: 'password_resets#create'"
-    route "get 'password_reset/edit', to: 'password_resets#edit'"
-    route "patch 'password_reset', to: 'password_resets#update'"
-    route "delete 'sign_out', to: 'sessions#destroy'"
+    route "get 'sign_in', to: 'sessions#new'" unless options.api?
   end
 
   def add_application_controller_methods

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

@@ -1,5 +1,5 @@
 class CancellationsController < ApplicationController
-  def destroy
+  def create
     Current.<%= singular_table_name %>.destroy
   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,12 +25,12 @@ 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
 
     def password_params
-      params.require(:<%= singular_table_name %>).permit(:password, :password_confirmation)
+      params.permit(:password, :password_confirmation)
     end
 end

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

@@ -17,6 +17,6 @@ class PasswordsController < ApplicationController
     end
 
     def password_params
-      params.require(:<%= singular_table_name %>).permit(:password, :password_confirmation)
+      params.permit(:password, :password_confirmation)
     end
 end

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

@@ -13,6 +13,6 @@ class RegistrationsController < ApplicationController
 
   private
     def <%= "#{singular_table_name}_params" %>
-      params.require(:<%= singular_table_name %>).permit(:email, :password, :password_confirmation)
+      params.permit(:email, :password, :password_confirmation)
     end
 end

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

@@ -2,7 +2,7 @@ class CancellationsController < ApplicationController
   def new
   end
 
-  def destroy
+  def create
     Current.<%= singular_table_name %>.destroy
     redirect_to sign_in_path, notice: "Bye! Your account has been successfully cancelled"
   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
 
@@ -13,7 +14,7 @@ class PasswordResetsController < ApplicationController
       PasswordMailer.with(<%= singular_table_name %>: @<%= singular_table_name %>).reset.deliver_later
       redirect_to sign_in_path, notice: "You will receive an email with instructions on how to reset your password in a few minutes"
     else
-      redirect_to password_reset_new_path, alert: "The email address doesn't exist in our database"
+      redirect_to new_password_resets_path, alert: "The email address doesn't exist in our database"
     end
   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 new_password_resets_path, alert: "Your token has expired, please request a new one"
     end
 
     def password_params

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

@@ -7,7 +7,7 @@ class PasswordsController < ApplicationController
 
   def update
     if !@<%= singular_table_name %>.authenticate(params[:current_password])
-      redirect_to password_edit_path, alert: "The current password you entered is incorrect"
+      redirect_to edit_passwords_path, alert: "The current password you entered is incorrect"
     elsif @<%= singular_table_name %>.update(password_params)
       redirect_to root_path, notice: "Your password has been changed successfully"
     else

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", cancellations_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", edit_password_resets_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]<%%= edit_password_resets_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_resets_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

@@ -2,20 +2,13 @@
 
 <h1>Forgot your password?</h1>
 
-<%%= form_with(url: password_reset_path) do |form| %>
+<%%= form_with(url: password_resets_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

@@ -2,7 +2,7 @@
 
 <h1>Change your password</h1>
 
-<%%= form_with(model: @<%= model_resource_name %>, url: password_path) do |form| %>
+<%%= form_with(model: @<%= model_resource_name %>, url: passwords_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>
@@ -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>

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

@@ -28,5 +28,5 @@
 
 <div>
   <%%= link_to "Sign up", sign_up_path %> |
-  <%%= link_to "Forgot your password?", password_reset_new_path %>
+  <%%= link_to "Forgot your password?", new_password_resets_path %>
 </div>

metadata

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