authentication-zero 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9a25e8862ad568105b15810d98b4efb68b1d7a69199c35ff7a726b991aeb21d
-  data.tar.gz: fd37bc06817fb23c8bd61c4cfe8635932be62ae94df89b5f5928f55b749e0a7d
+  metadata.gz: 9e853cd032072f4c6dc76b99cdff704b392eac57abea2893957b03f93c7069bd
+  data.tar.gz: 49428b1a84e2cd03beba0f9f5a39623f06c33ae20072a691130885391b09d615
 SHA512:
-  metadata.gz: 7c89d91c1e3b5259b2924b6c25ee09c094db9f71deb75944cf9387b45c7f3202cba8bc394539d1fc5c79038aeb5dbbbe74eed5b0ac4fd44c7f76377278380f24
-  data.tar.gz: 4f79e7af311270e7d995f8e07f3e2a73269c41b4fe17e31d7542e98547c96df4a6f55340d3575f05cd56e445582a9955443ca279ce8fe01f5fab4164d90c7d94
+  metadata.gz: aa5510a1671afde349053941f76876b888b481fbae4839dd7724b38163c3ca37c8a68ad73f2eb1de277f80bfbc3ad9d4e21f5d07613a24f09bc78d9e7b051bec
+  data.tar.gz: 1578a6bc1502f0d1f0f25b6b993f4f1be297f367532ce604f1da5926de5bd9fb38bbcc36705b98c2a8fd3cca933bd2649b81cdc9007fbf4dfcb63065758835a0

data/Gemfile.lock

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

data/README.md

@@ -30,6 +30,10 @@ Add these lines to your `app/views/home/index.html.erb`:
 
 <p>Signed as <%= Current.user.email %></p>
 
+<div>
+  <%= link_to "Change email", edit_emails_path %>
+</div>
+
 <div>
   <%= link_to "Change password", edit_passwords_path %>
 </div>

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 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"
@@ -39,7 +41,8 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
   def add_routes
     route "resource :password_resets, only: [:new, :edit, :create, :update]"
     route "resource :cancellations, only: [:new, :create]"
-    route "resource :passwords, only: [:update, :edit]"
+    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_up', to: 'registrations#new'" unless options.api?

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

@@ -0,0 +1,25 @@
+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
@@ -30,7 +30,7 @@ class PasswordResetsController < ApplicationController
       render json: { error: "Your token has expired, please request a new one" }, status: :bad_request
     end
 
-    def password_params
+    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
+    def <%= "#{singular_table_name}_params" %>
       params.permit(:password, :password_confirmation)
     end
 end

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

@@ -0,0 +1,28 @@
+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

@@ -19,7 +19,7 @@ class PasswordResetsController < ApplicationController
   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
@@ -33,7 +33,7 @@ class PasswordResetsController < ApplicationController
       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 edit_passwords_path, alert: "The current password you entered is incorrect"
-    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
       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,4 +1,8 @@
 class PasswordMailer < ApplicationMailer
+  def changed
+    mail to: params[:<%= singular_table_name %>].email
+  end
+
   def reset
     @signed_id = params[:<%= singular_table_name %>].signed_id(purpose: "password_reset", expires_in: 20.minutes)
     mail to: params[:<%= singular_table_name %>].email

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.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authentication-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Nixon
@@ -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