调整代码结构

atlassian-plugins-sso/src/main/java/com/atlassian/jira/security/sso/SSOSeraphAuthenticator.java

@@ -66,18 +66,17 @@ public class SSOSeraphAuthenticator extends DefaultAuthenticator {
         // jira请求标识
         httpServletRequest.setAttribute("com.atlassian.confluence.login.direct", true);
 
-        // 根据uap登录认证
-        // 1 通过ip获取用户信息
-//        String clientIp = IpUtil.getClientIp(httpServletRequest);
-//        if (StrUtil.isBlank(clientIp)) {
+        // 1 检查uap是否登录
+//        CheckLoginResult checkLoginResult = AuapUserService.checkLogin(clientIp);
+//        if (BeanUtil.isEmpty(checkLoginResult)) {
 //            // 重定向到auap登录页
 //            httpServletResponse.sendRedirect("http://www.baidu.com");
 //            return false;
 //        }
 
-        // 2 检查uap是否登录
-//        CheckLoginResult checkLoginResult = AuapUserService.checkLogin(clientIp);
-//        if (BeanUtil.isEmpty(checkLoginResult)) {
+        // 2 通过ip获取用户信息
+//        String clientIp = IpUtil.getClientIp(httpServletRequest);
+//        if (StrUtil.isBlank(clientIp)) {
 //            // 重定向到auap登录页
 //            httpServletResponse.sendRedirect("http://www.baidu.com");
 //            return false;
@@ -139,17 +138,16 @@ public class SSOSeraphAuthenticator extends DefaultAuthenticator {
                     Group group = groupManager.getGroup(groupName);
                     userUtil.addUserToGroup(group, applicationUser);
                 }
-                // 单点登录验证
-                return this.doLogin(httpServletRequest, httpServletResponse, username, password, setRememberMeCookie,true);
             }catch (Exception e) {
                 e.printStackTrace();
             }
+            // 单点登录验证
+            return this.doLogin(httpServletRequest, httpServletResponse, username, password, setRememberMeCookie,true);
         }else {
             // 用户名及密码登录校验
             return this.doLogin(httpServletRequest, httpServletResponse, username, password, setRememberMeCookie,false);
         }
 
-        return false;
     }
 
     @Override