pg_rails 7.5.4 → 7.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f12846cd393967f0aac07acebf37b6799a9e67983da3ee892311aac4fd8a93b
-  data.tar.gz: dc6a9d65a1454b891de4bcd751f5f74f1b51a27d2fdc46c0baaf216db28a9306
+  metadata.gz: b62210d098125764e407b10038d44a3e3fe91a52f6eff700fd83555dded8d194
+  data.tar.gz: 4e9ac223dd652c00045af466a82af01ea07062f8968947286c304014ea3cb5ac
 SHA512:
-  metadata.gz: a832616bb110d3662bc1b2f07991f4dc9015ba95a0e17584b749c36058cea9d87928ca7403cc3c46a62789f13abdaff3c827be6bce8d3468420861380bddff3b
-  data.tar.gz: 3c103db1aa747b5fd09757c680505d203d06afad591b46ee1903d36037a35de5b2b02ef0475f15f4f8e222accfafb21a8f75a2932b83e93f7fa6c2a82eb763b7
+  metadata.gz: b4cb69cca012bf23c8e1229353cd8b346150bc3029b9e45e995ce2f8ccb74d375c4019ce50ca894aaa9ef7cb5036781dcec219fa8ce108b64264e786d7467cda
+  data.tar.gz: 074b884d3867fffc9a1835aa59ca9c69dc9b64c60042d49151bbc9b60bad72d12488964be429e4eb21626dcb251b6ae8ed4b61d58a40f62cc7d845a12118e72b

data/pg_engine/app/controllers/pg_engine/base_controller.rb

@@ -18,11 +18,17 @@ module PgEngine
       #   raise ActsAsTenant::Errors::NoTenantSet
       # end
       # FIXME: if current_tenant.present? check it's not discarded
-
+      # FIXME: if session['current_user_account'] present? check
+      #        user belongs to it, and if not, cleanup
       if Current.user.present?
         user_accounts = Current.user.user_accounts.kept
         if ActsAsTenant.current_tenant.present?
           unless user_accounts.exists?(account: ActsAsTenant.current_tenant)
+            pg_warn <<~WARN
+              #{Current.user.to_gid} not belongs to \
+              #{ActsAsTenant.current_tenant.to_gid}. Signed out
+            WARN
+
             sign_out(Current.user)
             throw :warden, scope: :user, message: :invalid
           end
@@ -32,8 +38,9 @@ module PgEngine
           account = if user_accounts.count == 1
                       user_accounts.first.account
                     elsif session['current_user_account'].present?
-                      UserAccount.where(id: session['current_user_account']).first&.account
+                      user_accounts.where(id: session['current_user_account']).first&.account
                     end
+
           set_current_tenant(account)
         end
       end

data/pg_engine/app/controllers/pg_engine/base_public_controller.rb

@@ -6,12 +6,14 @@ module PgEngine
 
     # :nocov:
     def login_as
+      # FIXME: make a POST route
       return head :bad_request unless dev_user_or_env?
 
       usuario = User.find(params[:id])
       if usuario.confirmed_at.present?
         sign_in(:user, usuario)
-        redirect_to after_sign_in_path_for(usuario)
+        # redirect_to after_sign_in_path_for(usuario)
+        redirect_to users_root_path
       else
         go_back('No está confirmado')
       end

data/pg_engine/app/controllers/users/account_switcher_controller.rb

@@ -9,12 +9,20 @@ module Users
 
     layout 'pg_layout/centered'
 
+    around_action :set_without_tenant
+
+    def set_without_tenant(&)
+      ActsAsTenant.without_tenant(&)
+    end
+
     def list
-      @user_accounts = Current.user.user_accounts
+      @user_accounts = Current.user.user_accounts.kept
     end
 
     def switch
-      user_account = UserAccount.find(params[:user_account_id])
+      # FIXME: handle not found
+      scope = Current.user.user_accounts.kept
+      user_account = scope.find(UserAccount.decode_id(params[:user_account_id]))
       session['current_user_account'] = user_account.id
       redirect_to root_path
     end

data/pg_engine/app/controllers/users/registrations_controller.rb

@@ -7,15 +7,19 @@ module Users
     def create
       build_resource(sign_up_params)
 
