Skip to content

Commit 01b6742

Browse files
author
vvo
committed
fix(client.search): accept very long API keys
fixes #319 also fix uglify-js version because it's buggy in IE8: mishoo/UglifyJS#1039
1 parent b81c3f1 commit 01b6742

File tree

9 files changed

+7
-30
lines changed

9 files changed

+7
-30
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"sinon": "^1.17.4",
102102
"superagent": "^2.0.0",
103103
"tape": "^4.5.1",
104-
"uglify-js": "^2.7.3",
104+
"uglify-js": "2.6.4",
105105
"url-parse": "^1.1.1",
106106
"watchify": "^3.7.0",
107107
"webpack": "^1.13.1",

scripts/lint

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set -e # exit when error
44

55
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
66

7-
if [ $CI == 'true' ]; then
8-
set -x # debug messages
9-
fi
10-
117
echo "Lint"
128

139
eslint --quiet .

scripts/test

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set -e # exit when error
44

55
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
66

7-
if [ $CI == 'true' ]; then
8-
set -x # debug messages
9-
fi
10-
117
echo "Test"
128

139
echo "Test: node"

scripts/test-browser

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set -e # exit when error
44

55
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
66

7-
if [ $CI == 'true' ]; then
8-
set -x # debug messages
9-
fi
10-
117
[ -z $TRAVIS_PULL_REQUEST ] && TRAVIS_PULL_REQUEST='false'
128

139
echo "Browser test"

scripts/test-ci

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set -e # exit when error
44

55
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
66

7-
if [ $CI == 'true' ]; then
8-
set -x # debug messages
9-
fi
10-
117
[ -z $TRAVIS_PULL_REQUEST ] && TRAVIS_PULL_REQUEST='false'
128

139
echo "CI test"

scripts/test-node

-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ set -e # exit when error
1010

1111
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
1212

13-
if [ $CI == 'true' ]; then
14-
set -x # debug messages
15-
fi
16-
1713
[ -z $TRAVIS_PULL_REQUEST ] && TRAVIS_PULL_REQUEST='false'
1814
[ -z $TRAVIS_BUILD_NUMBER ] && TRAVIS_BUILD_NUMBER='false'
1915

scripts/test-parse-cloud

-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ set -e # exit when error
77

88
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
99

10-
if [ $CI == 'true' ]; then
11-
set -x # debug messages
12-
fi
13-
1410
echo "Parse-cloud test"
1511

1612
# build (including the parse build)

scripts/test-phantom

-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ set -e # exit when error
44

55
[ -z $TRAVIS_BUILD_NUMBER ] && CI='false' || CI='true'
66

7-
if [ $CI == 'true' ]; then
8-
set -x # debug messages
9-
fi
10-
117
echo "Phantom test"
128

139
if [ $CI == 'false' ]; then

src/AlgoliaSearchCore.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,12 @@ AlgoliaSearchCore.prototype._jsonRequest = function(initialOpts) {
159159
var hasFallback = client._useFallback && client._request.fallback && initialOpts.fallback;
160160
var headers;
161161

162-
if (this.apiKey.length > MAX_API_KEY_LENGTH && initialOpts.body !== undefined && initialOpts.body.params !== undefined) {
162+
if (
163+
this.apiKey.length > MAX_API_KEY_LENGTH &&
164+
initialOpts.body !== undefined &&
165+
(initialOpts.body.params !== undefined || // index.search()
166+
initialOpts.body.requests !== undefined) // client.search()
167+
) {
163168
initialOpts.body.apiKey = this.apiKey;
164169
headers = this._computeRequestHeaders(false);
165170
} else {

0 commit comments

Comments
 (0)