LeadMagnet/leadchat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Chore: Scope URLs with account_id (#601)

Browse Source 
* Chore: Enable Users to create multiple accounts

Addresses: #402
- migrations to split roles and other attributes from users table
- make changes in code to accommodate this change

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
This commit is contained in:
Sojan Jose
2020-03-09 23:27:10 +05:30
committed by GitHub
parent 2a6670f0da
commit 19ab0fe108
105 changed files with 480 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/accounts_controller.rb → app/controllers/api/v1/accounts/accounts_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::AccountsController < Api::BaseController
class Api::V1::Accounts::AccountsController < Api::BaseController
include AuthHelper
skip_before_action :verify_authenticity_token, only: [:create]
@@ -18,9 +18,7 @@ class Api::V1::AccountsController < Api::BaseController
).perform
if @user
send_auth_headers(@user)
render json: {
data: @user.token_validation_response
}
render 'devise/auth.json', locals: { resource: @user }
else
render_error_response(CustomExceptions::Account::SignupFailed.new({}))
end

2
app/controllers/api/v1/actions/contact_merges_controller.rb → app/controllers/api/v1/accounts/actions/contact_merges_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::Actions::ContactMergesController < Api::BaseController
class Api::V1::Accounts::Actions::ContactMergesController < Api::BaseController
before_action :set_base_contact, only: [:create]
before_action :set_mergee_contact, only: [:create]

2
app/controllers/api/v1/agents_controller.rb → app/controllers/api/v1/accounts/agents_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::AgentsController < Api::BaseController
class Api::V1::Accounts::AgentsController < Api::BaseController
before_action :fetch_agent, except: [:create, :index]
before_action :check_authorization
before_action :find_user, only: [:create]

11
app/controllers/api/v1/callbacks_controller.rb → app/controllers/api/v1/accounts/callbacks_controller.rb
View File

@@ -1,6 +1,4 @@
require 'rest-client'
require 'telegram/bot'
class Api::V1::CallbacksController < Api::BaseController
class Api::V1::Accounts::CallbacksController < Api::BaseController
before_action :inbox, only: [:reauthorize_page]
def register_facebook_page
@@ -18,7 +16,7 @@ class Api::V1::CallbacksController < Api::BaseController
render json: inbox
end
def get_facebook_pages
def facebook_pages
@page_details = mark_already_existing_facebook_pages(fb_object.get_connections('me', 'accounts'))
end
@@ -67,7 +65,7 @@ class Api::V1::CallbacksController < Api::BaseController
return [] if data.empty?
data.inject([]) do |result, page_detail|
current_account.facebook_pages.exists?(page_id: page_detail['id']) ? page_detail.merge!(exists: true) : page_detail.merge!(exists: false)
page_detail[:exists] = current_account.facebook_pages.exists?(page_id: page_detail['id']) ? true : false
result << page_detail
end
end
@@ -90,11 +88,12 @@ class Api::V1::CallbacksController < Api::BaseController
response = uri.open(redirect: false)
rescue OpenURI::HTTPRedirect => e
uri = e.uri # assigned from the "Location" response header
retry if (tries -= 1) > 0
retry if (tries -= 1).positive?
raise
end
pic_url = response.base_uri.to_s
rescue StandardError => e
Rails.logger.debug "Rescued: #{e.inspect}"
pic_url = nil
end
pic_url

2
app/controllers/api/v1/canned_responses_controller.rb → app/controllers/api/v1/accounts/canned_responses_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::CannedResponsesController < Api::BaseController
class Api::V1::Accounts::CannedResponsesController < Api::BaseController
before_action :fetch_canned_response, only: [:update, :destroy]
def index

