The Unified and Autonomous Development Platform
fix: Unable to login after upgrade from 11.6.10 to 11.9.3 (OD-2415)
Robin Shenb405f417e8fb
diff --git a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.javaindex b565ddac05..5a8c753d0d 100644--- a/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/realm/PasswordAuthenticatingRealm.java@@ -151,12 +151,10 @@ public class PasswordAuthenticatingRealm extends AuthenticatingRealm {throws AuthenticationException {return transactionManager.call(() -> {try {- var user = userManager.findByVerifiedEmailAddress((String) token.getPrincipal());- if (user != null && user.getPassword() != null)- return user;-var userName = normalizeUserName((String) token.getPrincipal());- user = userManager.findByName(userName);+ var user = userManager.findByVerifiedEmailAddress((String) token.getPrincipal());+ if (user == null)+ user = userManager.findByName(userName);if (user != null) {if (user.isDisabled())throw new DisabledAccountException("Account is disabled");diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.javaindex 024dd65e32..4c4b196d48 100644--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java@@ -2187,6 +2187,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("Undefined Field Resolution", "未定义字段解析");m.put("Undefined Field Value Resolution", "未定义字段值解析");m.put("Undefined State Resolution", "未定义状态解析");+ m.put("Under which condition this step should run. <b>Successful</b> means all non-optional steps running before this step are successful",+ "在什么条件下应运行此步骤。<b>成功</b>表示在此步骤之前运行的所有非可选步骤都已成功");m.put("Unified", "统一");m.put("Unlimited", "无限制");m.put("Unspecified", "未指定");@@ -2363,10 +2365,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {m.put("{0} commits", "{0} 个提交");m.put("{0} files", "{0} 个文件");m.put("{0} tags", "{0} 个标签");- m.put("Under which condition this step should run. <b>Successful</b> means all non-optional steps running before this step are successful",- "在什么条件下应运行此步骤。<b>成功</b>表示在此步骤之前运行的所有非可选步骤都已成功");- m.put("Whether or not this step is optional. Execution failure of an optional step will not cause the build to fail, and execute condition of subsequent steps will not take optional step into account",- "此步骤是否为可选。可选步骤执行失败不会导致构建失败,后续步骤的执行条件也不会将可选步骤计算在内");+ m.put("Whether or not this step is optional. Execution failure of an optional step will not cause the build to fail, and successful condition of subsequent steps will not take optional step into account",+ "**** translate this ****");// Manually added keysm.put("Create Administrator Account", "创建管理员账户");