adding router to the solid-server to support account recovery

nicola · nicola · commit 830fabd0dd9d · 2016-05-09T13:20:55.000-04:00
diff --git a/lib/account-recovery.js b/lib/account-recovery.js
@@ -34,15 +34,16 @@ function AccountRecovery (corsSettings, options = {}) {
     const ldp = req.app.locals.ldp
     const emailService = req.app.locals.email
 
-    if (!req.body.account) {
-      res.send(406)
-      return
-    }
+    // if (!req.body.account) {
+    //   res.status(406).send('You need to pass an account')
+    //   return
+    // }
 
     // Check if account exists
     ldp.graph(req.body.account, '/' + ldp.suffixAcl, function (err, graph) {
       if (err) {
-        res.send(err.status, 'Fail to find user')
+        // console.log("answer back:", err)
+        res.status(err.status || 500).send('Fail to find user')
         return
       }
 
@@ -58,7 +59,7 @@ function AccountRecovery (corsSettings, options = {}) {
         })
 
       if (!emailAddress) {
-        res.send(406, 'No emailAddress registered in your account')
+        res.status(406).send('No emailAddress registered in your account')
         return
       }
 
@@ -77,7 +78,7 @@ function AccountRecovery (corsSettings, options = {}) {
 
   router.get('/confirm', function (res, req, next) {
     if (!req.query.token) {
-      res.send(406, 'Token is required')
+      res.status(406).send('Token is required')
       return
     }
 
diff --git a/lib/create-app.js b/lib/create-app.js
@@ -11,6 +11,7 @@ var IdentityProvider = require('./identity-provider')
 var vhost = require('vhost')
 var path = require('path')
 var EmailService = require('./email-service')
+const AccountRecovery = require('./account-recovery')
 
 var corsSettings = cors({
   methods: [
@@ -83,6 +84,11 @@ function createApp (argv = {}) {
     proxy(app, ldp.proxy)
   }
 
+  if (ldp.webid) {
+    var accountRecovery = AccountRecovery(corsSettings, { redirect: '/' })
+    app.use('/recovery', accountRecovery)
+  }
+
   // Adding Multi-user support
   if (ldp.webid) {
     var idp = IdentityProvider({
diff --git a/lib/token-service.js b/lib/token-service.js
@@ -4,8 +4,6 @@ const moment = require('moment')
 const uid = require('uid-safe').sync
 const extend = require('extend')
 
-module.exports = TokenService
-
 class TokenService {
   constructor () {
     this.tokens = {}
@@ -32,3 +30,5 @@ class TokenService {
     delete this.tokens[token]
   }
 }
+
+module.exports = TokenService
diff --git a/static/account-recovery.html b/static/account-recovery.html
@@ -41,7 +41,7 @@
   <h2>Recover your account</h2>
   <input id="account" type="account" placeholder="Enter your account address">
   <br>
-  <button onclick='retrieveAccount()'>Create account</button>
+  <button onclick='retrieveAccount()'>Retrieve account</button>
 </div>
 
 <script type="text/javascript">

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@ const moment = require('moment')`
`4`	`4`	`const uid = require('uid-safe').sync`
`5`	`5`	`const extend = require('extend')`
`6`	`6`
`7`		`-module.exports = TokenService`
`8`		`-`
`9`	`7`	`class TokenService {`
`10`	`8`	`constructor () {`
`11`	`9`	`this.tokens = {}`
`@@ -32,3 +30,5 @@ class TokenService {`
`32`	`30`	`delete this.tokens[token]`
`33`	`31`	`}`
`34`	`32`	`}`
	`33`	`+`
	`34`	`+module.exports = TokenService`