LPS-135470 Handle it in ServicePreAction instead to ensure all means of rendering a user's group are considered

Author: Stian Sigvartsen

modules/apps/friendly-url/friendly-url-service/src/main/java/com/liferay/friendly/url/internal/servlet/FriendlyURLServlet.java

@@ -35,16 +35,13 @@
 import com.liferay.portal.kernel.model.User;
 import com.liferay.portal.kernel.model.VirtualLayoutConstants;
 import com.liferay.portal.kernel.portlet.LayoutFriendlyURLSeparatorComposite;
-import com.liferay.portal.kernel.security.permission.ActionKeys;
-import com.liferay.portal.kernel.security.permission.PermissionCheckerFactoryUtil;
 import com.liferay.portal.kernel.service.GroupLocalService;
 import com.liferay.portal.kernel.service.LayoutFriendlyURLLocalService;
 import com.liferay.portal.kernel.service.LayoutLocalService;
 import com.liferay.portal.kernel.service.ServiceContext;
 import com.liferay.portal.kernel.service.ServiceContextFactory;
 import com.liferay.portal.kernel.service.ServiceContextThreadLocal;
 import com.liferay.portal.kernel.service.UserLocalService;
-import com.liferay.portal.kernel.service.permission.GroupPermissionUtil;
 import com.liferay.portal.kernel.servlet.InactiveRequestHandler;
 import com.liferay.portal.kernel.servlet.PortalMessages;
 import com.liferay.portal.kernel.servlet.ServletContextPool;
@@ -118,15 +115,6 @@ public Redirect getRedirect(
 
 		Group group = _getGroup(path, groupFriendlyURL, companyId);
 
-		if (group.isUser() &&
-			!GroupPermissionUtil.contains(
-				PermissionCheckerFactoryUtil.create(
-					portal.getUser(httpServletRequest)),
-				group, ActionKeys.VIEW)) {
-
-			throw new NoSuchGroupException();
-		}
-
 		Locale locale = portal.getLocale(httpServletRequest, null, false);
 
 		SiteFriendlyURL alternativeSiteFriendlyURL =

portal-impl/src/com/liferay/portal/events/ServicePreAction.java

@@ -1090,7 +1090,7 @@ else if (!loginRequest &&
 					   !_hasAccessPermission(
 						   permissionChecker, layout, false)))) {
 
-				if (user.isDefaultUser() &&
+				if (!group.isUser() && user.isDefaultUser() &&
 					PropsValues.AUTH_LOGIN_PROMPT_ENABLED) {
 
 					throw new PrincipalException.MustBeAuthenticated(