Make views/ customizable like templates

dmitrizagidulin · dmitrizagidulin · commit 4bbf1310583c · 2017-06-30T15:54:10.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -11,7 +11,7 @@ inbox
 .acl
 config.json
 config/templates
-config/apps
+config/views
 settings
 .db/
 .nyc_output
diff --git a/default-views/auth/consent.hbs b/default-views/auth/consent.hbs
diff --git a/default-views/auth/select-provider.hbs b/default-views/auth/select-provider.hbs
@@ -0,0 +1,26 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Select Provider</title>
+  <link rel="stylesheet" href="/common/css/bootstrap.min.css">
+</head>
+<body>
+<div class="container">
+  <div>
+    <h2>Select Provider</h2>
+  </div>
+</div>
+<div class="container">
+  <form method="post" action="/api/auth/discover">
+    <div class="form-group">
+      <label for="webid">WebID or server URL:</label>
+      <input type="text" class="form-control" name="webid" id="webid" placeholder="databox.me" />
+      <input type="hidden" name="returnToUrl" id="returnToUrl" value="" />
+    </div>
+    <button type="submit" class="btn btn-primary" id="discover">Submit</button>
+  </form>
+</div>
+</body>
+</html>
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
@@ -36,7 +36,7 @@ function middleware (oidc) {
 
   // User-facing Authentication API
   router.get('/api/auth/discover', (req, res) => {
-    res.sendFile('discover-provider.html', { root: './static/oidc/' })
+    res.render('auth/select-provider')
   })
   router.post('/api/auth/discover', bodyParser, discoverProvider)
 
diff --git a/lib/create-app.js b/lib/create-app.js
@@ -50,6 +50,11 @@ function createApp (argv = {}) {
   // Serve the public 'common' directory (for shared CSS files, etc)
   app.use('/common', express.static('common'))
 
+  const viewsPath = initDefaultViews(configPath)
+  app.set('views', viewsPath)
+  app.engine('.hbs', handlebars({ extname: '.hbs' }))
+  app.set('view engine', '.hbs')
+
   initAppLocals(app, argv, ldp)
 
   initHeaders(app)
@@ -116,6 +121,15 @@ function initConfigPath (argv) {
   return configPath
 }
 
+function initDefaultViews (configPath) {
+  let defaultViewsPath = path.resolve('./default-views')
+  let viewsPath = path.join(configPath, 'views')
+
+  ensureDirCopy(defaultViewsPath, viewsPath)
+
+  return viewsPath
+}
+
 function initTemplateDirs (configPath) {
   let accountTemplatePath = ensureDirCopy(
     './default-templates/new-account',
@@ -194,7 +208,6 @@ function initAuthentication (argv, app) {
 
       // This is where the OIDC-enabled signup/signin apps live
       app.use('/', express.static(path.join(__dirname, '../static/oidc')))
-      initAuthTemplates(app)
 
       // Initialize the WebId-OIDC authentication routes/api, including:
       // user-facing Solid endpoints (/login, /logout, /api/auth/discover)
@@ -211,17 +224,6 @@ function initAuthentication (argv, app) {
   }
 }
 
-/**
- * Sets up Handlebars to be used for auth-related views.
- *
- * @param app {Function} Express.js app instance
- */
-function initAuthTemplates (app) {
-  app.set('views', path.join(__dirname, '../views'))
-  app.engine('.hbs', handlebars({ extname: '.hbs' }))
-  app.set('view engine', '.hbs')
-}
-
 /**
  * Sets up headers common to all Solid requests (CORS-related, Allow, etc).
  *
