LPD-52709 Change aui:script so that it can use hashed URLs

Author: izaera

util-taglib/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: ${manifest.bundle.name}
 Bundle-SymbolicName: ${manifest.bundle.symbolic.name}
-Bundle-Version: 28.1.1
+Bundle-Version: 28.2.0
 Export-Package: com.liferay.taglib.*
 Import-Package:\
 	!com.liferay.portal.freemarker,\

util-taglib/src/META-INF/liferay-aui.tld

@@ -1158,6 +1158,11 @@
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
+		<attribute>
+			<name>hashedFile</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
 		<attribute>
 			<name>id</name>
 			<required>false</required>

util-taglib/src/com/liferay/taglib/aui/LinkTag.java

@@ -63,10 +63,17 @@ public int doEndTag() throws JspException {
 					}
 
 					sb.append(PortalUtil.getPathProxy());
-					sb.append(
+
+					String unhashedFileURI =
+						PortalUtil.getPathModule() + StringPool.SLASH + href;
+
+					String hashedFileURI =
 						HashedFilesRegistryUtil.getHashedFileURI(
-							PortalUtil.getPathModule() + StringPool.SLASH +
-								href));
+							unhashedFileURI);
+
+					sb.append(
+						(hashedFileURI == null) ? unhashedFileURI :
+							hashedFileURI);
 
 					href = sb.toString();
 				}

util-taglib/src/com/liferay/taglib/aui/ScriptTag.java

@@ -8,10 +8,13 @@
 import com.liferay.petra.string.StringBundler;
 import com.liferay.petra.string.StringPool;
 import com.liferay.portal.kernel.content.security.policy.ContentSecurityPolicyNonceProviderUtil;
+import com.liferay.portal.kernel.exception.PortalException;
+import com.liferay.portal.kernel.frontend.hashed.files.HashedFilesRegistryUtil;
 import com.liferay.portal.kernel.model.Portlet;
 import com.liferay.portal.kernel.servlet.FileAvailabilityUtil;
 import com.liferay.portal.kernel.servlet.taglib.BodyContentWrapper;
 import com.liferay.portal.kernel.servlet.taglib.aui.ScriptData;
+import com.liferay.portal.kernel.util.PortalUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
 import com.liferay.taglib.aui.base.BaseScriptTag;
@@ -265,7 +268,34 @@ private int _endTag() throws IOException, JspException {
 		_write(jspWriter, "id", getId());
 		_write(jspWriter, "integrity", getIntegrity());
 		_write(jspWriter, "referrerpolicy", getReferrerPolicy());
-		_write(jspWriter, "src", getSrc());
+
+		String src = getSrc();
+
+		if (getHashedFile()) {
+			StringBundler sb = new StringBundler(3);
+
+			try {
+				sb.append(PortalUtil.getCDNHost(getRequest()));
+			}
+			catch (PortalException portalException) {
+				throw new RuntimeException(portalException);
+			}
+
+			sb.append(PortalUtil.getPathProxy());
+
+			String unhashedFileURI =
+				PortalUtil.getPathModule() + StringPool.SLASH + getSrc();
+
+			String hashedFileURI = HashedFilesRegistryUtil.getHashedFileURI(
+				unhashedFileURI);
+
+			sb.append(
+				(hashedFileURI == null) ? unhashedFileURI : hashedFileURI);
+
+			src = sb.toString();
+		}
+
+		_write(jspWriter, "src", src);
 		_write(jspWriter, "type", getType());
 
 		String senna = getSenna();

util-taglib/src/com/liferay/taglib/aui/base/BaseScriptTag.java

@@ -40,6 +40,14 @@ public java.lang.String getFetchPriority() {
 		return _fetchPriority;
 	}
 
+	public boolean getHashedFile() {
+		return _hashedFile;
+	}
+
+	public void setHashedFile(boolean hashedFile) {
+		_hashedFile = hashedFile;
+	}
+
 	public java.lang.String getId() {
 		return _id;
 	}
@@ -138,6 +146,7 @@ protected void cleanUp() {
 		_crossOrigin = null;
 		_defer = false;
 		_fetchPriority = null;
+		_hashedFile = false;
 		_id = null;
 		_integrity = null;
 		_referrerPolicy = null;
@@ -161,6 +170,7 @@ protected String getPage() {
 	private java.lang.String _crossOrigin = null;
 	private boolean _defer = false;
 	private java.lang.String _fetchPriority = null;
+	private boolean _hashedFile;
 	private java.lang.String _id = null;
 	private java.lang.String _integrity = null;
 	private java.lang.String _referrerPolicy = null;

util-taglib/src/com/liferay/taglib/aui/base/packageinfo

@@ -1 +1 @@
-version 18.1.0
+version 18.2.0

util-taglib/src/com/liferay/taglib/aui/packageinfo

@@ -1 +1 @@
-version 19.1.0
+version 19.2.0

util-taglib/src/com/liferay/taglib/liferay-aui.xml

@@ -1061,6 +1061,11 @@
 				<inputType>java.lang.String</inputType>
 				<outputType>java.lang.String</outputType>
 			</attribute>
+			<attribute>
+				<name>hashedFile</name>
+				<inputType>java.lang.Boolean</inputType>
+				<outputType>java.lang.Boolean</outputType>
+			</attribute>
 			<attribute>
 				<name>id</name>
 				<inputType>java.lang.String</inputType>