pg_rails 7.6.25 → 7.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18003c61fd4e38fc6e7a70402aa0eaba4f335390e50061b1569bbea56c604a83
-  data.tar.gz: f2732b2e071e3672cc8e4b6d16e2e577f7b6bf3590a8a6c3d76ef45215bdb67f
+  metadata.gz: 4b2c5672f192482e718fb6f12e66e7cfcd376e916c7663f13931aa526d931f42
+  data.tar.gz: cb427f6f6dd542648c697f53b3ddc688f8506919a809bfff3e32c6119612b1a4
 SHA512:
-  metadata.gz: 9953c023fe35b70091a3ddc70b4a49f8cc7975476388835f1a0c7b286132afa68c4f5eaf35b6b1e80345fb2ff20251c35b9e238293b43cb217e445e226080598
-  data.tar.gz: 39911c247bdd17a3828a378478d03bb4027326b9c9b72d9ad5c0db1dc1b0e4d491dc6b2e37d899a02043a3446818feb304969c4a828b91dc3f7bf9a0adcf89c6
+  metadata.gz: e98643fa17d81bcdfa0993cd66dbf532d36a6e1935a0144f88e67f2b54dad6e0ec81795fb9a5be9c35c42f6737e1ff8a51ed77f871104f691e711d8a16a8ffb5
+  data.tar.gz: df1e9eae5424d3ea481be959d24f33b09a5433ce0660f2bdc55ddda5595926ae753c7489c6ac90cc0956219b0909b0d6dd82cb784b2538d00f80820eb654d7cf

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

@@ -15,7 +15,7 @@ module PgEngine
       if usuario.confirmed_at.present?
         sign_in(:user, usuario)
         # redirect_to after_sign_in_path_for(usuario)
-        redirect_to users_root_path
+        redirect_to user_root_path
       else
         go_back('No está confirmado')
       end

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

@@ -36,6 +36,16 @@ module Users
       end
     end
 
+    def user_root
+      scope = policy_scope(Account)
+      if scope.count == 1
+        ua = Current.user.user_account_for(scope.first)
+        redirect_to tenant_root_path(ua.to_param)
+      else
+        redirect_to users_accounts_path
+      end
+    end
+
     # La user_account puede estar disabled
     def show
       add_breadcrumb @account, users_account_path(@account, tid: nil)

data/pg_engine/app/helpers/pg_engine/route_helper.rb

@@ -72,8 +72,15 @@ module PgEngine
       if Current.tid.present?
         tenant_root_path(tid: Current.tid)
       else
-        (Current.user.present? ? users_root_path : root_path)
+        (Current.user.present? ? user_root_path : root_path)
       end
     end
+
+    # :nocov:
+    deprecate :users_root_path, deprecator: PgEngine.deprecator
+    def users_root_path
+      user_root_path
+    end
+    # :nocov:
   end
 end

data/pg_engine/config/routes.rb

@@ -31,12 +31,10 @@ Rails.application.routes.draw do
         put :update_invitation
       end
     end
-
-    root to: 'accounts#index'
   end
 
   # User root for devise's signed_in_root_path
-  get '/u', to: 'accounts#index', as: :user_root
+  get '/u', to: 'users/accounts#user_root', as: :user_root
 
   namespace :tenant, path: 'u/t(/:tid)' do
     pg_resource(:user_accounts, only: [:index, :show, :edit, :update, :destroy])
@@ -50,8 +48,7 @@ Rails.application.routes.draw do
     root to: 'dashboard#dashboard'
   end
 
-  # root to: 'users/accounts#index'
-  # FIXME: qué onda
+  # Si en la main app no se define una root path, se redirige al user_root
   root to: redirect('/u')
 
   namespace :admin, path: 'a' do

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

@@ -88,6 +88,44 @@ describe 'Users::AccountsController' do
     end
   end
 
+  describe 'user_root' do
+    subject do
+      get '/u'
+    end
+
+    context 'when no accounts' do
+      let(:user) { create :user }
+
+      it do
+        subject
+        expect(response).to redirect_to(users_accounts_path)
+      end
+    end
+
+    context 'when one account' do
+      it do
+        subject
+        ua = user.user_account_for(account)
+        expect(response).to redirect_to(tenant_root_path(ua.to_param))
+        # File.write(Rails.root.join('out.html'), response.body)
+      end
+    end
+
+    context 'when multiple accounts' do
+      before do
+        other_account = create(:account)
+        ActsAsTenant.without_tenant do
+          create(:user_account, account: other_account, user:)
+        end
+      end
+
+      it do
+        subject
+        expect(response).to redirect_to(users_accounts_path)
+      end
+    end
+  end
+
   describe 'index' do
     subject do
       get '/u/espacios'

data/pg_rails/lib/version.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+# :nocov:
 module PgRails
-  VERSION = '7.6.25'
+  VERSION = '7.6.26'
 end
+# :nocov:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_rails
 version: !ruby/object:Gem::Version
-  version: 7.6.25
+  version: 7.6.26
 platform: ruby
 authors:
 - Martín Rosso