Add a /login default view

dmitrizagidulin · dmitrizagidulin · commit dea5733d7660 · 2017-06-30T15:54:10.000-04:00
diff --git a/default-views/auth/login.hbs b/default-views/auth/login.hbs
@@ -0,0 +1,42 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Login</title>
+  <link rel="stylesheet" href="/common/css/bootstrap.min.css">
+</head>
+<body>
+<div class="container">
+  <h4>Login</h4>
+</div>
+<div class="container">
+  <form method="post" action="/login">
+    <div class="form-group">
+      <div class="row">
+        <div class="col-md-12">
+          <label for="username">Username:</label>
+          <input type="text" class="form-control" name="username" id="username" placeholder="alice" />
+        </div>
+      </div>
+      <div class="row">
+        <div class="col-md-12">
+          <label for="password">Password:</label>
+          <input type="password" class="form-control" name="password" id="password" />
+        </div>
+      </div>
+      <input type="hidden" name="response_type" id="response_type" value="{{response_type}}" />
+      <input type="hidden" name="display" id="display" value="{{display}}" />
+      <input type="hidden" name="scope" id="scope" value="{{scope}}" />
+      <input type="hidden" name="client_id" id="client_id" value="{{client_id}}" />
+      <input type="hidden" name="redirect_uri" id="redirect_uri" value="{{redirect_uri}}" />
+      <input type="hidden" name="state" id="state" value="{{state}}" />
+      <input type="hidden" name="nonce" id="nonce" value="{{nonce}}" />
+    </div>
+    <button type="submit" class="btn btn-primary" id="login">Login</button>
+
+    <div>Don't have an account? <a href="/register?{{{authParams}}}">Register</a></div>
+  </form>
+</div>
+</body>
+</html>
diff --git a/lib/api/authn/webid-oidc.js b/lib/api/authn/webid-oidc.js
@@ -6,6 +6,7 @@
 const express = require('express')
 const debug = require('../../debug')
 const util = require('../../utils')
+const url = require('url')
 const error = require('../../http-error')
 const bodyParser = require('body-parser').urlencoded({ extended: false })
 
@@ -40,6 +41,10 @@ function middleware (oidc) {
   })
   router.post('/api/auth/select-provider', bodyParser, selectProvider)
 
+  router.get(['/login', '/signin'], (req, res) => {
+    let params = Object.assign({}, req.query, { authParams: url.parse(req.url).query })
+    res.render('auth/login', params)
+  })
   router.post(['/login', '/signin'], bodyParser, login)
 
   router.get('/goodbye', (req, res) => {
diff --git a/lib/create-app.js b/lib/create-app.js
@@ -206,9 +206,6 @@ function initAuthentication (argv, app) {
       let oidc = OidcManager.fromServerConfig(argv)
       app.locals.oidc = oidc
 
-      // This is where the OIDC-enabled signup/signin apps live
-      app.use('/', express.static(path.join(__dirname, '../static/oidc')))
-
       // Initialize the WebId-OIDC authentication routes/api, including:
       // user-facing Solid endpoints (/login, /logout, /api/auth/select-provider)
       // and OIDC-specific ones
