Merge pull request #120 from CESNET/prompt_consent_remember_me

fix: 🐛 Do not display remember me when prompt=consnet
CESNET · Jan 10, 2022 · c23e603 · c23e603
2 parents 7877e18 + 1bf72b8
commit c23e603
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties b/perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties
@@ -5,7 +5,7 @@ login=Login
 consent_privacy_policy=Zásady zpracování osobních údajů pro službu
 consent_header=Obsah odesílaných osobních informací službě
 consent_title=Obsah odesílaných osobních informací službě
-remember=Příště se již neptat
+remember=Zapamatovat
 
 #APPROVE_DEVICE
 device_approve_privacy=Bezpečnostní politika služby

diff --git a/perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties b/perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties
@@ -5,7 +5,7 @@ login=login
 consent_privacy_policy=Privacy policy for the service
 consent_header=Consent about releasing personal information to service
 consent_title=Consent about releasing personal information to service
-remember=Do not ask again
+remember=Remember
 
 #APPROVE_DEVICE
 device_approve_privacy=Privacy policy for the service

diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedApprove.jsp b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/views/themedApprove.jsp
@@ -40,6 +40,7 @@
 			</c:if>
 		</p>
 		<t:attributesConsent />
+		<c:if test="${rememberEnabled}">
 		<div class="row" id="saveconsentcontainer">
 			<div class="col-xs-12">
 				<div class="checkbox">
@@ -48,6 +49,7 @@
 				</div>
 			</div>
 		</div>
+		</c:if>
 		<input id="user_oauth_approval" name="user_oauth_approval" value="true" type="hidden" />
 		<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
 		<t:consentButtons />

diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/OAuthConfirmationController.java b/perun-oidc-server/src/main/java/cz/muni/ics/oauth2/web/OAuthConfirmationController.java
@@ -90,6 +90,7 @@ public class OAuthConfirmationController {
 	public static final String CONSENT = "consent";
 	public static final String THEMED_APPROVE = "themedApprove";
 	public static final String APPROVE = "approve";
+	public static final String REMEMBER_ENABLED = "rememberEnabled";
 
 	@Getter
 	@Setter
@@ -165,6 +166,7 @@ public String confirmAccess(Map<String, Object> model, HttpServletRequest req, P
 		model.put(AUTH_REQUEST, authRequest);
 		model.put(CLIENT, client);
 		model.put(REDIRECT_URI, authRequest.getRedirectUri());
+		model.put(REMEMBER_ENABLED, !prompts.contains(CONSENT));
 
 		Set<SystemScope> sortedScopes = ControllerUtils.getSortedScopes(authRequest.getScope(), scopeService);
 		model.put(SCOPES, sortedScopes);