eac_users_support 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14c3e74d878d6f22bbb4010f7f52cd10787bf01de1a3d232d50ee81978014e0c
-  data.tar.gz: 1fb7daceaa96fe817004dfda68d1958e6974a2b740de5f32a12b2cc029c79c66
+  metadata.gz: be3c7bed883e66a0929a6cc7fdac8163b76e470f44ab6c8756a892cf6b865c52
+  data.tar.gz: 3527bca66295da3faee06376f37ce77505ec5b0d20055216dda18f90fb2202db
 SHA512:
-  metadata.gz: 8dbe5088ac0fbfc3d0bbd9b3dff6e3bf42969ba766091520c73f5dd168400d642301b0ff3807426f57a0f72f9d848bfdc286fa25b720c642769d8e00ee934541
-  data.tar.gz: f0c4a7382d688fecb342aa6d7d0dca319bb0ba876a04d148df22b68cbcac11dd12d8d27498b8f42ee9b23c38d398ac01ca3b30f7156e465025f97be6d04de1f0
+  metadata.gz: d924a885086b8345184d36ebcec58f642d8066c21f254b7ba289efcecc00b9b483d2d323a06a03c4e55acf47dae982fc70e05f509eaf25255db67335f6ac170e
+  data.tar.gz: cc6ef6c896967799d1741a8722737c084b2c73f9f854a3b28961ba080aedeb91a8c61eed1acd8c25a2995676fb148f540814d15d6d51e80ebd37cfe76a63c50d

data/app/models/eac_users_support/user.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
+require 'devise_invitable'
 require_dependency 'eac_users_support'
 
 module EacUsersSupport
   class User < ActiveRecord::Base
-    devise :database_authenticatable, :registerable, :rememberable
+    devise :confirmable, :database_authenticatable, :invitable, :recoverable, :registerable,
+           :rememberable
 
     validates :email, presence: true, uniqueness: true
 

data/config/locales/devise_invitable.en.yml

@@ -0,0 +1,31 @@
+en:
+  devise:
+    failure:
+      invited: "You have a pending invitation, accept it to finish creating your account."
+    invitations:
+      send_instructions: "An invitation email has been sent to %{email}."
+      invitation_token_invalid: "The invitation token provided is not valid!"
+      updated: "Your password was set successfully. You are now signed in."
+      updated_not_active: "Your password was set successfully."
+      no_invitations_remaining: "No invitations remaining"
+      invitation_removed: "Your invitation was removed."
+      new:
+        header: "Send invitation"
+        submit_button: "Send an invitation"
+      edit:
+        header: "Set your password"
+        submit_button: "Set my password"
+    mailer:
+      invitation_instructions:
+        subject: "Invitation instructions"
+        hello: "Hello %{email}"
+        someone_invited_you: "Someone has invited you to %{url}, you can accept it through the link below."
+        accept: "Accept invitation"
+        accept_until: "This invitation will be due in %{due_date}."
+        ignore: "If you don't want to accept the invitation, please ignore this email. Your account won't be created until you access the link above and set your password."
+  time:
+    formats:
+      devise:
+        mailer:
+          invitation_instructions:
+            accept_until_format: "%B %d, %Y %I:%M %p"

data/config/locales/devise_invitable.pt-BR.yml

@@ -0,0 +1,21 @@
+pt-BR:
+  devise:
+    invitations:
+      send_instructions: 'Um convite foi enviado para %{email}.'
+      invitation_token_invalid: 'O token fornecido não é válido!'
+      updated: 'Sua senha foi definida com sucesso. Agora você está conectado.'
+      no_invitations_remaining: "Sem conites restantes"
+      invitation_removed: 'Seu convite foi removido.'
+      new:
+        header: "Enviar convite"
+        submit_button: "Enviar convite"
+      edit:
+        header: "Defina a sua senha"
+        submit_button: "Definir a minha senha"
+    mailer:
+      invitation_instructions:
+        subject: 'Instruções Convite'
+        hello: 'Olá %{email}'
+        someone_invited_you: 'Alguém convidou você para %{url}, você pode aceitar este convite através do link abaixo.'
+        accept: 'Aceite o convite'
+        ignore: "Se você não quiser aceitar o convite, por favor ignore este e-mail.<br />A sua conta não será criado até que você acesse o link acima e defina a sua senha."

data/config/routes.rb

@@ -10,11 +10,10 @@ EacUsersSupport::Engine.routes.draw do
       end
     end
   end
-  devise_for :users, class_name: 'EacUsersSupport::User', module: :devise, skip: [:registrations]
+  devise_for :users, class_name: 'EacUsersSupport::User', module: :devise
   resource :user, only: [:edit] do
     collection do
       patch 'update_password'
     end
   end
-  get '/users/sign_up(.:format)', to: 'devise/sessions#new', as: 'new_user_registration'
 end

