authentication-zero 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff917e8d503041f0656c5897b5ccf89d2304b73633dc41198089052b3eeab2b5
-  data.tar.gz: c6c2d8e0be204bc3eb59bdf62aebe98a8b1de24e8610d2653bf8b274db3c3813
+  metadata.gz: 0f9beaffb78e2f198c9276df8dda0a72f8029b55cd7d5b282aeb5c30b9abe02e
+  data.tar.gz: 2f7fb5ced42bde9126bae2a876ce58127e0b1ad27f4b6fbf8b675656ea557873
 SHA512:
-  metadata.gz: 54a53d0d0124155b3187ee51d568310834bb63fbab8c99520ecd816bdad57ad3bdc450105509b721fce934d13952f43db08d35178c8365e63526baa940f1e32e
-  data.tar.gz: 629dccfe0f036adea1bdb3655d574bbbe713259ac55a56769f475405cfcb27c6006199a0b33225ca0dc6826db87e3c21ac84a9e4a1813210d304997f59acbe0d
+  metadata.gz: 3a6602f790b8e9da67546b711df55b9e6e196d22bf06b12dfa8a2c84359d1d21d77a22a28d8eec4c06208ff2d27090c93e2c034e1d5e859370552886d518ffe6
+  data.tar.gz: 9535c89a33b6b0f8bfc50a8b5039a989b68e3204fdbca48f2501ba13d84cab77a9ef737329f0adf874a1f1b53694c0452aafe1ef5278f93df59198cf28286bf9

data/Gemfile.lock

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

data/README.md

@@ -31,11 +31,15 @@ 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 email", edit_emails_path %>
 </div>
 
 <div>
-  <%= link_to "Cancel my account & delete my data", cancellation_new_path %>
+  <%= link_to "Change password", edit_passwords_path %>
+</div>
+
+<div>
+  <%= 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.10"
+  VERSION = "0.0.14"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -16,11 +16,13 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
   end
 
   def create_mailers
+    template "mailers/email_mailer.rb", "app/mailers/email_mailer.rb"    
     template "mailers/password_mailer.rb", "app/mailers/password_mailer.rb"
   end
 
   def create_views
     if options.api
+      directory "views/email_mailer", "app/views/email_mailer"
       directory "views/password_mailer", "app/views/password_mailer"
     else
       directory "views", "app/views"
@@ -37,19 +39,15 @@ 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: [:edit, :update]"
+    route "resource :emails, only: [:edit, :update]"
+    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/emails_controller.rb.tt

@@ -0,0 +1,26 @@
+class EmailsController < ApplicationController
+  before_action :set_<%= singular_table_name %>
+
+  def update
+    if !@<%= singular_table_name %>.authenticate(params[:current_password])
+      render json: { error: "The current password you entered is incorrect" }, status: :bad_request
+    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+      if @<%= singular_table_name %>.email_previously_changed?
+        EmailMailer.with(email_change: @<%= singular_table_name %>.email_previous_change).changed.deliver_later
+      end
+
+      render json: @<%= singular_table_name %>
+    else
+      render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def set_<%= singular_table_name %>
+      @<%= singular_table_name %> = Current.<%= singular_table_name %>
+    end
+
+    def <%= "#{singular_table_name}_params" %>
+      params.permit(:email)
+    end
+end

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

@@ -16,7 +16,7 @@ class PasswordResetsController < ApplicationController
   end
 
   def update
-    if @<%= singular_table_name %>.update(password_params)
+    if @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
       render json: @<%= singular_table_name %>
     else
       render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity
@@ -25,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)
+    def <%= "#{singular_table_name}_params" %>
+      params.permit(:password, :password_confirmation)
     end
 end

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

@@ -4,7 +4,8 @@ class PasswordsController < ApplicationController
   def update
     if !@<%= singular_table_name %>.authenticate(params[:current_password])
       render json: { error: "The current password you entered is incorrect" }, status: :bad_request
