SAK-49456 Lessons upgrade pdf-js from 2.9.359 to 4.0.189 (#12096)

sakaiproject · Nov 28, 2023 · 90823d1 · 90823d1
1 parent ee18b39
commit 90823d1
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java b/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
@@ -2118,7 +2118,20 @@ else if(!lengthOk(height) && lengthOk(width) && ("px".equals(width.unit) || "".e
                             boolean isPDF = simplePageBean.isPDFType(i);
 
                             if (isPDF) {
-                                String pdfSRC = String.format("/library/webjars/pdf-js/2.9.359/web/viewer.html?file=%s", movieUrl);
+                                try {
+                                    // The PDF URL has to be encoded, some URLs can contain characters resulting in the PDF not loading properly.
+                                    // https://github.com/mozilla/pdf.js/wiki/Frequently-Asked-Questions#can-i-specify-a-different-pdf-in-the-default-viewer
+                                    movieUrl = URLEncoder.encode(movieUrl, "UTF-8")
+                                        .replaceAll("\\+", "%20")
+                                        .replaceAll("\\%21", "!")
+                                        .replaceAll("\\%27", "'")
+                                        .replaceAll("\\%28", "(")
+                                        .replaceAll("\\%29", ")")
+                                        .replaceAll("\\%7E", "~");
+                                } catch (Exception ex) {
+                                    log.warn("Error encoding the PDF url, the PDF might not load in the UI. {}", ex.getMessage());
+                                }
+                                String pdfSRC = String.format("/library/webjars/pdf-js/4.0.189/web/viewer.html?file=%s", movieUrl);
                                 item2 = UIOutput.make(tableRow, "pdfEmbed").decorate(new UIFreeAttributeDecorator("src", pdfSRC)).decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.mm_player").replace("{}", abbrevUrl(i.getURL()))));
                             } else if (useEmbed) {
                                 item2 = UIOutput.make(tableRow, "movieEmbed").decorate(new UIFreeAttributeDecorator("src", movieUrl)).decorate(new UIFreeAttributeDecorator("alt", messageLocator.getMessage("simplepage.mm_player").replace("{}", abbrevUrl(i.getURL()))));