Copying over whole directory

Unsure about the affects on testing, so checking in now just in case

Author: megoth

lib/models/account-template.js

@@ -1,12 +1,10 @@
 'use strict'
 
-import { processHandlebarFile } from '../utils'
-
 const fs = require('fs-extra')
 const path = require('path')
 const mime = require('mime-types')
 const recursiveRead = require('recursive-readdir')
-const Handlebars = require('handlebars')
+const utils = require('../utils')
 
 const RDF_MIME_TYPES = require('../ldp').RDF_MIME_TYPES
 const TEMPLATE_EXTENSIONS = [ '.acl', '.meta', '.json', '.hbs', '.handlebars' ]
@@ -132,7 +130,7 @@ class AccountTemplate {
    */
   processAccount (accountPath) {
     return this.readTemplateFiles(accountPath)
-      .then(files => Promise.all(files.map(path => processHandlebarFile(path, this.substitutions))))
+      .then(files => Promise.all(files.map(path => utils.processHandlebarFile(path, this.substitutions))))
   }
 
   /**

lib/server-config.js

@@ -1,12 +1,12 @@
 'use strict'
-import { processHandlebarFile } from './utils'
 
 /**
  * Server config initialization utilities
  */
 
 const fs = require('fs-extra')
 const path = require('path')
+const utils = require('./utils')
 
 /**
  * Ensures that a directory has been copied / initialized. Used to ensure that
@@ -39,28 +39,23 @@ function ensureDirCopyExists (fromDir, toDir) {
  * @param argv {Function} Express.js app object
  */
 async function ensureWelcomePage (argv) {
-  let { multiuser, templates } = argv
-  let rootDir = path.resolve(argv.root)
-  let serverRootDir
-
-  if (multiuser) {
-    serverRootDir = path.join(rootDir, argv.host.hostname)
-  } else {
-    serverRootDir = rootDir
-  }
+  const { multiuser, templates } = argv
+  const rootDir = path.resolve(argv.root)
+  const serverRootDir = multiuser ? path.join(rootDir, argv.host.hostname) : rootDir
 
-  let defaultIndexPage = path.join(templates.server, 'index.html')
-  let existingIndexPage = path.join(serverRootDir, 'index.html')
-  let defaultIndexPageAcl = path.join(templates.server, 'index.html.acl')
-  let existingIndexPageAcl = path.join(serverRootDir, 'index.html.acl')
+  // let defaultIndexPage = path.join(templates.server, 'index.html')
+  const existingIndexPage = path.join(serverRootDir, 'index.html')
+  // let defaultIndexPageAcl = path.join(templates.server, 'index.html.acl')
+  // let existingIndexPageAcl = path.join(serverRootDir, 'index.html.acl')
 
   if (!fs.existsSync(existingIndexPage)) {
     fs.mkdirp(serverRootDir)
-    fs.copySync(defaultIndexPage, existingIndexPage)
-    await processHandlebarFile(existingIndexPage, {
+    await utils.copyTemplateDir(templates.server, serverRootDir)
+    await utils.processHandlebarFile(existingIndexPage, {
+      serverName: 'Tittentei'
       // Need to load config from somewhere
     })
-    fs.copySync(defaultIndexPageAcl, existingIndexPageAcl)
+    // fs.copySync(defaultIndexPageAcl, existingIndexPageAcl)
   }
 }
 

lib/utils.js

@@ -5,7 +5,6 @@ module.exports.pathBasename = pathBasename
 module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
 module.exports.parse = parse
-module.exports.processHandlebarFile = processHandlebarFile
 module.exports.serialize = serialize
 module.exports.translate = translate
 module.exports.stringToStream = stringToStream
@@ -14,8 +13,10 @@ module.exports.debrack = debrack
 module.exports.stripLineEndings = stripLineEndings
 module.exports.fullUrlForReq = fullUrlForReq
 module.exports.routeResolvedFile = routeResolvedFile
+module.exports.processHandlebarFile = processHandlebarFile
+module.exports.copyTemplateDir = copyTemplateDir
 
-const fs = require('fs')
+const fs = require('fs-extra')
 const path = require('path')
 const $rdf = require('rdflib')
 const from = require('from2')
@@ -198,9 +199,19 @@ function processHandlebarTemplate (source, substitutions) {
   }
 }
 
+async function copyTemplateDir (templatePath, targetPath) {
+  return new Promise((resolve, reject) => {
+    fs.copy(templatePath, targetPath, (error) => {
+      if (error) { return reject(error) }
+
+      resolve()
+    })
+  })
+}
+
 function serialize (graph, baseUri, contentType, callback) {
   try {
-                // target, kb, base, contentType, callback
+    // target, kb, base, contentType, callback
     $rdf.serialize(null, graph, baseUri, contentType, function (err, result) {
       if (err) {
         console.log(err)
@@ -222,9 +233,9 @@ function serialize (graph, baseUri, contentType, callback) {
 function translate (stream, baseUri, from, to, callback) {
   // Handle Turtle Accept header
   if (to === 'text/turtle' ||
-      to === 'text/n3' ||
-      to === 'application/turtle' ||
-      to === 'application/n3') {
+    to === 'text/n3' ||
+    to === 'application/turtle' ||
+    to === 'application/n3') {
     to = 'text/turtle'
   }
 

test/integration/account-creation-oidc-test.js

@@ -37,8 +37,8 @@ describe('AccountManager (OIDC account creation tests)', function () {
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
     fs.removeSync(path.join(dbPath, 'oidc/users/users'))
-    fs.removeSync(path.join(rootPath, 'localhost/index.html'))
-    fs.removeSync(path.join(rootPath, 'localhost/index.html.acl'))
+    fs.removeSync(path.join(rootPath, 'localhost'))
+    fs.removeSync(path.join(rootPath, 'localhost'))
   })
 
   var server = supertest(serverUri)

test/integration/acl-oidc-test.js

@@ -86,8 +86,7 @@ describe('ACL with WebID+OIDC over HTTP', function () {
 
   after(() => {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(path.join(rootPath, 'index.html'))
-    fs.removeSync(path.join(rootPath, 'index.html.acl'))
+    fs.removeSync(path.join(rootPath))
   })
 
   const origin1 = 'http://example.org/'

test/integration/acl-tls-test.js

@@ -69,8 +69,7 @@ describe('ACL with WebID+TLS', function () {
 
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(path.join(rootPath, 'index.html'))
-    fs.removeSync(path.join(rootPath, 'index.html.acl'))
+    fs.removeSync(path.join(rootPath))
   })
 
   function createOptions (path, user) {

test/integration/auth-proxy-test.js

@@ -3,7 +3,7 @@ const path = require('path')
 const nock = require('nock')
 const request = require('supertest')
 const { expect } = require('chai')
-const rm = require('../utils').rm
+const rmDir = require('../utils').rmDir
 
 const USER = 'https://ruben.verborgh.org/profile/#me'
 
@@ -32,8 +32,7 @@ describe('Auth Proxy', () => {
       // Release back-end server
       nock.cleanAll()
       // Remove created index files
-      rm('index.html')
-      rm('index.html.acl')
+      rmDir()
     })
 
     describe('responding to /server/a', () => {

test/integration/authentication-oidc-test.js

@@ -81,10 +81,8 @@ describe('Authentication API (OIDC)', () => {
     alicePod.close()
     bobPod.close()
     fs.removeSync(path.join(aliceDbPath, 'oidc/users'))
-    fs.removeSync(path.join(aliceRootPath, 'index.html'))
-    fs.removeSync(path.join(aliceRootPath, 'index.html.acl'))
-    fs.removeSync(path.join(bobRootPath, 'index.html'))
-    fs.removeSync(path.join(bobRootPath, 'index.html.acl'))
+    fs.removeSync(path.join(aliceRootPath))
+    fs.removeSync(path.join(bobRootPath))
   })
 
   describe('Login page (GET /login)', () => {

test/integration/capability-discovery-test.js

@@ -48,8 +48,7 @@ describe('API', () => {
 
   after(() => {
     alicePod.close()
-    fs.removeSync(path.join(aliceRootPath, 'index.html'))
-    fs.removeSync(path.join(aliceRootPath, 'index.html.acl'))
+    fs.removeSync(path.join(aliceRootPath))
   })
 
   describe('Capability Discovery', () => {

test/integration/errors-oidc-test.js

@@ -30,8 +30,7 @@ describe('OIDC error handling', function () {
 
   after(function () {
     if (ldpHttpsServer) ldpHttpsServer.close()
-    fs.removeSync(path.join(rootPath, 'index.html'))
-    fs.removeSync(path.join(rootPath, 'index.html.acl'))
+    fs.removeSync(path.join(rootPath))
   })
 
   const server = supertest(serverUri)