updates lib/api

Author: CI Fix

lib/api/accounts/user-accounts.mjs

@@ -1,12 +1,13 @@
 import express from 'express'
-import { urlencoded } from 'body-parser'
+import bodyParserPkg from 'body-parser'
+const { urlencoded } = bodyParserPkg
 const bodyParser = urlencoded({ extended: false })
 import debug from '../../debug.mjs'
 const debugAccounts = debug.accounts
 
 import restrictToTopDomain from '../../handlers/restrict-to-top-domain.mjs'
 
-import CreateAccountRequest from '../../requests/create-account-request.mjs'
+import { CreateAccountRequest } from '../../requests/create-account-request.mjs'
 import AddCertificateRequest from '../../requests/add-cert-request.mjs'
 import DeleteAccountRequest from '../../requests/delete-account-request.mjs'
 import DeleteAccountConfirmRequest from '../../requests/delete-account-confirm-request.mjs'

lib/api/authn/webid-oidc.mjs

@@ -4,9 +4,10 @@
 
 import express from 'express'
 import { routeResolvedFile } from '../../utils.mjs'
-import { urlencoded } from 'body-parser'
+import bodyParserPkg from 'body-parser'
+const { urlencoded } = bodyParserPkg
 const bodyParser = urlencoded({ extended: false })
-import OidcManager from '../../models/oidc-manager.mjs'
+import { fromServerConfig } from '../../models/oidc-manager.mjs'
 import { LoginRequest } from '../../requests/login-request.mjs'
 import { SharingRequest } from '../../requests/sharing-request.mjs'
 
@@ -15,9 +16,10 @@ import restrictToTopDomain from '../../handlers/restrict-to-top-domain.mjs'
 import PasswordResetEmailRequest from '../../requests/password-reset-email-request.mjs'
 import PasswordChangeRequest from '../../requests/password-change-request.mjs'
 
-import { createRequire } from 'module'
-const require = createRequire(import.meta.url)
-const { AuthCallbackRequest } = require('@solid/oidc-auth-manager').handlers
+import oidcOpExpress from 'oidc-op-express'
+
+import oidcAuthManager from '@solid/oidc-auth-manager'
+const { AuthCallbackRequest } = oidcAuthManager.handlers
 
 /**
  * Sets up OIDC authentication for the given app.
@@ -26,7 +28,7 @@ const { AuthCallbackRequest } = require('@solid/oidc-auth-manager').handlers
  * @param argv {Object} Config options hashmap
  */
 export function initialize (app, argv) {
-  const oidc = OidcManager.fromServerConfig(argv)
+  const oidc = fromServerConfig(argv)
   app.locals.oidc = oidc
   oidc.initialize()
 
@@ -120,7 +122,7 @@ export function middleware (oidc) {
   // router.post('/token', token.bind(provider))
   // router.get('/userinfo', userinfo.bind(provider))
   // router.get('/logout', logout.bind(provider))
-  const oidcProviderApi = require('oidc-op-express')(oidc.provider)
+  const oidcProviderApi = oidcOpExpress(oidc.provider)
   router.use('/', oidcProviderApi)
 
   return router

lib/api/authn/webid-tls.mjs

@@ -1,4 +1,4 @@
-import webid from '../../webid/tls.mjs'
+import * as webid from '../../webid/tls/index.mjs'
 import debug from '../../debug.mjs'
 const debugAuth = debug.authentication
 

lib/api/index.mjs

@@ -1,2 +1,7 @@
-export { default as authn } from './authn/index.mjs'
-export { default as accounts } from './accounts/user-accounts.mjs'
+import authn from './authn/index.mjs'
+import accounts from './accounts/user-accounts.mjs'
+
+export { authn as authn, accounts as accounts }
+
+// Provide a default export so callers can `import API from './lib/api/index.mjs'`
+export default { authn, accounts }