Refactor createApp()

Author: dmitrizagidulin

lib/create-app.js

@@ -43,26 +43,19 @@ function createApp (argv = {}) {
   argv.templates = config.initTemplateDirs(configPath)
 
   const ldp = new LDP(argv)
+
   const app = express()
 
   initAppLocals(app, argv, ldp)
   initHeaders(app)
+  initViews(app, configPath)
 
   // Serve the public 'common' directory (for shared CSS files, etc)
   app.use('/common', express.static('common'))
 
-  const viewsPath = config.initDefaultViews(configPath)
-  app.set('views', viewsPath)
-  app.engine('.hbs', handlebars({ extname: '.hbs' }))
-  app.set('view engine', '.hbs')
-
-  // Use session cookies
-  const useSecureCookies = argv.webid  // argv.webid forces https and secure cookies
-  app.use(session(sessionSettings(useSecureCookies, argv.host)))
-
   // Adding proxy
   if (argv.proxy) {
-    proxy(app, ldp.proxy)
+    proxy(app, argv.proxy)
   }
 
   // Options handler
@@ -73,36 +66,7 @@ function createApp (argv = {}) {
   }
 
   if (argv.webid) {
-    config.ensureWelcomePage(argv)
-
-    var accountRecovery = AccountRecovery({ redirect: '/' })
-    // adds GET /api/accounts/recover
-    // adds POST /api/accounts/recover
-    // adds GET /api/accounts/validateToken
-    app.use('/api/accounts/', accountRecovery)
-
-    let accountManager = AccountManager.from({
-      authMethod: argv.auth,
-      emailService: app.locals.emailService,
-      host: argv.host,
-      accountTemplatePath: argv.templates.account,
-      store: ldp,
-      multiUser: argv.idp
-    })
-    app.locals.accountManager = accountManager
-
-    // Account Management API (create account, new cert)
-    app.use('/', API.accounts.middleware(accountManager))
-
-    // Set up authentication-related API endpoints and app.locals
-    initAuthentication(argv, app)
-
-    // Messaging API
-    app.post('/api/messages', bodyParser, API.messages.send())
-  }
-
-  if (argv.idp) {
-    app.use(vhost('*', LdpMiddleware(corsSettings)))
+    initWebId(argv, app, ldp)
   }
 
   app.use('/', LdpMiddleware(corsSettings))
@@ -132,6 +96,83 @@ function initAppLocals (app, argv, ldp) {
   }
 }
 
+/**
+ * Sets up headers common to all Solid requests (CORS-related, Allow, etc).
+ *
+ * @param app {Function} Express.js app instance
+ */
+function initHeaders (app) {
+  app.use(corsSettings)
+
+  app.use((req, res, next) => {
+    // Set X-Powered-By
+    res.set('X-Powered-By', 'solid-server')
+    // Set default Allow methods
+    res.set('Allow', 'OPTIONS, HEAD, GET, PATCH, POST, PUT, DELETE')
+    next()
+  })
+
+  app.use('/', capabilityDiscovery())
+}
+
+/**
+ * Sets up the express rendering engine and views directory.
+ *
+ * @param app {Function} Express.js app
+ * @param configPath {string}
+ */
+function initViews (app, configPath) {
+  const viewsPath = config.initDefaultViews(configPath)
+
+  app.set('views', viewsPath)
+  app.engine('.hbs', handlebars({ extname: '.hbs' }))
+  app.set('view engine', '.hbs')
+}
+
+/**
+ * Sets up WebID-related functionality (account creation and authentication)
+ *
+ * @param argv {Object}
+ * @param app {Function}
+ * @param ldp {LDP}
+ */
+function initWebId (argv, app, ldp) {
+  config.ensureWelcomePage(argv)
+
+  // Use session cookies
+  const useSecureCookies = argv.webid  // argv.webid forces https and secure cookies
+  app.use(session(sessionSettings(useSecureCookies, argv.host)))
+
+  var accountRecovery = AccountRecovery({ redirect: '/' })
+  // adds GET /api/accounts/recover
+  // adds POST /api/accounts/recover
+  // adds GET /api/accounts/validateToken
+  app.use('/api/accounts/', accountRecovery)
+
+  let accountManager = AccountManager.from({
+    authMethod: argv.auth,
+    emailService: app.locals.emailService,
+    host: argv.host,
+    accountTemplatePath: argv.templates.account,
+    store: ldp,
+    multiUser: argv.idp
+  })
+  app.locals.accountManager = accountManager
+
+  // Account Management API (create account, new cert)
+  app.use('/', API.accounts.middleware(accountManager))
+
+  // Set up authentication-related API endpoints and app.locals
+  initAuthentication(argv, app)
+
+  if (argv.idp) {
+    app.use(vhost('*', LdpMiddleware(corsSettings)))
+  }
+
+  // Messaging API
+  app.post('/api/messages', bodyParser, API.messages.send())
+}
+
 /**
  * Sets up authentication-related routes and handlers for the app.
  *
@@ -165,25 +206,6 @@ function initAuthentication (argv, app) {
   }
 }
 
-/**
- * Sets up headers common to all Solid requests (CORS-related, Allow, etc).
- *
- * @param app {Function} Express.js app instance
- */
-function initHeaders (app) {
-  app.use(corsSettings)
-
-  app.use((req, res, next) => {
-    // Set X-Powered-By
-    res.set('X-Powered-By', 'solid-server')
-    // Set default Allow methods
-    res.set('Allow', 'OPTIONS, HEAD, GET, PATCH, POST, PUT, DELETE')
-    next()
-  })
-
-  app.use('/', capabilityDiscovery())
-}
-
 /**
  * Returns a settings object for Express.js sessions.
  *

test/integration/capability-discovery.js

@@ -76,7 +76,8 @@ describe('API', () => {
           apps: {
             'signin': '/signin/',
             'signup': '/signup/'
-          }
+          },
+          webid: false
         }
         const solid = Solid(config)
         let server = supertest(solid)

test/integration/params.js

@@ -23,7 +23,7 @@ describe('LDNODE params', function () {
   describe('suffixAcl', function () {
     describe('not passed', function () {
       it('should fallback on .acl', function () {
-        var ldp = ldnode()
+        var ldp = ldnode({ webid: false })
         assert.equal(ldp.locals.ldp.suffixAcl, '.acl')
       })
     })