security to ESM

Author: SamAxe

lib/defaultargs.js

@@ -59,8 +59,8 @@ const exports = argv => {
     argv.database.type = 'wiki-storage-' + argv.database.type
   }
 
-  argv.security_type ||= './security.cjs'
-  if (argv.security_type === './security.cjs') {
+  argv.security_type ||= './security.js'
+  if (argv.security_type === './security.js') {
     console.log('\n\nINFORMATION: Using default security module.')
   } else {
     argv.security_type = 'wiki-security-' + argv.security_type

lib/security.cjs lib/security.jslib/security.cjs renamed to lib/security.js

@@ -13,11 +13,11 @@
 // allow the server to run read-only.
 
 // #### Requires ####
-const fs = require('node:fs')
+import fs from 'node:fs'
 
 // Export a function that generates security handler
 // when called with options object.
-module.exports = exports = (log, loga, argv) => {
+const exports = (log, loga, argv) => {
   const security = {}
 
   // #### Private utility methods. ####
@@ -92,3 +92,6 @@ module.exports = exports = (log, loga, argv) => {
 
   return security
 }
+
+export default exports
+export { exports }

lib/server.cjs

@@ -139,7 +139,7 @@ module.exports = exports = argv => {
   app.searchhandler = searchhandler = searchFactory.default(argv)
 
   // Require the security adapter and initialize it with options.
-  app.securityhandler = securityhandler = require(argv.security_type)(log, loga, argv)
+  app.securityhandler = securityhandler = require(argv.security_type).default(log, loga, argv)
 
   // If the site is owned, owner will contain the name of the owner
   let owner = ''