modify auth type

eden-authcenter-agent/src/main/java/com/chineseall/eden/authcenter/agent/controller/AuthController.java

@@ -145,16 +145,21 @@ public class AuthController {
                 return modelAndView;
             }
             String loginType = request.getParameter("login_type");
-            if(StringUtils.isNotEmpty(loginType) && OauthType.getValue(loginType)!=null) {
-                OauthConfigItem oauthConfigItem = oauthConfig.getItems().get(OauthType.getValue(loginType).getCode());
+            OauthType oauthType = OauthType.getValue(loginType);
+            if(StringUtils.isNotEmpty(loginType) && oauthType !=null) {
+                OauthConfigItem oauthConfigItem = oauthConfig.getItems().get(oauthType.getCode());
                 authLog.setFowardUrl(oauthConfigItem.getOauthUrl());
-                authLog.setOauthType(OauthType.getValue(loginType).getCode());
-                // 阅览室日志分离
-                ClientItem item = clientItemMap.get("readingroomClientId");
-                authLog.setAuthSource(item.getClientName());
+                authLog.setOauthType(oauthType.getCode());
+
+                if (StringUtils.isNotEmpty(returnUrl) && returnUrl.contains("readinglab")){
+                    // 阅览室日志分离
+                    ClientItem item = clientItemMap.get("readingroomClientId");
+                    authLog.setAuthSource(item.getClientName());
+                }
                 authLogService.save(authLog);
-                response.sendRedirect(generateLoginUrl(returnUrl, OauthType.getValue(loginType).getCode(), authLog.getId()));
-                return null;
+                //response.sendRedirect(generateLoginUrl(returnUrl, oauthType.getCode(), authLog.getId()));
+                //return null;
+                modelAndView.addObject("loginType",loginType);
             } else {
                 authLogService.save(authLog);
                 String url1 = generateLoginUrl(returnUrl, OauthType.dianjiaoguan.getCode(), authLog.getId());
@@ -164,6 +169,8 @@ public class AuthController {
                 String url3 = generateSpLoginUrl(returnUrl, OauthType.qpjy.getCode(), authLog.getId());
                 modelAndView.addObject("loginUrl3", url3);
                 modelAndView.addObject("logId", authLog.getId());
+
+                modelAndView.addObject("loginType","");
             }
         } catch (Exception e) {
             e.printStackTrace();

eden-authcenter-agent/src/main/resources/templates/ds.html

@@ -85,6 +85,7 @@
       var loginUrl2 = [[${loginUrl2}]];
       var loginUrl3 = [[${loginUrl3}]];
       var logId = [[${logId}]];
+      var loginType = [[${loginType}]];
       var ctxPath = /*[[@{/}]]*/ '';
       /*]]>*/
     </script>
@@ -100,6 +101,9 @@
           window.location.href = baseUrl+idp+"&loginUrl=" + encodeURIComponent(loginUrl3+"&auth_source="+idp)+"&browser="+info.browser+"&device="+info.device+"&os="+info.os+"&version="+info.version;
         }
       }
+      if (loginType.length > 0){
+        toLogin(loginType);
+      }
     </script>
   </body>
 </html>