authentication-zero 2.11.1 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26344aaefae4e99ea2048950089e5927a62d473f85d94596456006d6edbbc8ee
-  data.tar.gz: eebff7007c4754244993ac76b022081ccbd0201dac5cd1611ec84f8845e7a5d0
+  metadata.gz: 650afdee62e14e099849af5cc58536c67b0cbdc0164e69d02a085c5e556cdfa1
+  data.tar.gz: 3435f8fc73fe7c7ff04a18b1dacd27b6d24c72d58ac2d98966d69228fd177a55
 SHA512:
-  metadata.gz: 6ccd04a438745b60d071c9203c5e36588b01333a17e37a5ee1067c7007824d52fb2a3be0c5e4864868c393f9dec04e2284487651f7d7b0f908c238dcbf4a9dd2
-  data.tar.gz: 51b53ff133cdf9a69e42f29cadd19127646d6c98a6d476c1565c5e6151708b57f4076e1f19af4f4335b8bd6a08ac90b9328b6fe393f85d702dd7d415621a9c8a
+  metadata.gz: cbec3a074fa00aa2f492c58b6940266de7e61502e7957e4f096d479a74f5a0663e5160e82289888fa7cff7b2138b3bd4472f6dd0e41ca48e4f5592b3dfd89e08
+  data.tar.gz: b2d51d9c1b6b562893d1a324c7904a9450dfa85858ecc3a6a18a8bf4f7230b3c8943e18b7f899312b0acd7e0b70f2464ce645144682d9cb73cbc9c62bc6f838a

data/Gemfile.lock

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

data/README.md

@@ -13,6 +13,8 @@ The purpose of authentication zero is to generate a pre-built authentication sys
 - Authentication by token (--api)
 - Two factor authentication (--two-factor)
 - Social Login with OmniAuth (--omniauthable)
+- Verify email using a link with token
+- Verify email using a six random digits code for api (--code-verifiable)
 - Ask password before sensitive data changes, aka: sudo (--sudoable)
 - Reset the user password and send reset instructions
 - Reset the user password only from verified emails

data/lib/authentication_zero/version.rb

@@ -1,3 +1,3 @@
 module AuthenticationZero
-  VERSION = "2.11.1"
+  VERSION = "2.11.2"
 end

data/lib/generators/authentication/authentication_generator.rb

@@ -3,14 +3,15 @@ require "rails/generators/active_record"
 class AuthenticationGenerator < Rails::Generators::NamedBase
   include ActiveRecord::Generators::Migration
 
-  class_option :api,          type: :boolean, desc: "Generates API authentication"
-  class_option :pwned,        type: :boolean, desc: "Add pwned password validation"
-  class_option :sudoable,     type: :boolean, desc: "Add password request before sensitive data changes"
-  class_option :lockable,     type: :boolean, desc: "Add password reset locking"
-  class_option :ratelimit,    type: :boolean, desc: "Add request rate limiting"
-  class_option :omniauthable, type: :boolean, desc: "Add social login support"
-  class_option :trackable,    type: :boolean, desc: "Add activity log support"
-  class_option :two_factor,   type: :boolean, desc: "Add two factor authentication"
+  class_option :api,              type: :boolean, desc: "Generates API authentication"
+  class_option :pwned,            type: :boolean, desc: "Add pwned password validation"
+  class_option :code_verifiable,  type: :boolean, desc: "Add email verification using a code for api"
+  class_option :sudoable,         type: :boolean, desc: "Add password request before sensitive data changes"
+  class_option :lockable,         type: :boolean, desc: "Add password reset locking"
+  class_option :ratelimit,        type: :boolean, desc: "Add request rate limiting"
+  class_option :omniauthable,     type: :boolean, desc: "Add social login support"
+  class_option :trackable,        type: :boolean, desc: "Add activity log support"
+  class_option :two_factor,       type: :boolean, desc: "Add two factor authentication"
 
   source_root File.expand_path("templates", __dir__)
 
