Merge branch 'feature/delete-pod' of https://github.com/solid/node-solid-server into feature/delete-pod

Author: megoth

lib/models/account-manager.js

@@ -430,7 +430,10 @@ class AccountManager {
    * @return {string} Generated token
    */
   generateDeleteToken (userAccount) {
-    return this.tokenService.generate('delete-account', { webId: userAccount.webId })
+    return this.tokenService.generate('delete-account', {
+      webId: userAccount.webId,
+      email: userAccount.email
+    })
   }
 
   /**

lib/requests/delete-account-confirm-request.js

@@ -133,12 +133,12 @@ class DeleteAccountConfirmRequest extends AuthRequest {
     let user = this.accountManager.userAccountFrom(tokenContents)
     let accountDir = this.accountManager.accountDirFor(user.username)
 
-    debug('Deleting account for user:', user.webId)
+    debug('Preparing removal of account for user:', user)
 
     return Promise.resolve().then(() => {
       this.userStore.deleteUser(user)
         .then(() => fs.remove(accountDir))
-        .then(() => debug('Removed user' + user.username))
+        .then(() => debug('Removed user ' + user.username))
     })
   }
 

lib/requests/delete-account-request.js

@@ -138,18 +138,6 @@ class DeleteAccountRequest extends AuthRequest {
     }
 
     return new DeleteAccountRequest(options)
-    // let options = AuthRequest.requestOptions(req, res)
-    //
-    // let locals = req.app.locals
-    // let accountManager = locals.accountManager
-    //
-    // let body = req.body || {}
-    //
-    // options.username = body.username
-    //
-    // if (options.username) {
-    //   options.userAccount = accountManager.userAccountFrom(body)
-    // }
   }
 }
 

package.json

@@ -38,7 +38,7 @@
   "homepage": "https://github.com/solid/node-solid-server",
   "bugs": "https://github.com/solid/node-solid-server/issues",
   "dependencies": {
-    "@solid/oidc-auth-manager": "^0.17.0",
+    "@solid/oidc-auth-manager": "^0.17.1",
     "body-parser": "^1.18.3",
     "busboy": "^0.2.12",
     "camelize": "^1.0.0",