|
41 | 41 | */
|
42 | 42 | public class BroadleafAdminAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
|
43 | 43 |
|
| 44 | + protected String loginUri = "/login"; // default login uri but can be overridden in admin security config |
44 | 45 | private RequestCache requestCache = new HttpSessionRequestCache();
|
45 |
| - |
46 |
| - private String loginUri = "/login"; //default login uri but can be overridden in admin security config |
47 |
| - |
48 | 46 | private static final String successUrlParameter = "successUrl=";
|
49 |
| - |
| 47 | + |
50 | 48 | @Resource(name = "blAdminSecurityRemoteService")
|
51 | 49 | protected SecurityVerifier adminRemoteSecurityService;
|
52 | 50 |
|
@@ -95,35 +93,32 @@ public void onAuthenticationSuccess(HttpServletRequest request, HttpServletRespo
|
95 | 93 | // Remove the login URI so we don't continuously redirect to the login page
|
96 | 94 | targetUrl = removeLoginSegment(targetUrl);
|
97 | 95 |
|
98 |
| - if (logger.isDebugEnabled()) { |
99 |
| - logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl); |
100 |
| - } |
| 96 | + logger.debug("Redirecting to DefaultSavedRequest Url: " + targetUrl); |
101 | 97 | getRedirectStrategy().sendRedirect(request, response, targetUrl);
|
102 | 98 | }
|
103 |
| - |
| 99 | + |
104 | 100 | /**
|
105 | 101 | * Given the instance attribute loginUri, removes the loginUri from the passed url when present
|
106 | 102 | * @param uri
|
107 | 103 | * @return String
|
108 | 104 | */
|
109 |
| - private String removeLoginSegment(String url) { |
110 |
| - if ((url == null) || url.equals("")) { |
111 |
| - return "/"; |
112 |
| - } |
113 |
| - int lastSlashPos = url.lastIndexOf(loginUri); |
114 |
| - if (lastSlashPos >= 0) { |
115 |
| - return url.substring(0, lastSlashPos); |
116 |
| - } |
117 |
| - else { |
118 |
| - return url; |
119 |
| - } |
120 |
| - } |
121 |
| - |
122 |
| - public String getLoginUri() { |
123 |
| - return loginUri; |
124 |
| - } |
125 |
| - |
126 |
| - public void setLoginUri(String loginUri) { |
127 |
| - this.loginUri = loginUri; |
128 |
| - } |
| 105 | + protected String removeLoginSegment(String url) { |
| 106 | + if (StringUtils.isEmpty(url)) { |
| 107 | + return "/"; |
| 108 | + } |
| 109 | + int lastSlashPos = url.lastIndexOf(loginUri); |
| 110 | + if (lastSlashPos >= 0) { |
| 111 | + return url.substring(0, lastSlashPos); |
| 112 | + } else { |
| 113 | + return url; |
| 114 | + } |
| 115 | + } |
| 116 | + |
| 117 | + public String getLoginUri() { |
| 118 | + return loginUri; |
| 119 | + } |
| 120 | + |
| 121 | + public void setLoginUri(String loginUri) { |
| 122 | + this.loginUri = loginUri; |
| 123 | + } |
129 | 124 | }
|
0 commit comments