standard issues

Author: bourgeoa

lib/api/authn/webid-oidc.mjs

@@ -30,7 +30,10 @@ const { AuthCallbackRequest } = oidcAuthManager.handlers
 export function initialize (app, argv) {
   const oidc = fromServerConfig(argv)
   app.locals.oidc = oidc
-  oidc.initialize()
+
+  // Initialize OIDC provider (async)
+  // Store the promise so the server can await it before listening
+  app.locals.initPromise = oidc.initialize()
 
   // Attach the OIDC API
   app.use('/', middleware(oidc))

lib/create-app.mjs

@@ -11,10 +11,10 @@ import aclCheck from '@solid/acl-check'
 import fs from 'fs'
 import { fileURLToPath } from 'url'
 
-import acceptEventsModule from 'express-accept-events'
-import negotiateEventsModule from 'express-negotiate-events'
-import eventIDModule from 'express-prep/event-id'
-import prepModule from 'express-prep'
+import acceptEvents from 'express-accept-events'
+import events from 'express-negotiate-events'
+import eventID from 'express-prep/event-id'
+import prep from 'express-prep'
 
 // Complex internal modules - keep as CommonJS for now except where ESM available
 import LDP from './ldp.mjs'
@@ -43,12 +43,6 @@ const __dirname = dirname(__filename)
 // Read package.json synchronously to avoid using require() for JSON
 const { version } = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json'), 'utf8'))
 
-// Extract default exports from ESM modules
-const acceptEvents = acceptEventsModule.default
-const events = negotiateEventsModule.default
-const eventID = eventIDModule.default
-const prep = prepModule.default
-
 const corsSettings = cors({
   methods: [
     'OPTIONS', 'HEAD', 'GET', 'PATCH', 'POST', 'PUT', 'DELETE'

lib/create-server.mjs

@@ -8,7 +8,6 @@ import debug from './debug.mjs'
 import createApp from './create-app.mjs'
 
 function createServer (argv, app) {
-  console.log('Creating server with options:', argv)
   argv = argv || {}
   app = app || express()
   const ldpApp = createApp(argv)
@@ -101,6 +100,24 @@ function createServer (argv, app) {
     ldpApp.locals.ldp.live = solidWs.publish.bind(solidWs)
   }
 
+  // Wrap server.listen() to ensure async initialization completes first
+  const originalListen = server.listen.bind(server)
+  server.listen = function (...args) {
+    if (ldpApp.locals.initPromise) {
+      const initPromise = ldpApp.locals.initPromise
+      delete ldpApp.locals.initPromise
+
+      // Wait for initialization, then start listening
+      initPromise
+        .then(() => originalListen(...args))
+        .catch(err => server.emit('error', err))
+    } else {
+      originalListen(...args)
+    }
+
+    return server
+  }
+
   return server
 }
 

test/integration/authentication-oidc-test.mjs

@@ -59,16 +59,16 @@ describe('Authentication API (OIDC)', () => {
   const bobRootPath = path.normalize(path.join(__dirname, '../resources/accounts-scenario/bob'))
   let alicePod
   let bobPod
-  
-  async function createPods() {
+
+  async function createPods () {
     alicePod = await ldnode.createServer(
       Object.assign({
         root: aliceRootPath,
         serverUri: aliceServerUri,
         dbPath: aliceDbPath
       }, serverConfig)
     )
-    
+
     bobPod = await ldnode.createServer(
       Object.assign({
         root: bobRootPath,
@@ -84,12 +84,12 @@ describe('Authentication API (OIDC)', () => {
         console.error(`Server on port ${port} error:`, err)
         reject(err)
       })
-      
+
       const server = pod.listen(port, () => {
         console.log(`Server started on port ${port}`)
         resolve()
       })
-      
+
       server.on('error', (err) => {
         console.error(`Server listen error on port ${port}:`, err)
         reject(err)
@@ -99,31 +99,31 @@ describe('Authentication API (OIDC)', () => {
 
   before(async function () {
     this.timeout(60000) // 60 second timeout for server startup with OIDC initialization
-    
+
     // Clean and recreate OIDC database directories to ensure fresh state
     const aliceOidcPath = path.join(aliceDbPath, 'oidc')
     const bobOidcPath = path.join(bobDbPath, 'oidc')
-    
+
     // Remove any existing OIDC data to prevent corruption
     console.log('Cleaning OIDC directories...')
     fs.removeSync(aliceOidcPath)
     fs.removeSync(bobOidcPath)
-    
+
     // Create fresh directory structure
     fs.ensureDirSync(path.join(aliceOidcPath, 'op/clients'))
     fs.ensureDirSync(path.join(aliceOidcPath, 'op/tokens'))
     fs.ensureDirSync(path.join(aliceOidcPath, 'op/codes'))
     fs.ensureDirSync(path.join(aliceOidcPath, 'users'))
     fs.ensureDirSync(path.join(aliceOidcPath, 'rp/clients'))
-    
+
     fs.ensureDirSync(path.join(bobOidcPath, 'op/clients'))
     fs.ensureDirSync(path.join(bobOidcPath, 'op/tokens'))
     fs.ensureDirSync(path.join(bobOidcPath, 'op/codes'))
     fs.ensureDirSync(path.join(bobOidcPath, 'users'))
     fs.ensureDirSync(path.join(bobOidcPath, 'rp/clients'))
-    
+
     await createPods()
-    
+
     await Promise.all([
       startServer(alicePod, 7000),
       startServer(bobPod, 7001)
@@ -584,7 +584,7 @@ describe('Authentication API (OIDC)', () => {
 
     before(function () {
       this.timeout(50000) // Long timeout for OIDC initialization
-      
+
       auth = new SolidAuthOIDC({ store: localStorage, window: { location: {} } })
       const appOptions = {
         redirectUri: 'https://app.example.com/callback'