Merge pull request 'Release/v5.1.0' from develop into master

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/onlyoffice-confluence/pulls/3

.github/workflows/artifact.yml

@@ -11,14 +11,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get Info 
         run: |
           echo "version=$(awk '/<version>/,/<\/version>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<version>\(.*\)</version>.*:\1:p')" >> $GITHUB_OUTPUT
           echo "artifact=$(awk '/<artifactId>/,/<\/artifactId>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<artifactId>\(.*\)</artifactId>.*:\1:p')" >> $GITHUB_OUTPUT
         id: info
       - name: Install Java 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -37,7 +37,7 @@ jobs:
           cd ./target
           mv ${{ steps.info.outputs.artifact }}-${{ steps.info.outputs.version }}.jar $cwd
       - name: Upload Artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ steps.info.outputs.artifact }}-${{ steps.info.outputs.version }}
           path: ${{ steps.info.outputs.artifact }}-${{ steps.info.outputs.version }}.jar

.github/workflows/lint.yml

@@ -2,18 +2,19 @@ name: Lint
 
 on:
   workflow_dispatch:
+  push:
+    branches: [master, develop]
   pull_request:
-    types: [opened, reopened]
-    branches: [master]
+    branches: [master, develop]
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Java 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

.github/workflows/release.yml

@@ -9,14 +9,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Get Info
         run: | 
           echo "version=$(awk '/<version>/,/<\/version>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<version>\(.*\)</version>.*:\1:p')" >> $GITHUB_OUTPUT
           echo "artifact=$(awk '/<artifactId>/,/<\/artifactId>/' pom.xml | head -n 1 | sed 's/^[[:space:]]*//g' | sed -n 's:.*<artifactId>\(.*\)</artifactId>.*:\1:p')" >> $GITHUB_OUTPUT
         id: info
       - name: Install Java 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 5.1.0
+## Added
+- compatible with Confluence 8.9.7
+- creating pdf form
+- button go to edit in editor
+- pdf favicon
 
 ## 5.0.2
 ## Changed

pom.xml

@@ -7,7 +7,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>onlyoffice</groupId>
     <artifactId>onlyoffice-confluence-plugin</artifactId>
-    <version>5.0.2</version>
+    <version>5.1.0</version>
 
     <organization>
         <name>Ascensio System SIA</name>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.onlyoffice</groupId>
             <artifactId>docs-integration-sdk</artifactId>
-            <version>1.1.2</version>
+            <version>1.2.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.14.0</version>
             <scope>provided</scope>
         </dependency>
 

src/main/java/onlyoffice/OnlyOfficeConvertServlet.java

@@ -30,6 +30,7 @@
 import com.onlyoffice.model.common.Format;
 import com.onlyoffice.model.convertservice.ConvertRequest;
 import com.onlyoffice.model.convertservice.ConvertResponse;
+import com.onlyoffice.model.convertservice.convertrequest.PDF;
 import com.onlyoffice.service.convert.ConvertService;
 import onlyoffice.managers.auth.AuthContext;
 import onlyoffice.sdk.manager.document.DocumentManager;
@@ -84,6 +85,7 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
         }
         String pageIdString = request.getParameter("pageId");
         String newTitle = request.getParameter("newTitle");
+        Boolean createForm = Boolean.valueOf(request.getParameter("createForm"));
 
         String attachmentIdString = request.getParameter("attachmentId");
         Long attachmentId = Long.parseLong(attachmentIdString);
@@ -106,8 +108,8 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
         if (docx != null
                 && extension.equals(docx.getName())
                 && docx.getConvert() != null
-                && docx.getConvert().contains("docxf")) {
-            newFileExtension = "docxf";
+                && docx.getConvert().contains("pdf")) {
+            newFileExtension = "pdf";
         }
 
         String title = fileName.substring(0, fileName.lastIndexOf("."));
@@ -127,6 +129,7 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
         contextMap.put("attachmentId", attachmentIdString);
         contextMap.put("oldName", fileName);
         contextMap.put("newName", newName);
+        contextMap.put("createForm", createForm);
         writer.write(getTemplate(contextMap));
     }
 
@@ -142,11 +145,11 @@ public void doPost(final HttpServletRequest request, final HttpServletResponse r
         }
 
         String attachmentIdString = request.getParameter("attachmentId");
+        Boolean createForm = Boolean.valueOf(request.getParameter("createForm"));
+
         ConfluenceUser user = null;
-        String errorMessage = null;
         JSONObject json = null;
 
-
         Long attachmentId = Long.parseLong(attachmentIdString);
         log.info("attachmentId " + attachmentId);
 
