github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 02:09:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

callWithRequest should pass the context that the API method would get when called normally instead of assuming client is the context for everything

Browse source 
Fixes #6483
This commit is contained in:
Matthew Bargar 2016-01-28 11:13:46 -05:00 • committed by Spencer Alger
parent 273ff94535
commit 335a276f7a
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/elasticsearch/lib/call_with_request.js
View file

@ -2,15 +2,21 @@ const _ = require('lodash');
const Promise = require('bluebird'); const Promise = require('bluebird');
const Boom = require('boom'); const Boom = require('boom');
const getBasicAuthRealm = require('./get_basic_auth_realm'); const getBasicAuthRealm = require('./get_basic_auth_realm');
const toPath = require('lodash/internal/toPath');
module.exports = (client) => { module.exports = (client) => {
return (req, endpoint, params = {}) => { return (req, endpoint, params = {}) => {
if (req.headers.authorization) { if (req.headers.authorization) {
_.set(params, 'headers.authorization', req.headers.authorization); _.set(params, 'headers.authorization', req.headers.authorization);
} }
const api = _.get(client, endpoint); const path = toPath(endpoint);
const api = _.get(client, path);
let apiContext = _.get(client, path.slice(0, -1));
if (_.isEmpty(apiContext)) {
apiContext = client;
}
if (!api) throw new Error(`callWithRequest called with an invalid endpoint: ${endpoint}`); if (!api) throw new Error(`callWithRequest called with an invalid endpoint: ${endpoint}`);
return api.call(client, params) return api.call(apiContext, params)
.catch((err) => { .catch((err) => {
if (err.status === 401) { if (err.status === 401) {
// TODO: The err.message is temporary until we have support for getting headers in the client. // TODO: The err.message is temporary until we have support for getting headers in the client.