Parker2991/node-minecraft-protocol
1
0
Fork 0
mirror of https://github.com/PrismarineJS/node-minecraft-protocol.git synced 2024-11-14 19:04:59 -05:00
Code Issues Projects Releases Packages Wiki Activity

add skipValidation flag for authentication

Browse source
This commit is contained in:
vlakreeh 2018-11-09 11:06:12 -05:00
parent 40102f6158
commit 297d40b17d
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/API.md
View file

@ -84,6 +84,7 @@ Returns a `Client` instance and perform login.
* version : 1.8 or 1.9 or false (to auto-negotiate): default to 1.8
* customPackets (optional) : an object index by version/state/direction/name, see client_custom_packet for an example
* hideErrors : do not display errors, default to false
* skipValidation : do not try to validate given session, defaults to false
## mc.Client(isServer,version,[customPackets])

37
src/client/auth.js
View file

@ -3,6 +3,7 @@ const UUID = require('uuid-1345')
module.exports = function (client, options) {
const clientToken = options.clientToken || (options.session && options.session.clientToken) || UUID.v4().toString()
const skipValidation = false || options.skipValidation
options.accessToken = null
options.haveCredentials = options.password != null || (clientToken != null && options.session != null)
@ -21,23 +22,25 @@ module.exports = function (client, options) {
}
if (options.session) {
yggdrasil.validate(options.session.accessToken, function (err) {
if (!err) { cb(null, options.session) } else {
yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function (err, accessToken, data) {
if (!err) {
cb(null, data)
} else if (options.username && options.password) {
yggdrasil.auth({
user: options.username,
pass: options.password,
token: clientToken
}, cb)
} else {
cb(err, data)
}
})
}
})
if (!skipValidation) {
yggdrasil.validate(options.session.accessToken, function (err) {
if (!err) { cb(null, options.session) } else {
yggdrasil.refresh(options.session.accessToken, options.session.clientToken, function (err, accessToken, data) {
if (!err) {
cb(null, data)
} else if (options.username && options.password) {
yggdrasil.auth({
user: options.username,
pass: options.password,
token: clientToken
}, cb)
} else {
cb(err, data)
}
})
}
})
}
} else {
yggdrasil.auth({
user: options.username,

1
src/index.d.ts vendored
View file

@ -38,6 +38,7 @@ declare module 'minecraft-protocol' {
port?: number
username: string
version?: string
skipValidation?: boolean
}
export class Server extends EventEmitter {