data/db/migrate/20200322051231_add_devise_invitable_to_eac_users_support_users.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+class AddDeviseInvitableToEacUsersSupportUsers < ActiveRecord::Migration
+  def up
+    change_table :eac_users_support_users do |t|
+      t.string     :invitation_token
+      t.datetime   :invitation_created_at
+      t.datetime   :invitation_sent_at
+      t.datetime   :invitation_accepted_at
+      t.integer    :invitation_limit
+      t.references :invited_by, polymorphic: true
+      t.integer    :invitations_count, default: 0
+      t.index      :invitations_count
+      t.index      :invitation_token, unique: true # for invitable
+      t.index      :invited_by_id
+    end
+  end
+
+  def down
+    change_table :eac_users_support_users do |t|
+      t.remove_references :invited_by, polymorphic: true
+      t.remove :invitations_count, :invitation_limit, :invitation_sent_at, :invitation_accepted_at,
+               :invitation_token, :invitation_created_at
+    end
+  end
+end

data/db/migrate/20200322053003_add_devise_confirmable_to_eac_users_support_users.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+class AddDeviseConfirmableToEacUsersSupportUsers < ActiveRecord::Migration
+  class Model < ::ActiveRecord::Base
+    self.table_name = :eac_users_support_users
+  end
+
+  def change
+    add_column :eac_users_support_users, :confirmation_token, :string
+    add_column :eac_users_support_users, :confirmed_at, :datetime
+    add_column :eac_users_support_users, :confirmation_sent_at, :datetime
+    # add_column :eac_users_support_users, :unconfirmed_email, :string # Only if using reconfirmable
+    add_index :eac_users_support_users, :confirmation_token, unique: true
+    # User.reset_column_information # Need for some types of updates, but not for update_all.
+    # To avoid a short time window between running the migration and updating all existing
+    # users as confirmed, do the following
+    reversible do |dir|
+      dir.up { Model.update_all confirmed_at: DateTime.now }
+    end
+  end
+end

data/db/migrate/20200324203335_add_recoverable_to_eac_users_support_users.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AddRecoverableToEacUsersSupportUsers < ActiveRecord::Migration
+  def change
+    change_table :eac_users_support_users do |t|
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
+    end
+  end
+end

data/lib/eac_users_support/tasks/password_reset.rb

@@ -1,18 +1,21 @@
 # frozen_string_literal: true
 
+require 'eac_ruby_utils/simple_cache'
+
 module EacUsersSupport
   module Tasks
     class PasswordReset
+      include ::EacRubyUtils::SimpleCache
+
       def initialize(email, administrator)
         @email = email
         @administrator = administrator
       end
 
       def run
-        u = User.find_by(email: @email)
-        if u
+        if found_user
           Rails.logger.info "Usuário encontrado com o email \"#{@email}\""
-          u.update!(attributes_to_update)
+          found_user.update!(attributes_to_update)
         else
           Rails.logger.info "Usuário não encontrado com o email \"#{@email}\". Criando..."
           User.create!({ email: @email }.merge(attributes_to_update))
@@ -24,9 +27,16 @@ module EacUsersSupport
 
       def attributes_to_update
         r = { password: @email, password_confirmation: @email }
+        if found_user.present? && found_user.confirmed_at.blank?
+          r.merge(confirmed_at: ::DateTime.now)
+        end
         r[:administrator] = true if @administrator
         r
       end
+
+      def found_user_uncached
+        ::EacUsersSupport::User.find_by(email: @email)
+      end
     end
   end
 end

data/lib/eac_users_support/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacUsersSupport
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_users_support
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Esquilo Azul Company
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-22 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -44,6 +44,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.6.1
+- !ruby/object:Gem::Dependency
+  name: devise_invitable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+- !ruby/object:Gem::Dependency
+  name: eac_ruby_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -133,12 +167,17 @@ files:
 - config/initializers/devise.rb
 - config/locales/devise.en.yml
 - config/locales/devise.pt-BR.yml
+- config/locales/devise_invitable.en.yml
+- config/locales/devise_invitable.pt-BR.yml
 - config/locales/pt-BR.yml
 - config/routes.rb
 - db/migrate/20160605013848_create_eac_users_support_users.rb
 - db/migrate/20160605035833_add_devise_authenticable_to_eac_users_support_users.rb
 - db/migrate/20180222202443_add_devise_rememberable_to_eac_users_support_users.rb
 - db/migrate/20180318181324_add_administrator_to_eac_users_support_users.rb
+- db/migrate/20200322051231_add_devise_invitable_to_eac_users_support_users.rb
+- db/migrate/20200322053003_add_devise_confirmable_to_eac_users_support_users.rb
+- db/migrate/20200324203335_add_recoverable_to_eac_users_support_users.rb
 - lib/eac_users_support.rb
 - lib/eac_users_support/engine.rb
 - lib/eac_users_support/patches/action_controller_test_case.rb