GUACAMOLE-323: Provide login help text during CAS redirect.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5a763d2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5a763d2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5a763d2a Branch: refs/heads/staging/0.9.13-incubating Commit: 5a763d2a53e2e9c39330b08c0f04ccede0ee29b2 Parents: 80b681e Author: Nick Couchman <vn...@apache.org> Authored: Wed Jun 14 21:21:54 2017 -0400 Committer: Nick Couchman <nick.couch...@yahoo.com> Committed: Mon Jun 19 14:59:20 2017 -0400 ---------------------------------------------------------------------- .../apache/guacamole/auth/cas/AuthenticationProviderService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5a763d2a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java index 43435fe..edd89dc 100644 --- a/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-cas/src/main/java/org/apache/guacamole/auth/cas/AuthenticationProviderService.java @@ -29,6 +29,7 @@ import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.form.Field; import org.apache.guacamole.net.auth.Credentials; import org.apache.guacamole.net.auth.credentials.CredentialsInfo; +import org.apache.guacamole.net.auth.credentials.GuacamoleInsufficientCredentialsException; import org.apache.guacamole.net.auth.credentials.GuacamoleInvalidCredentialsException; import org.apache.guacamole.auth.cas.conf.ConfigurationService; import org.apache.guacamole.auth.cas.form.CASTicketField; @@ -89,7 +90,8 @@ public class AuthenticationProviderService { } // Request CAS ticket - throw new GuacamoleInvalidCredentialsException("Invalid login.", + throw new GuacamoleInsufficientCredentialsException( + "Please wait, redirecting to CAS authentication.", new CredentialsInfo(Arrays.asList(new Field[] { // CAS-specific ticket (will automatically redirect the user
