Minor refactoring.
This commit is contained in:
parent
8081a1a3cc
commit
002b788a8c
|
@ -87,30 +87,25 @@ public abstract class AbstractRememberMeServices implements RememberMeServices,
|
||||||
String[] cookieTokens = decodeCookie(rememberMeCookie);
|
String[] cookieTokens = decodeCookie(rememberMeCookie);
|
||||||
user = processAutoLoginCookie(cookieTokens, request, response);
|
user = processAutoLoginCookie(cookieTokens, request, response);
|
||||||
userDetailsChecker.check(user);
|
userDetailsChecker.check(user);
|
||||||
} catch (CookieTheftException cte) {
|
|
||||||
cancelCookie(request, response);
|
|
||||||
throw cte;
|
|
||||||
} catch (UsernameNotFoundException noUser) {
|
|
||||||
cancelCookie(request, response);
|
|
||||||
logger.debug("Remember-me login was valid but corresponding user not found.", noUser);
|
|
||||||
return null;
|
|
||||||
} catch (InvalidCookieException invalidCookie) {
|
|
||||||
cancelCookie(request, response);
|
|
||||||
logger.debug("Invalid remember-me cookie: " + invalidCookie.getMessage());
|
|
||||||
return null;
|
|
||||||
} catch (AccountStatusException statusInvalid) {
|
|
||||||
cancelCookie(request, response);
|
|
||||||
logger.debug("Invalid UserDetails: " + statusInvalid.getMessage());
|
|
||||||
return null;
|
|
||||||
} catch (RememberMeAuthenticationException e) {
|
|
||||||
cancelCookie(request, response);
|
|
||||||
logger.debug(e.getMessage());
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
logger.debug("Remember-me cookie accepted");
|
logger.debug("Remember-me cookie accepted");
|
||||||
|
|
||||||
return createSuccessfulAuthentication(request, user);
|
return createSuccessfulAuthentication(request, user);
|
||||||
|
} catch (CookieTheftException cte) {
|
||||||
|
cancelCookie(request, response);
|
||||||
|
throw cte;
|
||||||
|
} catch (UsernameNotFoundException noUser) {
|
||||||
|
logger.debug("Remember-me login was valid but corresponding user not found.", noUser);
|
||||||
|
} catch (InvalidCookieException invalidCookie) {
|
||||||
|
logger.debug("Invalid remember-me cookie: " + invalidCookie.getMessage());
|
||||||
|
} catch (AccountStatusException statusInvalid) {
|
||||||
|
logger.debug("Invalid UserDetails: " + statusInvalid.getMessage());
|
||||||
|
} catch (RememberMeAuthenticationException e) {
|
||||||
|
logger.debug(e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
cancelCookie(request, response);
|
||||||
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue