Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8734684 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8734684 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8734684 Branch: refs/heads/master Commit: a87346840db1ff86e8b899350ffe307449fd4ebd Parents: 59fc032 b08d0d8 Author: Jorge Bay Gondra <jorgebaygon...@gmail.com> Authored: Thu Aug 23 14:50:35 2018 +0200 Committer: Jorge Bay Gondra <jorgebaygon...@gmail.com> Committed: Thu Aug 23 14:50:35 2018 +0200 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/src/reference/gremlin-variants.asciidoc | 8 ++ .../upgrade/release-3.2.x-incubating.asciidoc | 2 + .../main/javascript/gremlin-javascript/index.js | 8 +- .../lib/driver/auth/authenticator.js | 38 ++++++++ .../auth/mechanisms/sasl-mechanism-base.js | 52 +++++++++++ .../auth/mechanisms/sasl-mechanism-plain.js | 96 ++++++++++++++++++++ .../auth/plain-text-sasl-authenticator.js | 55 +++++++++++ .../lib/driver/auth/sasl-authenticator.js | 49 ++++++++++ .../lib/driver/driver-remote-connection.js | 85 ++++++++++------- .../lib/driver/remote-connection.js | 5 +- .../javascript/gremlin-javascript/lib/utils.js | 23 ++++- .../gremlin-javascript/test/helper.js | 11 +++ .../integration/sasl-authentication-tests.js | 63 +++++++++++++ 14 files changed, 461 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8734684/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8734684/docs/src/reference/gremlin-variants.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8734684/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a8734684/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js ---------------------------------------------------------------------- diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js index d862882,15836ba..04deee7 --- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js +++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js @@@ -31,9 -30,10 +30,10 @@@ const serializer = require('../structur const responseStatusCode = { success: 200, noContent: 204, - partialContent: 206 + partialContent: 206, + authenticationChallenge: 407, }; -const defaultMimeType = 'application/vnd.gremlin-v2.0+json'; +const defaultMimeType = 'application/vnd.gremlin-v3.0+json'; class DriverRemoteConnection extends RemoteConnection { /**