KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Feature: Ability to switch between multiple accounts (#881)

Browse source 
* Feature: Ability to switch between multiple accounts

* Fix rubocop

* Fix assigned inboxes

* fix auth json

* Add account switcher in UI

* fix ordering on administrate

* Add switch accounts to sidebar

* add account id

* Fix schema.rb timestamp

* Revert "add account id"

This reverts commit 27570f50ef584cb9a5f69454f43f630b318c8807.

* Add a check for account

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
This commit is contained in:
Sojan Jose 2020-05-26 22:38:48 +05:30 • committed by GitHub
parent b1aab228ae
commit b7a583b2c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
64 changed files with 441 additions and 212 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/application_controller.rb
View file

@ -14,7 +14,8 @@ class ApplicationController < ActionController::Base
private
def current_account
@_ ||= find_current_account
@current_account ||= find_current_account
Current.account = @current_account
end
def find_current_account
@ -37,7 +38,9 @@ class ApplicationController < ActionController::Base
end
def account_accessible_for_user?(account)
render_unauthorized('You are not authorized to access this account') unless account.account_users.find_by(user_id: current_user.id)
@current_account_user = account.account_users.find_by(user_id: current_user.id)
Current.account_user = @current_account_user
render_unauthorized('You are not authorized to access this account') unless @current_account_user
end
def account_accessible_for_bot?(account)
@ -102,4 +105,12 @@ class ApplicationController < ActionController::Base
render json: { error: 'Account Suspended' }, status: :account_suspended
end
end
def pundit_user
{
user: Current.user,
account: Current.account,
account_user: Current.account_user
}
end
end