@@ -157,7 +158,11 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
       options.two_factor? && !options.api?
     end
 
+    def code_verifiable?
+      options.code_verifiable? && options.api?
+    end
+
     def redis?
-      options.lockable? || options.sudoable?
+      options.lockable? || options.sudoable? || code_verifiable?
     end
 end

data/lib/generators/authentication/templates/controllers/api/identity/email_verifications_controller.rb.tt

@@ -13,8 +13,16 @@ class Identity::EmailVerificationsController < ApplicationController
 
   private
     def set_<%= singular_table_name %>
+    <%- if code_verifiable? -%>
+      @<%= singular_table_name %> = <%= class_name %>.find_by(email: params[:email])
+
+      unless @<%= singular_table_name %> && @<%= singular_table_name %>.verification_code.value == params[:token]
+        render json: { error: "That email verification code is invalid" }, status: :bad_request
+      end
+    <%- else -%>
       @<%= singular_table_name %> = <%= class_name %>.where(email: params[:email]).find_signed!(params[:token], purpose: params[:email])
     rescue
       render json: { error: "That email verification link is invalid" }, status: :bad_request
-    end
+    <%- end -%>
+  end
 end

data/lib/generators/authentication/templates/erb/identity_mailer/email_verify_confirmation.html.erb.tt

@@ -2,9 +2,13 @@
 
 <p>This is to confirm that <%%= @<%= singular_table_name %>.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.</p>
 
-<p><strong>You must hit the link below to confirm that you received this email.</strong></p>
+<p><strong>You must <%= code_verifiable? ? "put the code" : "hit the link" %> below to confirm that you received this email.</strong></p>
 
+<%- if code_verifiable? -%>
+<strong><%%= @user.verification_code.value %></strong>
+<%- else -%>
 <%%= link_to "Yes, use this email for my account", edit_identity_email_verification_url(token: @signed_id, email: @<%= singular_table_name %>.email) %>
+<%- end -%>
 
 <hr>
 

data/lib/generators/authentication/templates/erb/identity_mailer/email_verify_confirmation.text.erb.tt

@@ -2,8 +2,12 @@ Hey there,
 
 This is to confirm that <%%= @<%= singular_table_name %>.email %> is the email you want to use on your account. If you ever lose your password, that's where we'll email a reset link.
 
-You must hit the link below to confirm that you received this email.
+You must <%= code_verifiable? ? "put the code" : "hit the link" %> below to confirm that you received this email.
 
+<%- if code_verifiable? -%>
+<%%= @user.verification_code.value %>
+<%- else -%>
 [Yes, use this email for my account]<%%= edit_identity_email_verification_url(token: @signed_id, email: @<%= singular_table_name %>.email) %>
+<%- end -%>
 
 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/mailers/identity_mailer.rb.tt

@@ -8,7 +8,11 @@ class IdentityMailer < ApplicationMailer
 
   def email_verify_confirmation
     @<%= singular_table_name %> = params[:<%= singular_table_name %>]
+    <%- if code_verifiable? -%>
+    @<%= singular_table_name %>.verification_code.value = rand.to_s[2..7]
+    <%- else -%>
     @signed_id = @<%= singular_table_name %>.signed_id(purpose: @<%= singular_table_name %>.email, expires_in: 2.days)
+    <%- end -%>
 
     mail to: @<%= singular_table_name %>.email, subject: "Verify your email"
   end

data/lib/generators/authentication/templates/models/model.rb.tt

@@ -5,6 +5,9 @@ class <%= class_name %> < ApplicationRecord
   <%- if options.trackable? -%>
   has_many :events, dependent: :destroy
   <%- end -%>
+  <%- if code_verifiable? %>
+  kredis_string :verification_code, expires_in: 2.days
+  <%- end -%>
 
   validates :email, presence: true, uniqueness: true
   validates_format_of :email, with: /\A[^@\s]+@[^@\s]+\z/

metadata

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