From 30d1dbc1c636fae86c5c52e1ccf013cf605e8a2b Mon Sep 17 00:00:00 2001 From: MinusGix Date: Fri, 6 Mar 2020 17:45:47 -0600 Subject: Make password field available for use in join --- server/src/commands/core/join.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'server') diff --git a/server/src/commands/core/join.js b/server/src/commands/core/join.js index 7e98721..ddbdf6d 100644 --- a/server/src/commands/core/join.js +++ b/server/src/commands/core/join.js @@ -32,7 +32,13 @@ export function parseNickname(core, data) { return 'Nickname must consist of up to 24 letters, numbers, and underscores'; } - const password = nickArray[1]; + let password = undefined; + // prioritize hash in nick for password over password field + if (typeof nickArray[1] === 'string') { + password = nickArray[1]; + } else if (typeof data.password === 'string') { + password = data.password; + } if (hash(password + core.config.tripSalt) === core.config.adminTrip) { userInfo.uType = 'admin'; @@ -152,5 +158,5 @@ export const info = { name: 'join', description: 'Place calling socket into target channel with target nick & broadcast event to channel', usage: ` - API: { cmd: 'join', nick: '', channel: '' }`, + API: { cmd: 'join', nick: '', password: '', channel: '' }`, }; -- cgit v1.2.1