-    elsif @<%= singular_table_name %>.update(password_params)
+    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+      PasswordMailer.with(user: @<%= singular_table_name %>).changed.deliver_later
       render json: @<%= singular_table_name %>
     else
       render json: @<%= singular_table_name %>.errors, status: :unprocessable_entity
@@ -16,7 +17,7 @@ class PasswordsController < ApplicationController
       @<%= singular_table_name %> = Current.<%= singular_table_name %>
     end
 
-    def password_params
-      params.require(:<%= singular_table_name %>).permit(:password, :password_confirmation)
+    def <%= "#{singular_table_name}_params" %>
+      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/emails_controller.rb.tt

@@ -0,0 +1,29 @@
+class EmailsController < ApplicationController
+  before_action :set_<%= singular_table_name %>
+
+  def edit
+  end
+
+  def update
+    if !@<%= singular_table_name %>.authenticate(params[:current_password])
+      redirect_to edit_emails_path, alert: "The current password you entered is incorrect"
+    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+      if @<%= singular_table_name %>.email_previously_changed?
+        EmailMailer.with(email_change: @<%= singular_table_name %>.email_previous_change).changed.deliver_later
+      end
+
+      redirect_to root_path, notice: "Your email has been changed successfully"
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  private
+    def set_<%= singular_table_name %>
+      @<%= singular_table_name %> = Current.<%= singular_table_name %>
+    end
+
+    def <%= "#{singular_table_name}_params" %>
+      params.require(:<%= singular_table_name %>).permit(:email)
+    end
+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
@@ -14,12 +14,12 @@ 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
 
   def update
-    if @<%= singular_table_name %>.update(password_params)
+    if @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
       redirect_to sign_in_path, notice: "Your password was reset successfully. Please sign in"
     else
       render :edit, status: :unprocessable_entity
@@ -28,12 +28,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
-      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
+    def <%= "#{singular_table_name}_params" %>
       params.require(:<%= singular_table_name %>).permit(:password, :password_confirmation)
     end
 end

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

@@ -2,13 +2,13 @@ class PasswordsController < ApplicationController
   before_action :set_<%= singular_table_name %>
 
   def edit
-    @<%= singular_table_name %> = Current.<%= singular_table_name %>
   end
 
   def update
     if !@<%= singular_table_name %>.authenticate(params[:current_password])
-      redirect_to password_edit_path, alert: "The current password you entered is incorrect"
-    elsif @<%= singular_table_name %>.update(password_params)
+      redirect_to edit_passwords_path, alert: "The current password you entered is incorrect"
+    elsif @<%= singular_table_name %>.update(<%= "#{singular_table_name}_params" %>)
+      PasswordMailer.with(user: @<%= singular_table_name %>).changed.deliver_later
       redirect_to root_path, notice: "Your password has been changed successfully"
     else
       render :edit, status: :unprocessable_entity
@@ -20,7 +20,7 @@ class PasswordsController < ApplicationController
       @<%= singular_table_name %> = Current.<%= singular_table_name %>
     end
 
-    def password_params
+    def <%= "#{singular_table_name}_params" %>
       params.require(:<%= singular_table_name %>).permit(:password, :password_confirmation)
     end
 end

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

@@ -0,0 +1,6 @@
+class EmailMailer < ApplicationMailer
+  def changed
+    @previous_email, @current_email = params[:email_change]
+    mail to: @previous_email
+  end
+end

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

@@ -1,6 +1,10 @@
 class PasswordMailer < ApplicationMailer
+  def changed
+    mail to: params[:<%= singular_table_name %>].email
+  end
+
   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,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 %>
+  <%%= button_to "OK, close my account", cancellations_path %>
 </div>

data/lib/generators/authentication/templates/views/email_mailer/changed.html.erb.tt

@@ -0,0 +1,11 @@
+<p>Hey there,</p>
+
+<p>We just wanted to confirm that your email address has been updated.</p>
+
+<p><strong>Before, it was: <%%= @previous_email %></strong></p>
+
+<p><strong>Now it is set to: <%%= @current_email %></strong></p>
+
+<hr>
+
+<p>If you didn't make this change, someone else may have access to your account. If you think that may be the case, please reply to this email and our support team will help you out.</p>

