LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases 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
64 changed files with 441 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/api/v1/models/user.json.jbuilder
View File

@@ -4,9 +4,9 @@ json.uid resource.uid
json.name resource.name
json.nickname resource.nickname
json.email resource.email
json.account_id resource.account.id
json.account_id resource.current_account_user.account_id
json.pubsub_token resource.pubsub_token
json.role resource.role
json.inviter_id resource.account_user.inviter_id
json.role resource.current_account_user.role
json.inviter_id resource.current_account_user.inviter_id
json.confirmed resource.confirmed?
json.avatar_url resource.avatar_url

2
app/views/api/v1/profiles/update.json.jbuilder
View File

@@ -4,8 +4,6 @@ json.uid @user.uid
json.name @user.name
json.nickname @user.nickname
json.email @user.email
json.account_id @user.account.id
json.pubsub_token @user.pubsub_token
json.role @user.role
json.confirmed @user.confirmed?
json.avatar_url @user.avatar_url

22
app/views/devise/_auth.json.jbuilder Normal file
View File

@@ -0,0 +1,22 @@
json.data do
json.id resource.id
json.provider resource.provider
json.uid resource.uid
json.name resource.name
json.nickname resource.nickname
json.email resource.email
json.account_id resource.active_account_user.account_id
json.pubsub_token resource.pubsub_token
json.role resource.active_account_user.role
json.inviter_id resource.active_account_user.inviter_id
json.confirmed resource.confirmed?
json.avatar_url resource.avatar_url
json.accounts do
json.array! resource.account_users do |account_user|
json.id account_user.account_id
json.name account_user.account.name
json.active_at account_user.active_at
json.role account_user.role
end
end
end

14
app/views/devise/auth.json.jbuilder
View File

@@ -1,14 +0,0 @@
json.data do
json.id resource.id
json.provider resource.provider
json.uid resource.uid
json.name resource.name
json.nickname resource.nickname
json.email resource.email
json.account_id resource.account.id
json.pubsub_token resource.pubsub_token
json.role resource.account_user.role
json.inviter_id resource.account_user.inviter_id
json.confirmed resource.confirmed?
json.avatar_url resource.avatar_url
end

2
app/views/devise/mailer/confirmation_instructions.html.erb
View File

@@ -1,6 +1,6 @@
<p>Welcome, <%= @resource.name %>!</p>
<% if @resource.inviter.present? %>
<% if @resource&.inviter.present? %>
<p><%= @resource.inviter.name %>, with <%= @resource.inviter.account.name %>, has invited you to try out Chatwoot! </p>
<% end %>

16
app/views/devise/token.json.jbuilder
View File

@@ -1,18 +1,4 @@
json.payload do
json.success true
json.data do
json.id @resource.id
json.provider @resource.provider
json.uid @resource.uid
json.name @resource.name
json.nickname @resource.nickname
json.email @resource.email
json.account_id @resource.account.id
json.pubsub_token @resource.pubsub_token
json.role @resource.account_user.role
json.inviter_id @resource.account_user.inviter_id
json.confirmed @resource.confirmed?
json.avatar_url @resource.avatar_url
json.access_token @resource.access_token&.token
end
json.partial! 'auth.json.jbuilder', resource: @resource
end