Pre-populate provider on select-provider view

Author: dmitrizagidulin

default-views/auth/select-provider.hbs

@@ -16,7 +16,8 @@
   <form method="post" action="/api/auth/select-provider">
     <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="text" class="form-control" name="webid" id="webid"
+             value="{{serverUri}}" />
       <input type="hidden" name="returnToUrl" id="returnToUrl" value="" />
     </div>
     <button type="submit" class="btn btn-primary" id="discover">Submit</button>

lib/api/authn/webid-oidc.js

@@ -38,7 +38,9 @@ function middleware (oidc) {
 
   // User-facing Authentication API
   router.get('/api/auth/select-provider', (req, res) => {
-    res.render('auth/select-provider')
+    let locals = req.app.locals
+    let serverUri = locals.host.serverUri
+    res.render('auth/select-provider', { serverUri })
   })
   router.post('/api/auth/select-provider', bodyParser, selectProvider)
 

lib/handlers/error-pages.js

@@ -9,6 +9,15 @@ function handler (err, req, res, next) {
 
   var ldp = req.app.locals.ldp
 
+  if (err.status === 401 &&
+      req.accepts('text/html') &&
+      ldp.auth === 'oidc') {
+    debug('401 error - redirect to Select Provider')
+    res.status(err.status)
+    redirectToLogin(req, res, next)
+    return
+  }
+
   // If the user specifies this function
   // then, they can customize the error programmatically
   if (ldp.errorHandler) {
@@ -18,14 +27,6 @@ function handler (err, req, res, next) {
   // If noErrorPages is set,
   // then use built-in express default error handler
   if (ldp.noErrorPages) {
-    if (err.status === 401 &&
-        req.accepts('text/html') &&
-        ldp.auth === 'oidc') {
-      debug('On error pages redirect on 401')
-      res.status(err.status)
-      redirectToLogin(req, res, next)
-      return
-    }
     res
       .status(err.status)
       .send(err.message + '\n' || '')
@@ -57,7 +58,8 @@ function redirectBody (url) {
   <meta http-equiv="refresh" content="0; url=${url}">
 </noscript>
 <title>Redirecting...</title>
-If you are not redirected automatically, follow the <a href='${url}'>link to login</a>
+If you are not redirected automatically, 
+follow the <a href='${url}'>link to login</a>
 `
 }
 
@@ -66,9 +68,9 @@ function redirectToLogin (req, res) {
   var currentUrl = util.fullUrlForReq(req)
   req.session.returnToUrl = currentUrl
   let locals = req.app.locals
-  let loginUrl = locals.host.serverUri + '/api/auth/select-provider?returnToUrl=' +
-      currentUrl
-  debug('Redirecting to login: ' + loginUrl)
+  let loginUrl = locals.host.serverUri +
+    '/api/auth/select-provider?returnToUrl=' + currentUrl
+  debug('Redirecting to Select Provider: ' + loginUrl)
 
   var body = redirectBody(loginUrl)
   res.send(body)

lib/requests/login-request.js

@@ -268,6 +268,8 @@ class LoginByPasswordRequest {
   initUserSession (validUser) {
     let session = this.session
 
+    debug('Initializing user session with webId: ', validUser.webId)
+
     session.userId = validUser.webId
     session.identified = true
     session.subject = {

package.json

@@ -58,7 +58,7 @@
     "node-forge": "^0.6.38",
     "nodemailer": "^3.1.4",
     "nomnom": "^1.8.1",
-    "oidc-auth-manager": "^0.2.1",
+    "oidc-auth-manager": "^0.2.3",
     "oidc-op-express": "^0.0.3",
     "rdflib": "^0.15.0",
     "recursive-readdir": "^2.1.0",