-      resource.save
-      yield resource if block_given?
-      if resource.persisted?
-        expire_data_after_sign_in!
-        render_message
-      else
-        clean_up_passwords resource
-        set_minimum_password_length
-        respond_with resource
+      ActiveRecord::Base.transaction do
+        resource.save
+        yield resource if block_given?
+        if resource.persisted?
+          create_account_for(resource)
+
+          expire_data_after_sign_in!
+          render_message
+        else
+          clean_up_passwords resource
+          set_minimum_password_length
+          respond_with resource
+        end
       end
     end
 
@@ -27,5 +31,12 @@ module Users
       HTML
       render turbo_stream: turbo_stream.update('form-signup', msg)
     end
+
+    private
+
+    def create_account_for(user)
+      account = Account.create!(nombre: user.email)
+      user.user_accounts.create!(account:)
+    end
   end
 end

data/pg_engine/app/models/account.rb

@@ -38,6 +38,10 @@ class Account < ApplicationRecord
     parent.table[:nombre]
   end
 
+  before_validation do
+    self.plan = 0 if plan.blank?
+  end
+
   def to_s
     nombre
   end

data/pg_engine/app/models/user.rb

@@ -41,17 +41,7 @@ class User < ApplicationRecord
   # Hace falta?
   has_many :accounts, through: :user_accounts
 
-  # default_scope lambda {
-  #   if ActsAsTenant.current_tenant.present?
-  #     joins(:user_accounts).where('user_accounts.account_id': ActsAsTenant.current_tenant.id)
-  #   else
-  #     raise ActsAsTenant::Errors::NoTenantSet unless Current.user.blank? || ActsAsTenant.unscoped?
-
-  #     # Aún no autenticó devise o es el admin
-  #     all
-
-  #   end
-  # }
+  acts_as_tenant :account, through: :user_accounts
 
   has_many :notifications, as: :recipient, class_name: 'Noticed::Notification'
 
@@ -80,26 +70,6 @@ class User < ApplicationRecord
     kept? ? super : :locked
   end
 
-  after_create do
-    create_account unless orphan
-  end
-
-  def create_account
-    account =
-      if ActsAsTenant.current_tenant.present?
-        # :nocov:
-        raise PgEngine::Error, 'user not invited' unless Rails.env.test?
-        # :nocov:
-
-        ActsAsTenant.current_tenant
-      else
-        Account.create(nombre: email, plan: 0)
-      end
-    ua = user_accounts.create(account:)
-
-    raise(Error, 'no se pudo crear la cuenta') unless ua.persisted?
-  end
-
   def password_required?
     !persisted? || !password.nil? || !password_confirmation.nil?
   end

data/pg_engine/app/models/user_account.rb

@@ -26,13 +26,14 @@ class UserAccount < ApplicationRecord
   audited
   include Hashid::Rails
 
-  belongs_to :user
-  belongs_to :account
+  belongs_to :user, inverse_of: :user_accounts
+  acts_as_tenant :account
 
   belongs_to :creado_por, optional: true, class_name: 'User'
   belongs_to :actualizado_por, optional: true, class_name: 'User'
 
   # scope :kept, -> { undiscarded.joins(:account).merge(Account.kept) }
