authentication-zero 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff917e8d503041f0656c5897b5ccf89d2304b73633dc41198089052b3eeab2b5
-  data.tar.gz: c6c2d8e0be204bc3eb59bdf62aebe98a8b1de24e8610d2653bf8b274db3c3813
+  metadata.gz: 0ea1c631f09f3da8a3b5e183d431e5596875bd04044b0a6e74a44943d7eabb8d
+  data.tar.gz: 8242c5411752b806bca65bf8b3ac0d457231b830381b5d0369e6ea2daa2374f0
 SHA512:
-  metadata.gz: 54a53d0d0124155b3187ee51d568310834bb63fbab8c99520ecd816bdad57ad3bdc450105509b721fce934d13952f43db08d35178c8365e63526baa940f1e32e
-  data.tar.gz: 629dccfe0f036adea1bdb3655d574bbbe713259ac55a56769f475405cfcb27c6006199a0b33225ca0dc6826db87e3c21ac84a9e4a1813210d304997f59acbe0d
+  metadata.gz: 4f73c08b89896448ceb9ce7b19df4d97a6c7ec20bfbd977c2b07b10ef20535a45a94015ccee0e13c23351388e69d0b10598a9c2ed4678858147753fdf78631d8
+  data.tar.gz: 02d3dfd0571bb4d8f20a91eeae99f5d430f747c8651751ad4eecb566b214488535d029e746c63ea6c5a76566fc4e115c88d2c1f8a4b3801d02d0d0edc896f1ea

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    authentication-zero (0.0.10)
+    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.10"
+  VERSION = "0.0.11"
 end

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

@@ -25,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,7 @@
 class PasswordResetsController < ApplicationController
   skip_before_action :authenticate
 
-  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]  
+  before_action :set_<%= singular_table_name %>, only: %i[ edit update ]
 
   def new
   end
@@ -28,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: 20.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,6 +1,6 @@
 <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>
 

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

@@ -1,8 +1,8 @@
 <p>Hey there,</p>
 
-<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>
+<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>
 
-<p><%%= link_to "Reset my password", password_reset_edit_url(token: @token) %></p>
+<p><%%= link_to "Reset my password", password_reset_edit_url(sid: @signed_id) %></p>
 
 <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>
 

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

@@ -1,8 +1,8 @@
 Hey there,
 
-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.
+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.
 
-[Reset my password]<%%= password_reset_edit_url(token: @token) %>
+[Reset my password]<%%= password_reset_edit_url(sid: @signed_id) %>
 
 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.
 

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,6 +13,8 @@
     </div>
   <%% end %>
 
+  <%%= hidden_field_tag :sid, params[:sid] %>
+
   <div>
     <%%= form.label :password, "New password", style: "display: block" %>
     <%%= form.password_field :password, autofocus: true, autocomplete: "new-password" %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nixon