Polish Login UI

Author: jzheaux

core/src/main/java/org/springframework/security/core/authority/AuthorityUtils.java

@@ -22,7 +22,6 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
-import java.util.stream.Stream;
 
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.util.Assert;
@@ -69,42 +68,6 @@ public static Set<String> authorityListToSet(Collection<? extends GrantedAuthori
 		return set;
 	}
 
-	/**
-	 * Return a {@link Stream} containing only the authorities of the given type;
-	 * {@code "ROLE"}, {@code "SCOPE"}, or {@code "FACTOR"}.
-	 * @param type the authority type; {@code "ROLE"}, {@code "SCOPE"}, or
-	 * {@code "FACTOR"}
-	 * @param authorities the list of authorities
-	 * @return a {@link Stream} containing the authorities of the given type
-	 * @since 7.0
-	 */
-	public static Stream<GrantedAuthority> authoritiesOfType(String type, Collection<GrantedAuthority> authorities) {
-		return authorities.stream().filter((a) -> a.getAuthority().startsWith(type + "_"));
-	}
-
-	/**
-	 * Return the simple name of a {@link GrantedAuthority}, which is its name, less any
-	 * common prefix; that is, {@code ROLE_}, {@code SCOPE_}, or {@code FACTOR_}.
-	 * <p>
-	 * For example, if the authority is {@code ROLE_USER}, then the simple name is
-	 * {@code user}.
-	 * <p>
-	 * If the authority is {@code FACTOR_PASSWORD}, then the simple name is
-	 * {@code password}.
-	 * @param authority the granted authority
-	 * @return the simple name of the authority
-	 * @since 7.0
-	 */
-	public static String getSimpleName(GrantedAuthority authority) {
-		String name = authority.getAuthority();
-		for (String prefix : KNOWN_PREFIXES) {
-			if (name.startsWith(prefix)) {
-				return name.substring(prefix.length());
-			}
-		}
-		return name;
-	}
-
 	/**
 	 * Converts authorities into a List of GrantedAuthority objects.
 	 * @param authorities the authorities to convert

web/src/main/java/org/springframework/security/web/authentication/LoginUrlAuthenticationEntryPoint.java

@@ -33,7 +33,6 @@
 import org.springframework.core.log.LogMessage;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.authority.AuthorityUtils;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.DefaultRedirectStrategy;
 import org.springframework.security.web.PortMapper;
@@ -75,6 +74,8 @@ public class LoginUrlAuthenticationEntryPoint implements AuthenticationEntryPoin
 
 	private static final Log logger = LogFactory.getLog(LoginUrlAuthenticationEntryPoint.class);
 
+	private static final String FACTOR_PREFIX = "FACTOR_";
+
 	private PortMapper portMapper = new PortMapperImpl();
 
 	private String loginFormUrl;
@@ -122,9 +123,9 @@ protected String determineUrlToUseForThisRequest(HttpServletRequest request, Htt
 		if (CollectionUtils.isEmpty(authorities)) {
 			return getLoginFormUrl();
 		}
-		Collection<String> factors = AuthorityUtils.authoritiesOfType("FACTOR", authorities)
-			.map(AuthorityUtils::getSimpleName)
-			.map((a) -> a.toLowerCase(Locale.ROOT))
+		Collection<String> factors = authorities.stream()
+			.filter((a) -> a.getAuthority().startsWith(FACTOR_PREFIX))
+			.map((a) -> a.getAuthority().substring(FACTOR_PREFIX.length()).toLowerCase(Locale.ROOT))
 			.toList();
 		return UriComponentsBuilder.fromUriString(getLoginFormUrl()).queryParam("factor", factors).toUriString();
 	}

web/src/main/java/org/springframework/security/web/authentication/ui/DefaultLoginPageGeneratingFilter.java

@@ -125,7 +125,8 @@ private void initAuthFilter(UsernamePasswordAuthenticationFilter authFilter) {
 
 	/**
 	 * Use this {@link SecurityContextHolderStrategy} to retrieve authenticated users.
-	 * <p>Uses {@link SecurityContextHolder#getContextHolderStrategy()} by default.
+	 * <p>
+	 * Uses {@link SecurityContextHolder#getContextHolderStrategy()} by default.
 	 * @param securityContextHolderStrategy the strategy to use
 	 * @since 7.0
 	 */