@@ -183,8 +186,8 @@ public void doPost(final HttpServletRequest request, final HttpServletResponse r
         if (docx != null
                 && extension.equals(docx.getName())
                 && docx.getConvert() != null
-                && docx.getConvert().contains("docxf")) {
-            convertToExt = "docxf";
+                && docx.getConvert().contains("pdf")) {
+            convertToExt = "pdf";
         }
 
         if (!attachmentUtil.checkAccess(attachmentId, user, false)
@@ -210,6 +213,10 @@ public void doPost(final HttpServletRequest request, final HttpServletResponse r
                     .region(region)
                     .build();
 
+            if (convertToExt.equals("pdf") && createForm) {
+                convertRequest.setPdf(new PDF(true));
+            }
+
             ConvertResponse convertResponse = convertService.processConvert(convertRequest,
                     String.valueOf(attachmentId));
 

src/main/java/onlyoffice/OnlyOfficeEditorServlet.java

@@ -25,7 +25,11 @@
 import com.atlassian.confluence.user.ConfluenceUser;
 import com.atlassian.confluence.util.velocity.VelocityUtils;
 import com.atlassian.sal.api.message.I18nResolver;
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.onlyoffice.manager.settings.SettingsManager;
 import com.onlyoffice.model.documenteditor.Config;
 import com.onlyoffice.model.documenteditor.config.document.DocumentType;
@@ -34,6 +38,7 @@
 import onlyoffice.managers.auth.AuthContext;
 import com.atlassian.confluence.pages.Attachment;
 import onlyoffice.sdk.manager.document.DocumentManager;
+import onlyoffice.sdk.manager.security.JwtManager;
 import onlyoffice.sdk.manager.url.UrlManager;
 import onlyoffice.utils.attachment.AttachmentUtil;
 import org.apache.log4j.LogManager;
@@ -64,20 +69,22 @@ public class OnlyOfficeEditorServlet extends HttpServlet {
     private final AttachmentUtil attachmentUtil;
     private final ConfigService configService;
     private final SettingsManager settingsManager;
+    private final JwtManager jwtManager;
 
     private final LocaleManager localeManager;
 
     public OnlyOfficeEditorServlet(final I18nResolver i18n, final UrlManager urlManager, final AuthContext authContext,
                                    final DocumentManager documentManager, final AttachmentUtil attachmentUtil,
                                    final ConfigService configService, final SettingsManager settingsManager,
-                                   final LocaleManager localeManager) {
+                                   final JwtManager jwtManager, final LocaleManager localeManager) {
         this.i18n = i18n;
         this.urlManager = urlManager;
         this.authContext = authContext;
         this.documentManager = documentManager;
         this.attachmentUtil = attachmentUtil;
         this.configService = configService;
         this.settingsManager = settingsManager;
+        this.jwtManager = jwtManager;
         this.localeManager = localeManager;
     }
 
@@ -107,7 +114,7 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
                 String extension = fileExt == null
                         || !fileExt.equals("xlsx")
                         && !fileExt.equals("pptx")
-                        && !fileExt.equals("docxf")
+                        && !fileExt.equals("pdf")
                         ? "docx" : fileExt.trim();
 
                 String name = fileName == null || fileName.equals("")
@@ -178,10 +185,21 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
                         request.getHeader("USER-AGENT")
                 );
 
+                if (modeString != null
+                        && modeString.equals("fillForms")
+                        && config.getDocument().getPermissions().getFillForms()
+                ) {
+                    config.getDocument().getPermissions().setEdit(false);
+                }
+
                 config.getEditorConfig().setLang(localeManager.getLocale(user).toLanguageTag());
                 config.getEditorConfig().setActionLink(actionData);
 
-                ObjectMapper mapper = new ObjectMapper();
+                if (settingsManager.isSecurityEnabled()) {
+                    config.setToken(jwtManager.createToken(config));
+                }
+
+                ObjectMapper mapper = createObjectMapper();
 
                 context.put("request", request);
                 context.put("configAsHtml", mapper.writeValueAsString(config));
@@ -210,4 +228,19 @@ public void doGet(final HttpServletRequest request, final HttpServletResponse re
             throw new ServletException(e.getMessage(), e);
         }
     }
+
+    private ObjectMapper createObjectMapper() {
+        ObjectMapper objectMapper = new ObjectMapper();
+        SimpleModule module = new SimpleModule();
+        module.addSerializer(JSONObject.class, new JsonSerializer<JSONObject>() {
+            @Override
+            public void serialize(final JSONObject jsonObject, final JsonGenerator jsonGenerator,
+                                  final SerializerProvider serializerProvider) throws IOException {
+                jsonGenerator.writeObject(jsonObject.toMap());
+            }
+        });
+        objectMapper.registerModule(module);
+
+        return objectMapper;
+    }
 }

src/main/java/onlyoffice/conditions/IsOfficeFileAttachment.java

@@ -30,7 +30,6 @@
 
 public class IsOfficeFileAttachment implements Condition {
     private boolean forEdit;
-    private boolean form;
     private DocumentManager documentManager;
     private AttachmentUtil attachmentUtil;
 
@@ -41,13 +40,9 @@ public IsOfficeFileAttachment(final DocumentManager documentManager, final Attac
 
     public void init(final Map<String, String> params) throws PluginParseException {
         forEdit = false;
-        form = false;
         if (params != null && !params.isEmpty() && params.get("forEdit") != null) {
             forEdit = !params.get("forEdit").isEmpty();
         }
-        if (params != null && !params.isEmpty() && params.get("form") != null) {
-            form = !params.get("form").isEmpty();
-        }
     }
 
     public boolean shouldDisplay(final Map<String, Object> context) {
@@ -65,19 +60,12 @@ public boolean shouldDisplay(final Map<String, Object> context) {
         String fileName = attachment.getFileName();
 
         if (forEdit) {
-            if (form) {
-                if (accessEdit && documentManager.isFillable(fileName)) {
-                    return true;
-                }
-            } else {
-                if (accessEdit && documentManager.isEditable(fileName)) {
-                    return true;
-                }
+            if (accessEdit && documentManager.isEditable(fileName)) {
+                return true;
             }
         } else {
             if (accessView
-                    && documentManager.isViewable(fileName)
-                    && !(accessEdit && documentManager.isEditable(fileName))
+                    && documentManager.isViewable(fileName) && !(accessEdit && documentManager.isEditable(fileName))
             ) {
                 return true;
             }

src/main/java/onlyoffice/conditions/IsOfficeFileConvertAttachment.java

@@ -64,7 +64,7 @@ public boolean shouldDisplay(final Map<String, Object> context) {
             return false;
         }
 
-        if ((form && !ext.equals("docxf")) || (!form && ext.equals("docxf"))) {
+        if (form && !ext.equals("docxf")) {
             return false;
         }
 

src/main/java/onlyoffice/conditions/confluence/previews/plugin/OnlyofficeButton.java

@@ -68,10 +68,10 @@ public void doPost(final HttpServletRequest request, final HttpServletResponse r
             String fileName = attachment.getFileName();
             String access = null;
 
-            if (accessEdit && documentManager.isEditable(fileName)) {
+            if (accessEdit && documentManager.isFillable(fileName)) {
+                access = "fillForms";
+            } else if (accessEdit && documentManager.isEditable(fileName)) {
                 access = "edit";
-            } else if (accessEdit && documentManager.isFillable(fileName)) {
-                access = "fillform";
             } else if (accessView && documentManager.isViewable(fileName)
                     && !(accessEdit
                     && (documentManager.isEditable(fileName) || documentManager.isFillable(fileName)))) {

src/main/java/onlyoffice/macro/OnlyOfficePreviewMacro.java

@@ -125,10 +125,10 @@ public String execute(final Map<String, String> args, final String s, final Conv
 
             if (attachmentUtil.checkAccess(attachment.getId(),  user, true)
                     && !isPreview) {
-                if (documentManager.isEditable(fileName)) {
-                    action = "edit";
-                } else if (documentManager.isFillable(fileName)) {
+                if (documentManager.isFillable(fileName)) {
                     action = "fill";
+                } else if (documentManager.isEditable(fileName)) {
+                    action = "edit";
                 }
             }
 
@@ -183,9 +183,6 @@ public ImagePlaceholder getImagePlaceholder(final Map<String, String> args,
                 String fileExt = name.substring(dotIdx + 1).toLowerCase();
                 if (documentManager.getDocumentType(name) != null) {
                     documentType = documentManager.getDocumentType(name).name().toLowerCase();
-                    if (fileExt.equals("oform")) {
-                        documentType = "form";
-                    }
                 }
             }
         }

src/main/java/onlyoffice/sdk/manager/url/UrlManagerImpl.java

@@ -118,11 +118,6 @@ public String getCreateUrl(final String fileId) {
         if (attachmentUtil.checkAccessCreate(user, pageId)) {
             String fileName = documentManager.getDocumentName(fileId);
             String extension = documentManager.getExtension(fileName);
-            DocumentType documentType = documentManager.getDocumentType(fileName);
-
-            if (!extension.equals("docxf")) {
-                extension = documentManager.getDefaultExtension(documentType);
-            }
 
             return getConfluenceBaseUrl(false) + DOC_EDITOR_SERVLET + "?pageId=" + pageId + "&fileExt=" + extension;
         } else {

src/main/resources/atlassian-plugin-marketing.xml

@@ -1,6 +1,6 @@
 <atlassian-plugin-marketing>
     <compatibility>
-        <product name="confluence" min="7.12.0" max="8.9.1" />
+        <product name="confluence" min="7.12.0" max="8.9.7" />
     </compatibility>
 
     <logo image="images/144.png"/>