Added client API enable flag property - smb.clientAPI.enabled.

Update version to 25.1

Author: FileSysOrg

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>org.filesys</groupId>
     <artifactId>fileserversng</artifactId>
-    <version>24.3</version>
+    <version>25.1</version>
 
     <name>fileServersNG - New file server subsystem using JFileServer - SDK 4</name>
     <description>Platform/Repo JAR Module (to be included in the alfresco.war)</description>

src/main/java/org/filesys/alfresco/repo/clientapi/AlfrescoClientApi.java

@@ -94,6 +94,9 @@ public class AlfrescoClientApi extends JSONClientAPI {
     // Filesystem device name, from the filesystem.name property value
     private String m_filesystemName;
 
+    // Client API enable
+    private boolean m_clientAPIEnabled;
+
     // Base URL for Share, in the format protocol://host:port/webapp
     private String m_shareBaseURL;
 
@@ -154,43 +157,47 @@ private void init() {
         if (m_filesysContext == null)
             throw new RuntimeException("fileserversNG Failed to find context for filesystem '" + m_filesystemName + "'");
 
-        // Check the scripts folder
-        if (m_scriptsDir != null) {
+        // Check if the client API is enabled
+        if ( m_clientAPIEnabled) {
 
-            Path scriptsPath = Path.of(m_scriptsDir);
+            // Check the scripts folder
+            if (m_scriptsDir != null) {
 
-            if (Files.exists(scriptsPath) && Files.isDirectory(scriptsPath)) {
+                Path scriptsPath = Path.of(m_scriptsDir);
 
-                // Check for a script actions configuration TOML file
-                File scriptsConfigFile = Paths.get(m_scriptsDir, CLIENT_API_SCRIPTS_CONFIGURATION).toFile();
+                if (Files.exists(scriptsPath) && Files.isDirectory(scriptsPath)) {
 
-                try {
-                    m_scriptedActions = parseScriptConfiguration(scriptsConfigFile);
+                    // Check for a script actions configuration TOML file
+                    File scriptsConfigFile = Paths.get(m_scriptsDir, CLIENT_API_SCRIPTS_CONFIGURATION).toFile();
 
-                    // DEBUG
-                    if (hasDebug())
-                        Debug.println(DBG + "Loaded " + m_scriptedActions.size() + " scripted actions from " + scriptsConfigFile.getAbsolutePath());
+                    try {
+                        m_scriptedActions = parseScriptConfiguration(scriptsConfigFile);
 
-                    // Save the scripts configuration file path and last modified date/time
-                    m_scriptsConfigFile = scriptsConfigFile;
-                    m_scriptsConfigModifiedAt = scriptsConfigFile.lastModified();
-                    m_configNextCheckAt = System.currentTimeMillis() + m_configCheckInterval;
+                        // DEBUG
+                        if (hasDebug())
+                            Debug.println(DBG + "Loaded " + m_scriptedActions.size() + " scripted actions from " + scriptsConfigFile.getAbsolutePath());
 
-                    // Update the action map with the scripted actions
-                    updateActionsMap( m_scriptedActions);
+                        // Save the scripts configuration file path and last modified date/time
+                        m_scriptsConfigFile = scriptsConfigFile;
+                        m_scriptsConfigModifiedAt = scriptsConfigFile.lastModified();
+                        m_configNextCheckAt = System.currentTimeMillis() + m_configCheckInterval;
 
-                } catch (FileNotFoundException ex) {
-                    throw new RuntimeException("fileserversNG Script configuration file " + CLIENT_API_SCRIPTS_CONFIGURATION + " not found", ex);
-                } catch (Exception ex) {
-                    throw new RuntimeException("fileserversNG Script configuration file " + CLIENT_API_SCRIPTS_CONFIGURATION + " error", ex);
-                }
-            } else
-                throw new RuntimeException("fileserversNG Client API scripts path is not valid - " + m_scriptsDir);
-        } else {
+                        // Update the action map with the scripted actions
+                        updateActionsMap(m_scriptedActions);
 
-            // DEBUG
-            if (hasDebug())
-                Debug.println(DBG + "No script actions specified");
+                    } catch (FileNotFoundException ex) {
+                        throw new RuntimeException("fileserversNG Script configuration file " + CLIENT_API_SCRIPTS_CONFIGURATION + " not found", ex);
+                    } catch (Exception ex) {
+                        throw new RuntimeException("fileserversNG Script configuration file " + CLIENT_API_SCRIPTS_CONFIGURATION + " error", ex);
+                    }
+                } else
+                    throw new RuntimeException("fileserversNG Client API scripts path is not valid - " + m_scriptsDir);
+            } else {
+
+                // DEBUG
+                if (hasDebug())
+                    Debug.println(DBG + "No script actions specified");
+            }
         }
 
         // Create the node script helper object
@@ -470,8 +477,13 @@ public void setScriptService(ScriptService scriptService) {
         m_scriptService = scriptService;
     }
 
+    public void setClientApiEnabled(boolean clientApiEnabled) { m_clientAPIEnabled = clientApiEnabled; }
+
     public void setScriptsDir(String scriptsDir) {
-        m_scriptsDir = scriptsDir;
+        if ( scriptsDir == null || scriptsDir.isEmpty())
+            m_scriptsDir = null;
+        else
+            m_scriptsDir = scriptsDir;
     }
 
     public void setMenuTitle( String title) {
@@ -972,5 +984,4 @@ public ClientAPIResponse processRunAction( RunActionRequest req, ClientAPINetwor
         // Return an unsupported error
         return new ErrorResponse("Unknown action - '" + req.getAction() + "'", true);
     }
-
 }

src/main/resources/alfresco/subsystems/fileserversng/default/file-servers-ng-context.xml

@@ -1271,6 +1271,9 @@
         <property name="contentContexts"><ref bean="filesystemContexts" /></property>
         <property name="scriptService"><ref bean="scriptService" /></property>
 
+        <property name="clientApiEnabled">
+            <value>${smb.clientAPI.enabled}</value>
+        </property>
         <property name="filesystemName">
             <value>${filesystem.name}</value>
         </property>

src/main/resources/alfresco/subsystems/fileserversng/default/file-servers-ng.properties

@@ -108,7 +108,7 @@ smb.statecache.expiryInterval=300000
 smb.statecache.checkInterval=60000
 
 # Client API
-smb.clientAPI.enabled=true
+smb.clientAPI.enabled=false
 smb.clientAPI.debug=false
 smb.clientAPI.shareBaseURL=
 smb.clientAPI.scriptsDir=