vnclagoon/vnctalk-hybridauth
14
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: adjusted queries

Browse Source
This commit is contained in:
Stefan-Sanger
2020-01-06 10:29:16 +01:00
parent f2634dcbd5
commit ff4f3bbc1b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/app.js
+6 -3
View File
@@ -215,12 +215,13 @@ function IsValidRedmineUser(username) {
var query = ""
var queryparams = [];
queryparams[0] = uid;
queryparams[1] = api;
queryparams[1] = "api";
queryparams[2] = username;
// var query = "SELECT DISTINCT ON (uid) users.login AS uid, users.firstname AS givenName, users.lastname AS sn FROM users WHERE users.status=1 AND users.login=$1";
var query = "SELECT DISTINCT ON (uid) users.login AS uid, users.firstname AS givenName, users.lastname AS sn, email_addresses.address AS mail, ";
query += "tokens.value AS RedmineAPIKey FROM users, tokens, email_addresses WHERE users.status=1 AND tokens.user_id = users.id ";
query += "AND tokens.action=$2 AND email_addresses.user_id = users.id AND users.login=$1";
query += "AND tokens.action=$2 AND email_addresses.user_id = users.id AND (users.login=$1 or users.login=$3)";
dbpool.query(query, queryparams, function (derr, dres) {
@@ -249,9 +250,11 @@ function IsValidRedmineAuth(username, password) {
queryparams[1] = password;
queryparams[2] = "sha1";
queryparams[3] = "hex";
queryparams[4] = username;
var query = "SELECT DISTINCT ON (uid) users.login AS uid, users.firstname AS givenName, users.lastname AS sn FROM users ";
query += "WHERE users.status=1 AND users.login=$1 AND substring(users.hashed_password, 0, length(users.hashed_password)+1) = encode(digest(users.salt||encode(digest($2, $3), $4), $3), $4)";
query += "WHERE users.status=1 AND (users.login=$1 or users.login=$5) AND substring(users.hashed_password, 0, length(users.hashed_password)+1) = encode(digest(users.salt||encode(digest($2, $3), $4), $3), $4)";
dbpool.query(query, queryparams, function (derr, dres) {
if (derr == null) {
if (dres.rowCount > 0) {