+  # FIXME: merge with User.kept
   scope :kept, -> { joins(:account).merge(Account.kept) }
 
   enumerize :profiles, in: {

data/pg_engine/app/policies/user_policy.rb

@@ -22,7 +22,7 @@ class UserPolicy < ApplicationPolicy
     user.developer? || user == record
   end
 
-  # def base_access_to_collection?
-  #   user&.present?
-  # end
+  def base_access_to_collection?
+    user.present?
+  end
 end

data/pg_engine/app/views/users/accounts/show.html.slim

@@ -6,8 +6,10 @@ div style="max-width: 30em"
   table.table.table-sm
     tr
       th Nombre
+      th Email
       th Roles
-    - @account.user_accounts.each do |user_account|
+    - @account.user_accounts.kept.each do |user_account|
       tr
         td = user_account.user
+        td = user_account.user.email
         td = user_account.profiles.texts.join(', ')

data/pg_engine/config/initializers/acts_as_tenant.rb

@@ -1,6 +1,6 @@
 ActsAsTenant.configure do |config|
-  config.require_tenant = lambda do
-    Current.namespace == :users
+  config.require_tenant = lambda do |options|
+    Current.namespace.present? || !options[:model].in?([User, UserAccount, Email, EmailLog])
   end
 
   # Customize the query for loading the tenant in background jobs

data/pg_engine/config/locales/es.yml

@@ -92,9 +92,9 @@ es:
       new:
         sign_up: Crear una cuenta
     passwords:
-      send_instructions: Vas a recibir un correo con instrucciones sobre cómo resetear tu contraseña en unos pocos minutos.
+      send_instructions: Vas a recibir un correo con instrucciones para restablecer tu contraseña en unos pocos minutos.
       new:
-        send_me_reset_password_instructions: Enviar instrucciones para restablecer contraseña
+        send_me_reset_password_instructions: Restablecer contraseña
         forgot_your_password: ¿Olvidaste tu contraseña?
     shared:
       links:

data/pg_engine/spec/controllers/admin/accounts_controller_spec.rb

@@ -38,7 +38,7 @@ RSpec.describe Admin::AccountsController do
 
   let(:invalid_attributes) do
     {
-      plan: nil
+      nombre: nil
     }
   end
 

data/pg_engine/spec/controllers/admin/users_controller_spec.rb

@@ -96,20 +96,24 @@ RSpec.describe Admin::UsersController do
 
   describe 'POST #create' do
     context 'with valid params' do
+      subject do
+        post :create, params: { user: valid_attributes }
+      end
+
       it 'creates a new User' do
-        expect do
-          post :create, params: { user: valid_attributes }
-        end.to change(User.unscoped, :count).by(1)
+        expect { subject }.to change(User.unscoped, :count).by(1)
       end
 
       it 'dont creates a new account' do
-        expect do
-          post :create, params: { user: valid_attributes }
-        end.not_to change(Account.unscoped, :count)
+        expect { subject }.not_to change(Account.unscoped, :count)
+      end
+
+      it 'dont creates a new user account' do
+        expect { subject }.not_to change(UserAccount.unscoped, :count)
       end
 
       it 'redirects to the created user' do
-        post :create, params: { user: valid_attributes }
+        subject
         expect(response).to redirect_to([:admin, User.unscoped.last])
       end
     end

data/pg_engine/spec/models/user_spec.rb

@@ -15,52 +15,34 @@ RSpec.describe User do
     expect(user.default_account).to be_present
   end
 
-  context 'si es orphan' do
-    let(:user) { create(:user, orphan: true) }
-
-    it do
-      expect(user.accounts).to be_empty
-    end
-
-    it do
-      expect { user.default_account }.to raise_error(User::Error)
-    end
-  end
-
-  context 'Si falla la creación de cuenta, que rollbackee la transaction de create user' do
-    # rubocop:disable Lint/SuppressedException
-    subject do
-      user.save
-    rescue User::Error
-    end
-    # rubocop:enable Lint/SuppressedException
-
-    let(:user) do
-      build(:user)
-    end
-
-    before do
-      # rubocop:disable RSpec/MessageChain
-      allow(user).to receive_message_chain(:user_accounts, :create) {
-                       instance_double(UserAccount, persisted?: false)
-                     }
-      # rubocop:enable RSpec/MessageChain
-    end
-
-    it do
-      expect { subject }.not_to change(described_class, :count)
-    end
-
-    it do
-      subject
-      expect(user).not_to be_persisted
-    end
-  end
-
   describe 'search ransacker' do
     it 'searchs' do
       results = described_class.ransack(search_cont: user.nombre).result.to_a
       expect(results).to eq [user]
     end
   end
+
+  describe 'default scope' do
+    before do
+      ActsAsTenant.current_tenant = nil
+      ActsAsTenant.test_tenant = nil
+      Current.reset
+    end
+
+    it 'scopes according to tenant' do
+      account = create(:account)
+      other_account = create(:account)
+      usr1 = usr2 = usr3 = usr4 = nil
+      ActsAsTenant.with_tenant(other_account) do
+        usr3 = create(:user)
+        usr4 = create(:user)
+      end
+      ActsAsTenant.with_tenant(account) do
+        usr1 = create(:user)
+        usr2 = create(:user)
+        expect(described_class.all).to contain_exactly(usr1, usr2)
+      end
+      expect(described_class.all).to contain_exactly(usr1, usr2, usr3, usr4)
+    end
+  end
 end

data/pg_engine/spec/{controllers/users/registrations_controller_spec.rb → requests/users/registrations_spec.rb}

@@ -1,16 +1,8 @@
 require 'rails_helper'
 
-describe Users::RegistrationsController do
-  render_views
-
-  before do
-    # rubocop:disable RSpec/InstanceVariable
-    @request.env['devise.mapping'] = Devise.mappings[:user]
-    # rubocop:enable RSpec/InstanceVariable
-  end
-
+describe 'registrations controller' do
   describe '#new' do
-    subject { get :new }
+    subject { get '/users/sign_up' }
 
     it do
       subject
@@ -20,7 +12,12 @@ describe Users::RegistrationsController do
 
   describe '#create' do
     subject do
-      post :create, params: { user: { nombre:, apellido:, email:, password:, password_confirmation: } }
+      post '/users', params: { user: { nombre:, apellido:, email:, password:, password_confirmation: } }
+    end
+
+    before do
+      ActsAsTenant.current_tenant = nil
+      ActsAsTenant.test_tenant = nil
     end
 
     let(:nombre) { Faker::Name.first_name }
@@ -33,6 +30,14 @@ describe Users::RegistrationsController do
       expect { subject }.to change(User, :count).by(1)
     end
 
+    it do
+      expect { subject }.to change(UserAccount, :count).by(1)
+    end
+
+    it do
+      expect { subject }.to change(Account, :count).by(1)
+    end
+
     it do
       subject
       expect(response.body).to include I18n.t('devise.registrations.signed_up_but_unconfirmed')
@@ -46,10 +51,28 @@ describe Users::RegistrationsController do
         expect(response).not_to be_successful
       end
     end
+
+    context 'cuando falla la creación de la UserAccount' do
+      before do
+        allow_any_instance_of(Users::RegistrationsController).to receive(:create_account_for).and_raise(StandardError)
+      end
+
+      it do
+        expect { subject }.not_to change(User, :count)
+      end
+
+      it do
+        expect { subject }.not_to change(UserAccount, :count)
+      end
+
+      it do
+        expect { subject }.not_to change(Account, :count)
+      end
+    end
   end
 
   describe '#edit' do
-    subject { get :edit }
+    subject { get '/users/edit' }
 
     let(:logger_user) { create :user, :developer }
 

data/pg_engine/spec/requests/users/switcher_spec.rb

@@ -38,11 +38,17 @@ describe 'redirection' do
 
   context 'when has been removed from account' do
     let!(:other_account) { create :account }
-    let!(:other_user_account) { logged_user.user_accounts.create(account: other_account) }
+    let!(:other_user_account) do
+      ActsAsTenant.with_tenant(other_account) do
+        logged_user.user_accounts.create!
+      end
+    end
 
     before do
       third_account = create :account
-      logged_user.user_accounts.create(account: third_account)
+      ActsAsTenant.with_tenant(third_account) do
+        logged_user.user_accounts.create!
+      end
     end
 
     it 'redirects to switcher' do

data/pg_engine/spec/system/tenants_spec.rb

@@ -29,7 +29,9 @@ describe 'Tenants' do
       let(:other_account) { create :account }
 
       before do
-        logged_user.user_accounts.create!(account: other_account)
+        ActsAsTenant.with_tenant(other_account) do
+          logged_user.user_accounts.create!
+        end
       end
 
       it 'shows the switcher' do

data/pg_rails/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PgRails
-  VERSION = '7.5.4'
+  VERSION = '7.5.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.5.4
+  version: 7.5.6
 platform: ruby
 authors:
 - Martín Rosso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-09-14 00:00:00.000000000 Z
+date: 2024-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -849,7 +849,6 @@ files:
 - pg_engine/spec/controllers/public/mensaje_contactos_controller_spec.rb
 - pg_engine/spec/controllers/public/webhooks_controller_spec.rb
 - pg_engine/spec/controllers/users/confirmations_controller_spec.rb
-- pg_engine/spec/controllers/users/registrations_controller_spec.rb
 - pg_engine/spec/decorators/email_decorator_spec.rb
 - pg_engine/spec/factories/accounts.rb
 - pg_engine/spec/factories/email_logs.rb
@@ -883,6 +882,7 @@ files:
 - pg_engine/spec/requests/users/accounts_spec.rb
 - pg_engine/spec/requests/users/base_controller_spec.rb
 - pg_engine/spec/requests/users/date_jumper_spec.rb
+- pg_engine/spec/requests/users/registrations_spec.rb
 - pg_engine/spec/requests/users/switcher_spec.rb
 - pg_engine/spec/system/alerts_spec.rb
 - pg_engine/spec/system/breadcrumbs_spec.rb