data/lib/generators/authentication/templates/views/email_mailer/changed.text.erb.tt

@@ -0,0 +1,9 @@
+Hey there,
+
+We just wanted to confirm that your email address has been updated.
+
+Before, it was: <%%= @previous_email %>
+
+Now it is set to: <%%= @current_email %>
+
+If you didn't make this change, someone else may have access to your account. If you think that may be the case, please reply to this email and our support team will help you out.

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

@@ -0,0 +1,37 @@
+<p style="color: red"><%%= alert %></p>
+
+<h1>Change your email</h1>
+
+<%%= form_with(model: @<%= model_resource_name %>, url: emails_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>
+
+      <ul>
+        <%% @<%= singular_table_name %>.errors.each do |error| %>
+          <li><%%= error.full_message %></li>
+        <%% end %>
+      </ul>
+    </div>
+  <%% end %>
+
+  <div>
+    <%%= label_tag :current_password, nil, style: "display: block" %>
+    <%%= password_field_tag :current_password, nil, autofocus: true, autocomplete: "current-password" %>
+  </div>
+
+  <div>
+    <%%= form.label :email, "New email", style: "display: block" %>
+    <%%= form.email_field :email %>
+  </div>
+
+  <div>
+    <%%= form.submit "Save changes" %>
+  </div>
+<%% end %>
+
+<br>
+
+<div>
+  <%%= link_to "Back", root_path %>
+</div>

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

@@ -0,0 +1,7 @@
+<p>Hey there,</p>
+
+<p>We just wanted to confirm that your password has been updated.</p>
+
+<hr>
+
+<p>If you didn't make this change, someone else may have access to your account. If you think that may be the case, please reply to this email and our support team will help you out.</p>

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

@@ -0,0 +1,5 @@
+Hey there,
+
+We just wanted to confirm that your password has been updated.
+
+If you didn't make this change, someone else may have access to your account. If you think that may be the case, please reply to this email and our support team will help you out.

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

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

@@ -2,7 +2,7 @@
 
 <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 %>

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>

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.10
+  version: 0.0.14
 platform: ruby
 authors:
 - Nixon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-16 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -32,20 +32,28 @@ files:
 - lib/generators/authentication/USAGE
 - lib/generators/authentication/authentication_generator.rb
 - lib/generators/authentication/templates/controllers/api/cancellations_controller.rb.tt
+- lib/generators/authentication/templates/controllers/api/emails_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/password_resets_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/passwords_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/registrations_controller.rb.tt
 - lib/generators/authentication/templates/controllers/api/sessions_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/cancellations_controller.rb.tt
+- lib/generators/authentication/templates/controllers/html/emails_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/password_resets_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/passwords_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/registrations_controller.rb.tt
 - lib/generators/authentication/templates/controllers/html/sessions_controller.rb.tt
+- lib/generators/authentication/templates/mailers/email_mailer.rb.tt
 - lib/generators/authentication/templates/mailers/password_mailer.rb.tt
 - lib/generators/authentication/templates/migration.rb.tt
 - lib/generators/authentication/templates/models/current.rb.tt
 - lib/generators/authentication/templates/models/resource.rb.tt
 - lib/generators/authentication/templates/views/cancellations/new.html.erb.tt
+- lib/generators/authentication/templates/views/email_mailer/changed.html.erb.tt
+- lib/generators/authentication/templates/views/email_mailer/changed.text.erb.tt
+- lib/generators/authentication/templates/views/emails/edit.html.erb.tt
+- lib/generators/authentication/templates/views/password_mailer/changed.html.erb.tt
+- lib/generators/authentication/templates/views/password_mailer/changed.text.erb.tt
 - lib/generators/authentication/templates/views/password_mailer/reset.html.erb.tt
 - lib/generators/authentication/templates/views/password_mailer/reset.text.erb.tt
 - lib/generators/authentication/templates/views/password_resets/edit.html.erb.tt