Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 1 addition & 25 deletions app/controllers/api/v1/admin_controller.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
class Api::V1::AdminController < Api::V1::BaseApiController
before_action :authenticate_from_token!, except: [:save_twitter_credentials_for_smooch_bot, :save_messenger_credentials_for_smooch_bot, :save_instagram_credentials_for_smooch_bot]
before_action :authenticate_from_token!, except: [:save_messenger_credentials_for_smooch_bot, :save_instagram_credentials_for_smooch_bot]

# GET /api/admin/user/slack?uid=:uid
def slack_user
Expand All @@ -9,30 +9,6 @@ def slack_user
render_user user, 'slack_uid'
end

# GET /api/admin/smooch_bot/:bot-installation-id/authorize/twitter?token=:bot-installation-token
def save_twitter_credentials_for_smooch_bot
tbi = TeamBotInstallation.find(params[:id])
auth = session['check.twitter.authdata']
status = nil
if params[:token].to_s == tbi.get_smooch_authorization_token
params = {
'tier' => CheckConfig.get('smooch_twitter_tier'),
'envName' => CheckConfig.get('smooch_twitter_env_name'),
'consumerKey' => CheckConfig.get('smooch_twitter_consumer_key'),
'consumerSecret' => CheckConfig.get('smooch_twitter_consumer_secret'),
'accessTokenKey' => auth['token'],
'accessTokenSecret' => auth['secret']
}
tbi.smooch_add_integration('twitter', params)
@message = I18n.t(:smooch_twitter_success)
status = 200
else
@message = I18n.t(:invalid_token)
status = 401
end
render template: 'message', formats: :html, status: status
end

# GET /api/admin/smooch_bot/:bot-installation-id/authorize/messenger?token=:bot-installation-token
def save_messenger_credentials_for_smooch_bot
self.save_facebook_credentials_for_smooch_bot('messenger')
Expand Down
7 changes: 0 additions & 7 deletions app/models/concerns/user_multi_auth_login.rb
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,5 @@ def disconnect_login_account(provider, uid)
end
end
end

def get_user_provider(email)
account = self.get_social_accounts_for_login({email: email})
account = account.first unless account.nil?
account.nil? ? '' : account.provider
end

end
end
2 changes: 0 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,13 @@
match '/graphql' => 'graphql#create', via: [:post]
match '/graphql/batch' => 'graphql#batch', via: [:post]
match '/admin/user/slack' => 'admin#slack_user', via: [:get]
match '/admin/smooch_bot/:id/authorize/twitter' => 'admin#save_twitter_credentials_for_smooch_bot', via: [:get]
match '/admin/smooch_bot/:id/authorize/messenger' => 'admin#save_messenger_credentials_for_smooch_bot', via: [:get]
match '/admin/smooch_bot/:id/authorize/instagram' => 'admin#save_instagram_credentials_for_smooch_bot', via: [:get]
match '/project_medias/:id/oembed' => 'project_medias#oembed', via: [:get], defaults: { format: :json }
match '/webhooks/:name' => 'webhooks#index', via: [:post, :get], defaults: { format: :json }
devise_for :users, controllers: { invitations: 'api/v1/invitations', sessions: 'api/v1/sessions', omniauth_callbacks: 'api/v1/omniauth_callbacks', confirmations: 'api/v1/confirmations' }
devise_scope :api_user do
get '/users/logout', to: 'omniauth_callbacks#logout'
get '/users/auth/twitter/setup' => 'omniauth_callbacks#setup'
get '/users/auth/facebook/setup' => 'omniauth_callbacks#setup'
end
end
Expand Down
24 changes: 0 additions & 24 deletions test/controllers/admin_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,6 @@ def setup
assert_response 401
end

test "should not use Twitter credentials for Smooch bot if token is invalid" do
b = create_team_bot login: 'smooch'
tbi = create_team_bot_installation
session['check.twitter.authdata'] = { 'token' => '123456', 'secret' => '654321' }
get :save_twitter_credentials_for_smooch_bot, params: { id: tbi.id, token: random_string }
assert_response 401
end

test "should use Twitter credentials for Smooch bot" do
Bot::Smooch.stubs(:smooch_api_client).returns(nil)
SmoochApi::IntegrationApi.any_instance.expects(:create_integration).once
b = create_team_bot login: 'smooch'
t = random_string
tbi = create_team_bot_installation
tbi = TeamBotInstallation.find(tbi.id)
tbi.set_smooch_authorization_token = t
tbi.save!
session['check.twitter.authdata'] = { 'token' => '123456', 'secret' => '654321' }
get :save_twitter_credentials_for_smooch_bot, params: { id: tbi.id, token: t }
assert_response :success
Bot::Smooch.unstub(:smooch_api_client)
SmoochApi::IntegrationApi.any_instance.unstub(:create_integration)
end

test "should not connect Facebook page to Smooch bot if token is invalid" do
b = create_team_bot login: 'smooch'
tbi = create_team_bot_installation
Expand Down
Loading