2
app/controllers/api/v1/contacts/conversations_controller.rb → app/controllers/api/v1/accounts/contacts/conversations_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::Contacts::ConversationsController < Api::BaseController
class Api::V1::Accounts::Contacts::ConversationsController < Api::BaseController
def index
@conversations = current_account.conversations.includes(
:assignee, :contact, :inbox

2
app/controllers/api/v1/contacts_controller.rb → app/controllers/api/v1/accounts/contacts_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::ContactsController < Api::BaseController
class Api::V1::Accounts::ContactsController < Api::BaseController
protect_from_forgery with: :null_session
before_action :check_authorization

5
app/controllers/api/v1/conversations/assignments_controller.rb → app/controllers/api/v1/accounts/conversations/assignments_controller.rb
View File

@@ -1,7 +1,8 @@
class Api::V1::Conversations::AssignmentsController < Api::BaseController
class Api::V1::Accounts::Conversations::AssignmentsController < Api::BaseController
before_action :set_conversation, only: [:create]
def create # assign agent to a conversation
# assign agent to a conversation
def create
# if params[:assignee_id] is not a valid id, it will set to nil, hence unassigning the conversation
assignee = current_account.users.find_by(id: params[:assignee_id])
@conversation.update_assignee(assignee)

5
app/controllers/api/v1/conversations/labels_controller.rb → app/controllers/api/v1/accounts/conversations/labels_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::Conversations::LabelsController < Api::BaseController
class Api::V1::Accounts::Conversations::LabelsController < Api::BaseController
before_action :set_conversation, only: [:create, :index]
def create
@@ -6,7 +6,8 @@ class Api::V1::Conversations::LabelsController < Api::BaseController
@labels = @conversation.label_list
end
def index # all labels of the current conversation
# all labels of the current conversation
def index
@labels = @conversation.label_list
end
end

2
app/controllers/api/v1/conversations/messages_controller.rb → app/controllers/api/v1/accounts/conversations/messages_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::Conversations::MessagesController < Api::BaseController
class Api::V1::Accounts::Conversations::MessagesController < Api::BaseController
before_action :set_conversation, only: [:index, :create]
def index

6
app/controllers/api/v1/conversations_controller.rb → app/controllers/api/v1/accounts/conversations_controller.rb
View File

@@ -1,5 +1,5 @@
class Api::V1::ConversationsController < Api::BaseController
before_action :set_conversation, except: [:index]
class Api::V1::Accounts::ConversationsController < Api::BaseController
before_action :conversation, except: [:index]
def index
result = conversation_finder.perform
@@ -25,7 +25,7 @@ class Api::V1::ConversationsController < Api::BaseController
DateTime.strptime(params[:agent_last_seen_at].to_s, '%s')
end
def set_conversation
def conversation
@conversation ||= current_account.conversations.find_by(display_id: params[:id])
end

3
app/controllers/api/v1/facebook_indicators_controller.rb → app/controllers/api/v1/accounts/facebook_indicators_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::FacebookIndicatorsController < Api::BaseController
class Api::V1::Accounts::FacebookIndicatorsController < Api::BaseController
before_action :set_access_token
around_action :handle_with_exception
@@ -26,6 +26,7 @@ class Api::V1::FacebookIndicatorsController < Api::BaseController
def handle_with_exception
yield
rescue Facebook::Messenger::Error => e
Rails.logger.debug "Rescued: #{e.inspect}"
true
end

2
app/controllers/api/v1/inbox_members_controller.rb → app/controllers/api/v1/accounts/inbox_members_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::InboxMembersController < Api::BaseController
class Api::V1::Accounts::InboxMembersController < Api::BaseController
before_action :fetch_inbox, only: [:create, :show]
before_action :current_agents_ids, only: [:create]

2
app/controllers/api/v1/inboxes_controller.rb → app/controllers/api/v1/accounts/inboxes_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::InboxesController < Api::BaseController
class Api::V1::Accounts::InboxesController < Api::BaseController
before_action :check_authorization
before_action :fetch_inbox, only: [:destroy, :update]

5
app/controllers/api/v1/labels_controller.rb → app/controllers/api/v1/accounts/labels_controller.rb
View File

@@ -1,5 +1,6 @@
class Api::V1::LabelsController < Api::BaseController
def index # list all labels in account
class Api::V1::Accounts::LabelsController < Api::BaseController
# list all labels in account
def index
@labels = current_account.all_conversation_tags
end

2
app/controllers/api/v1/user/notification_settings_controller.rb → app/controllers/api/v1/accounts/notification_settings_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::User::NotificationSettingsController < Api::BaseController
class Api::V1::Accounts::NotificationSettingsController < Api::BaseController
before_action :set_user, :load_notification_setting
def show; end

24
app/controllers/api/v1/reports_controller.rb → app/controllers/api/v1/accounts/reports_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::ReportsController < Api::BaseController
class Api::V1::Accounts::ReportsController < Api::BaseController
include CustomExceptions::Report
include Constants::Report
@@ -36,10 +36,6 @@ class Api::V1::ReportsController < Api::BaseController
current_user.account
end
def agent
@agent ||= current_account.users.find(params[:agent_id])
end
def account_summary_metrics
summary_metrics(ACCOUNT_METRICS, :account_summary_params, AVG_ACCOUNT_METRICS)
end
@@ -51,18 +47,18 @@ class Api::V1::ReportsController < Api::BaseController
def summary_metrics(metrics, calc_function, avg_metrics)
metrics.each_with_object({}) do |metric, result|
data = ReportBuilder.new(current_account, send(calc_function, metric)).build
if avg_metrics.include?(metric)
sum = data.inject(0) { |sum, hash| sum + hash[:value].to_i }
sum /= data.length unless sum.zero?
else
sum = data.inject(0) { |sum, hash| sum + hash[:value].to_i }
end
result[metric] = sum
result[metric] = calculate_metric(data, metric, avg_metrics)
end
end
def calculate_metric(data, metric, avg_metrics)
sum = data.inject(0) { |val, hash| val + hash[:value].to_i }
if avg_metrics.include?(metric)
sum /= data.length unless sum.zero?
end
sum
end
def account_summary_params(metric)
{
metric: metric.to_s,

2
app/controllers/api/v1/subscriptions_controller.rb → app/controllers/api/v1/accounts/subscriptions_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::SubscriptionsController < Api::BaseController
class Api::V1::Accounts::SubscriptionsController < Api::BaseController
skip_before_action :check_subscription
before_action :check_billing_enabled

2
app/controllers/api/v1/account/webhooks_controller.rb → app/controllers/api/v1/accounts/webhooks_controller.rb
View File

@@ -1,4 +1,4 @@
class Api::V1::Account::WebhooksController < Api::BaseController
class Api::V1::Accounts::WebhooksController < Api::BaseController
before_action :check_authorization
before_action :fetch_webhook, only: [:update, :destroy]

4
app/controllers/devise_overrides/passwords_controller.rb
View File

@@ -11,9 +11,7 @@ class DeviseOverrides::PasswordsController < Devise::PasswordsController
@recoverable = User.find_by(reset_password_token: reset_password_token)
if @recoverable && reset_password_and_confirmation(@recoverable)
send_auth_headers(@recoverable)
render json: {
data: @recoverable.token_validation_response
}
render 'devise/auth.json', locals: { resource: @recoverable }
else
render json: { "message": 'Invalid token', "redirect_url": '/' }, status: 422
end

2
app/controllers/devise_overrides/sessions_controller.rb
View File

@@ -4,6 +4,6 @@ class DeviseOverrides::SessionsController < ::DeviseTokenAuth::SessionsControlle
wrap_parameters format: []
def render_create_success
render 'devise/auth.json'
render 'devise/auth.json', locals: { resource: @resource }
end
end