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

fix: return redmine_host blank in case of not subdomain

Browse Source
This commit is contained in:
Vijay Godhasara
2020-07-02 19:31:02 +05:30
parent c0fac1fce3
commit 6fac9bd72a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/app.js
+1 -1
View File
@@ -223,7 +223,7 @@ function IsValidRedmineUser2FA(username) {
query += "users.login||\'@"+ config.domain +"\' AS email, organizations.name as memberOf, departments.name as deptName, ";
query += "replace(trim(replace(replace(departments.enabled_product_names, \'-\', \'\'), E\'\n\', \'\')), E\' \', \',\') as features, tokens.value as redmineapikey, cast(users.tfa_enabled as TEXT) as tfa_enabled ";
if (config.redmineHost) {
query += ", CASE WHEN organizations.vncproject_subdomain IS NULL OR organizations.vncproject_subdomain = '' THEN '"+ config.redmineHost +"' ELSE organizations.vncproject_subdomain||'."+ config.redmineHost +"' END as redmine_host ";
query += ", CASE WHEN organizations.vncproject_subdomain IS NULL OR organizations.vncproject_subdomain = '' THEN '' ELSE organizations.vncproject_subdomain||'."+ config.redmineHost +"' END as redmine_host ";
}
query += "FROM users JOIN organization_users ON organization_users.user_id=users.id ";
query += "JOIN organizations ON organizations.id=organization_users.organization_id JOIN departments ON departments.id=organization_users.department_id JOIN tokens ON tokens.user_id=users.id ";