From ba93d172655d6853688da59a633a1e0eee5f0088 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Thu, 25 Nov 2021 18:26:31 -0800 Subject: [PATCH] GUACAMOLE-1364: Correct naming of SAML auth field and translation. --- .../src/main/resources/translations/en.json | 2 +- .../guacamole/auth/saml/AuthenticationProviderService.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json index 2d212e423..47fc299fa 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/src/main/resources/translations/en.json @@ -14,7 +14,7 @@ "LOGIN" : { "FIELD_HEADER_ID_TOKEN" : "", - "FIELD_HEADER_SAML" : "", + "FIELD_HEADER_STATE" : "", "FIELD_HEADER_TICKET" : "", "INFO_IDP_REDIRECT_PENDING" : "Please wait, redirecting to identity provider..." } diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java index 07bfdcc6e..d09ae78ce 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/java/org/apache/guacamole/auth/saml/AuthenticationProviderService.java @@ -110,7 +110,8 @@ public class AuthenticationProviderService { URI authUri = saml.createRequest(); throw new GuacamoleInsufficientCredentialsException("Redirecting to SAML IdP.", new CredentialsInfo(Arrays.asList(new Field[] { - new RedirectField("samlRedirect", authUri, new TranslatableMessage("LOGIN.INFO_IDP_REDIRECT_PENDING")) + new RedirectField(AUTH_SESSION_QUERY_PARAM, authUri, + new TranslatableMessage("LOGIN.INFO_IDP_REDIRECT_PENDING")) })) );