From 8c9bce97acb5ca21c8b23d9594c24204d13fc436 Mon Sep 17 00:00:00 2001 From: Mrbytes <eguervos@msn.com> Date: Fri, 12 Oct 2012 13:25:53 -0400 Subject: [PATCH] GitBlitWebApp_es.properties: -Up-to-date. -Some minor changes in syntax for better compression. --- src/com/gitblit/RedmineUserService.java | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/com/gitblit/RedmineUserService.java b/src/com/gitblit/RedmineUserService.java index 47bb80a..b890f21 100644 --- a/src/com/gitblit/RedmineUserService.java +++ b/src/com/gitblit/RedmineUserService.java @@ -86,15 +86,20 @@ RedmineCurrent current = new Gson().fromJson(jsonString, RedmineCurrent.class); String login = current.user.login; - if (username.equalsIgnoreCase(login)) { - UserModel userModel = new UserModel(login); - userModel.displayName = current.user.firstname + " " + current.user.lastname; - userModel.emailAddress = current.user.mail; - userModel.canAdmin = true; - userModel.cookie = StringUtils.getSHA1(userModel.username + new String(password)); - return userModel; + boolean canAdmin = true; + // non admin user can not get login name + if (StringUtils.isEmpty(login)) { + canAdmin = false; + login = current.user.mail; } + UserModel userModel = new UserModel(login); + userModel.canAdmin = canAdmin; + userModel.displayName = current.user.firstname + " " + current.user.lastname; + userModel.emailAddress = current.user.mail; + userModel.cookie = StringUtils.getSHA1(userModel.username + new String(password)); + + return userModel; } catch (IOException e) { logger.error("authenticate", e); } -- Gitblit v1.9.1