From fd43a24a36bc0009465f6560d647fcfb049e6f98 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 20 Nov 2018 18:06:43 +0100
Subject: [PATCH 01/12] Some simple bootstrapping

---
 common/js/auth-buttons.js                |  8 ++++++++
 lib/api/accounts/user-accounts.js        |  3 +++
 lib/requests/get-account-info-request.js | 25 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+)
 create mode 100644 lib/requests/get-account-info-request.js

diff --git a/common/js/auth-buttons.js b/common/js/auth-buttons.js
index 49c28840e..8df0c51c2 100644
--- a/common/js/auth-buttons.js
+++ b/common/js/auth-buttons.js
@@ -1,4 +1,5 @@
 /* Provide functionality for authentication buttons */
+/* global URL, location, alert, solid */
 
 (({ auth }) => {
   // Wire up DOM elements
@@ -8,6 +9,7 @@
   loginButton.addEventListener('click', login)
   logoutButton.addEventListener('click', logout)
   registerButton.addEventListener('click', register)
+  document.addEventListener('DOMContentLoaded', getAccountInfo)
 
   // Track authentication status and update UI
   auth.trackSession(session => {
@@ -46,4 +48,10 @@
     registration.searchParams.set('returnToUrl', location)
     location.href = registration
   }
+
+  async function getAccountInfo () {
+    const account = new URL('/account', location)
+    const response = await auth.fetch(account)
+    console.log('test3', response)
+  }
 })(solid)
diff --git a/lib/api/accounts/user-accounts.js b/lib/api/accounts/user-accounts.js
index cc5daafd0..e2ed163bd 100644
--- a/lib/api/accounts/user-accounts.js
+++ b/lib/api/accounts/user-accounts.js
@@ -8,6 +8,7 @@ const CreateAccountRequest = require('../../requests/create-account-request')
 const AddCertificateRequest = require('../../requests/add-cert-request')
 const DeleteAccountRequest = require('../../requests/delete-account-request')
 const DeleteAccountConfirmRequest = require('../../requests/delete-account-confirm-request')
+const GetAccountInfoRequest = require('../../requests/get-account-info-request')
 
 /**
  * Returns an Express middleware handler for checking if a particular account
@@ -70,6 +71,8 @@ function middleware (accountManager) {
 
   router.post('/api/accounts/cert', bodyParser, newCertificate(accountManager))
 
+  router.get('/account', GetAccountInfoRequest.get)
+
   router.get('/account/delete', DeleteAccountRequest.get)
   router.post('/account/delete', bodyParser, DeleteAccountRequest.post)
 
diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
new file mode 100644
index 000000000..6a66af2e6
--- /dev/null
+++ b/lib/requests/get-account-info-request.js
@@ -0,0 +1,25 @@
+'use strict'
+
+const AuthRequest = require('./auth-request')
+// const debug = require('./../debug').accounts
+
+// class DeleteAccountRequest  {
+class GetAccountInfoRequest extends AuthRequest {
+  static get (req, res) {
+    const request = GetAccountInfoRequest.fromParams(req, res)
+
+    console.log('GET account info', request)
+  }
+
+  static fromParams (req, res) {
+    let locals = req.app.locals
+    let accountManager = locals.accountManager
+
+    return new GetAccountInfoRequest({
+      accountManager,
+      response: res
+    })
+  }
+}
+
+module.exports = GetAccountInfoRequest

From 671031e2dfd8ef0fd7d37ed2294bfc31b9bde2db Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 20 Nov 2018 19:54:17 +0100
Subject: [PATCH 02/12] A simple API for returning info about account

No authentication and caching yet
---
 lib/common/uri-utils.js                  |  5 ++++
 lib/requests/get-account-info-request.js | 38 +++++++++++++++---------
 lib/utils.js                             |  5 ++--
 3 files changed, 32 insertions(+), 16 deletions(-)
 create mode 100644 lib/common/uri-utils.js

diff --git a/lib/common/uri-utils.js b/lib/common/uri-utils.js
new file mode 100644
index 000000000..3a448f72c
--- /dev/null
+++ b/lib/common/uri-utils.js
@@ -0,0 +1,5 @@
+module.exports.getFullUriFromRequest = getFullUriFromRequest
+
+function getFullUriFromRequest (req) {
+  return req.protocol + '://' + req.get('host') + req.originalUrl
+}
diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
index 6a66af2e6..28f1e2b89 100644
--- a/lib/requests/get-account-info-request.js
+++ b/lib/requests/get-account-info-request.js
@@ -1,25 +1,35 @@
 'use strict'
 
 const AuthRequest = require('./auth-request')
-// const debug = require('./../debug').accounts
+const { actualSize } = require('../utils')
+const { getFullUriFromRequest } = require('../common/uri-utils')
+const $rdf = require('rdflib')
 
-// class DeleteAccountRequest  {
-class GetAccountInfoRequest extends AuthRequest {
-  static get (req, res) {
-    const request = GetAccountInfoRequest.fromParams(req, res)
+const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 
-    console.log('GET account info', request)
+class GetAccountInfoRequest extends AuthRequest {
+  static async get (req, res) {
+    const contentType = 'application/ld+json'
+    const body = getBody(req, contentType)
+    res
+      .status(200)
+      .set('Content-Type', contentType)
+      .send(body)
   }
+}
 
-  static fromParams (req, res) {
-    let locals = req.app.locals
-    let accountManager = locals.accountManager
-
-    return new GetAccountInfoRequest({
-      accountManager,
-      response: res
+async function getBody (req, contentType) {
+  const root = req.app.locals.ldp.getRoot(req.hostname)
+  const size = await actualSize(root)
+  const store = $rdf.graph()
+  const baseUri = getFullUriFromRequest(req)
+  store.add($rdf.sym(baseUri), SOLID('storageUsage'), $rdf.lit(size))
+  return await new Promise((resolve, reject) => {
+    $rdf.serialize(null, store, baseUri, contentType, (err, result) => {
+      if (err) return reject(err)
+      resolve(result)
     })
-  }
+  })
 }
 
 module.exports = GetAccountInfoRequest
diff --git a/lib/utils.js b/lib/utils.js
index 21e5f6870..a02911e7f 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -11,6 +11,7 @@ module.exports.getQuota = getQuota
 module.exports.overQuota = overQuota
 module.exports.getContentType = getContentType
 module.exports.parse = parse
+module.exports.actualSize = actualSize
 
 const fs = require('fs')
 const path = require('path')
@@ -233,11 +234,11 @@ async function overQuota (root, serverUri) {
  * so it needs to be rewritten.
  */
 
-function actualSize (root) {
+async function actualSize (root) {
   return util.promisify(getSize)(root)
 }
 
-function _asyncReadfile (filename) {
+async function _asyncReadfile (filename) {
   return util.promisify(fs.readFile)(filename, 'utf-8')
 }
 

From 91aa445cbf0fd0223783d42c2891960d23c62492 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Fri, 18 Jan 2019 17:55:08 +0100
Subject: [PATCH 03/12] Added logic to ensure unauthenticated don't get access

---
 lib/acl-checker.js                       | 45 ++++++++++++++++++++++
 lib/handlers/allow.js                    | 48 +-----------------------
 lib/ldp.js                               |  8 ++++
 lib/requests/get-account-info-request.js | 25 +++++++++---
 4 files changed, 73 insertions(+), 53 deletions(-)

diff --git a/lib/acl-checker.js b/lib/acl-checker.js
index ece53a64d..ba22895b8 100644
--- a/lib/acl-checker.js
+++ b/lib/acl-checker.js
@@ -5,6 +5,8 @@ const debug = require('./debug').ACL
 const HTTPError = require('./http-error')
 const aclCheck = require('@solid/acl-check')
 const { URL } = require('url')
+const { promisify } = require('util')
+const fs = require('fs')
 
 const DEFAULT_ACL_SUFFIX = '.acl'
 const ACL = rdf.Namespace('http://www.w3.org/ns/auth/acl#')
@@ -144,6 +146,49 @@ class ACLChecker {
   isAcl (resource) {
     return resource.endsWith(this.suffix)
   }
+
+  static createFromLDPAndRequest (resource, ldp, req) {
+    const trustedOrigins = ldp.getTrustedOrigins(req)
+    return new ACLChecker(resource, {
+      agentOrigin: req.get('origin'),
+      // host: req.get('host'),
+      fetch: fetchFromLdp(ldp.resourceMapper),
+      fetchGraph: (uri, options) => {
+        // first try loading from local fs
+        return ldp.getGraph(uri, options.contentType)
+          // failing that, fetch remote graph
+          .catch(() => ldp.fetchGraph(uri, options))
+      },
+      suffix: ldp.suffixAcl,
+      strictOrigin: ldp.strictOrigin,
+      trustedOrigins
+    })
+  }
+}
+
+/**
+ * Returns a fetch document handler used by the ACLChecker to fetch .acl
+ * resources up the inheritance chain.
+ * The `fetch(uri, callback)` results in the callback, with either:
+ *   - `callback(err, graph)` if any error is encountered, or
+ *   - `callback(null, graph)` with the parsed RDF graph of the fetched resource
+ * @return {Function} Returns a `fetch(uri, callback)` handler
+ */
+function fetchFromLdp (mapper) {
+  return async function fetch (url, graph = rdf.graph()) {
+    // Convert the URL into a filename
+    let path, contentType
+    try {
+      ({ path, contentType } = await mapper.mapUrlToFile({ url }))
+    } catch (err) {
+      throw new HTTPError(404, err)
+    }
+    // Read the file from disk
+    const body = await promisify(fs.readFile)(path, {'encoding': 'utf8'})
+    // Parse the file as Turtle
+    rdf.parse(body, graph, url, contentType)
+    return graph
+  }
 }
 
 // Returns the index of the last slash before the given position
diff --git a/lib/handlers/allow.js b/lib/handlers/allow.js
index 756f48554..80bbd4811 100644
--- a/lib/handlers/allow.js
+++ b/lib/handlers/allow.js
@@ -1,12 +1,8 @@
 module.exports = allow
 
-const $rdf = require('rdflib')
 const path = require('path')
 const ACL = require('../acl-checker')
 const debug = require('../debug.js').ACL
-const fs = require('fs')
-const { promisify } = require('util')
-const HTTPError = require('../http-error')
 
 function allow (mode, checkPermissionsForDirectory) {
   return async function allowHandler (req, res, next) {
@@ -43,25 +39,8 @@ function allow (mode, checkPermissionsForDirectory) {
       resourcePath += '/'
     }
 
-    let trustedOrigins = [ldp.resourceMapper.resolveUrl(req.hostname)].concat(ldp.trustedOrigins)
-    if (ldp.multiuser) {
-      trustedOrigins.push(ldp.serverUri)
-    }
     // Obtain and store the ACL of the requested resource
-    req.acl = new ACL(rootUrl + resourcePath, {
-      agentOrigin: req.get('origin'),
-      // host: req.get('host'),
-      fetch: fetchFromLdp(ldp.resourceMapper),
-      fetchGraph: (uri, options) => {
-        // first try loading from local fs
-        return ldp.getGraph(uri, options.contentType)
-        // failing that, fetch remote graph
-          .catch(() => ldp.fetchGraph(uri, options))
-      },
-      suffix: ldp.suffixAcl,
-      strictOrigin: ldp.strictOrigin,
-      trustedOrigins: trustedOrigins
-    })
+    req.acl = ACL.createFromLDPAndRequest(rootUrl + resourcePath, ldp, req)
 
     // Ensure the user has the required permission
     const userId = req.session.userId
@@ -74,28 +53,3 @@ function allow (mode, checkPermissionsForDirectory) {
     next(error)
   }
 }
-
-/**
- * Returns a fetch document handler used by the ACLChecker to fetch .acl
- * resources up the inheritance chain.
- * The `fetch(uri, callback)` results in the callback, with either:
- *   - `callback(err, graph)` if any error is encountered, or
- *   - `callback(null, graph)` with the parsed RDF graph of the fetched resource
- * @return {Function} Returns a `fetch(uri, callback)` handler
- */
-function fetchFromLdp (mapper) {
-  return async function fetch (url, graph = $rdf.graph()) {
-    // Convert the URL into a filename
-    let path, contentType
-    try {
-      ({ path, contentType } = await mapper.mapUrlToFile({ url }))
-    } catch (err) {
-      throw new HTTPError(404, err)
-    }
-    // Read the file from disk
-    const body = await promisify(fs.readFile)(path, {'encoding': 'utf8'})
-    // Parse the file as Turtle
-    $rdf.parse(body, graph, url, contentType)
-    return graph
-  }
-}
diff --git a/lib/ldp.js b/lib/ldp.js
index bcc7a5ee3..006bc2cc2 100644
--- a/lib/ldp.js
+++ b/lib/ldp.js
@@ -463,6 +463,14 @@ class LDP {
     return ensureNotExists(this, path.join(containerURI, filename))
   }
 
+  getTrustedOrigins (req) {
+    let trustedOrigins = [this.resourceMapper.resolveUrl(req.hostname)].concat(this.trustedOrigins)
+    if (this.multiuser) {
+      trustedOrigins.push(this.serverUri)
+    }
+    return trustedOrigins
+  }
+
   static mimeTypeIsRdf (mimeType) {
     return RDF_MIME_TYPES.has(mimeType)
   }
diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
index 28f1e2b89..1e5a82dff 100644
--- a/lib/requests/get-account-info-request.js
+++ b/lib/requests/get-account-info-request.js
@@ -1,25 +1,38 @@
 'use strict'
 
+const ACLChecker = require('../acl-checker')
 const AuthRequest = require('./auth-request')
 const { actualSize } = require('../utils')
 const { getFullUriFromRequest } = require('../common/uri-utils')
 const $rdf = require('rdflib')
+const HTTPError = require('../http-error')
 
 const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 
 class GetAccountInfoRequest extends AuthRequest {
   static async get (req, res) {
     const contentType = 'application/ld+json'
-    const body = getBody(req, contentType)
-    res
-      .status(200)
-      .set('Content-Type', contentType)
-      .send(body)
+    const body = await getBody(req, contentType)
+    if (body.status && body.status >= 400) {
+      return res.status(body.status).send(body.message)
+    }
+    return res.status(200).set('Content-Type', contentType).send(body)
   }
 }
 
 async function getBody (req, contentType) {
-  const root = req.app.locals.ldp.getRoot(req.hostname)
+  const ldp = req.app.locals.ldp
+  const rootUrl = `${ldp.resourceMapper.resolveUrl(req.hostname)}/`
+  const userId = req.session.userId
+  if (!userId) {
+    return new HTTPError(401, 'Requires authentication')
+  }
+  const acl = ACLChecker.createFromLDPAndRequest(rootUrl, ldp, req)
+  const isAllowed = await acl.can(userId, 'Control')
+  if (!isAllowed) {
+    return await req.acl.getError(userId, 'Control')
+  }
+  const root = ldp.resourceMapper._getFullPath(rootUrl)
   const size = await actualSize(root)
   const store = $rdf.graph()
   const baseUri = getFullUriFromRequest(req)

From 0f0fa9e1b322da257bec49c5a0f6041e4d55a094 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Mon, 21 Jan 2019 13:42:33 +0100
Subject: [PATCH 04/12] Getting data about quota in storage

---
 lib/common/uri-utils.js                  |  5 ----
 lib/requests/get-account-info-request.js | 29 +++++++++++++++++++-----
 2 files changed, 23 insertions(+), 11 deletions(-)
 delete mode 100644 lib/common/uri-utils.js

diff --git a/lib/common/uri-utils.js b/lib/common/uri-utils.js
deleted file mode 100644
index 3a448f72c..000000000
--- a/lib/common/uri-utils.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports.getFullUriFromRequest = getFullUriFromRequest
-
-function getFullUriFromRequest (req) {
-  return req.protocol + '://' + req.get('host') + req.originalUrl
-}
diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
index 1e5a82dff..d817e12a4 100644
--- a/lib/requests/get-account-info-request.js
+++ b/lib/requests/get-account-info-request.js
@@ -3,15 +3,15 @@
 const ACLChecker = require('../acl-checker')
 const AuthRequest = require('./auth-request')
 const { actualSize } = require('../utils')
-const { getFullUriFromRequest } = require('../common/uri-utils')
 const $rdf = require('rdflib')
 const HTTPError = require('../http-error')
 
+const PIM = $rdf.Namespace('http://www.w3.org/ns/pim/space#')
 const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 
 class GetAccountInfoRequest extends AuthRequest {
   static async get (req, res) {
-    const contentType = 'application/ld+json'
+    const contentType = req.get('content-type') || 'text/turtle'
     const body = await getBody(req, contentType)
     if (body.status && body.status >= 400) {
       return res.status(body.status).send(body.message)
@@ -32,13 +32,30 @@ async function getBody (req, contentType) {
   if (!isAllowed) {
     return await req.acl.getError(userId, 'Control')
   }
-  const root = ldp.resourceMapper._getFullPath(rootUrl)
+
+  // Get total available size of user's POD
+  const userIdGraph = await ldp.getGraph(userId)
+  const storageUrlNode = userIdGraph.any($rdf.sym(userId), PIM('storage'), null)
+  if (!storageUrlNode) {
+    return new HTTPError(404, 'Unable to find pim:storage for webId')
+  }
+  const serverSideUrl = `${storageUrlNode.value}settings/serverSide.ttl` // needs to be hardcoded for now
+  const serverSideGraph = await ldp.getGraph(serverSideUrl)
+  const quotaNode = serverSideGraph.any(storageUrlNode, SOLID('storageQuota'), null)
+  if (!quotaNode) {
+    return new HTTPError(404, 'Unable to find solid:storageQuota')
+  }
+
+  // Get size of user's POD
+  const root = ldp.resourceMapper.getFullPath(rootUrl)
   const size = await actualSize(root)
+
+  // Add triples to graph
   const store = $rdf.graph()
-  const baseUri = getFullUriFromRequest(req)
-  store.add($rdf.sym(baseUri), SOLID('storageUsage'), $rdf.lit(size))
+  store.add(storageUrlNode, SOLID('storageUsage'), $rdf.lit(size))
+  store.add(storageUrlNode, SOLID('storageQuota'), quotaNode.value)
   return await new Promise((resolve, reject) => {
-    $rdf.serialize(null, store, baseUri, contentType, (err, result) => {
+    $rdf.serialize(null, store, storageUrlNode.value, contentType, (err, result) => {
       if (err) return reject(err)
       resolve(result)
     })

From 43531251abb83a8ad0c63b8936d861ddc4dd45af Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 22 Jan 2019 14:09:54 +0100
Subject: [PATCH 05/12] A few changes to show quota and used storage on
 frontpage

---
 common/js/auth-buttons.js                | 36 ++++++++++++++++++++----
 default-templates/new-account/index.html | 14 +++++++++
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/common/js/auth-buttons.js b/common/js/auth-buttons.js
index 8df0c51c2..137d086e8 100644
--- a/common/js/auth-buttons.js
+++ b/common/js/auth-buttons.js
@@ -1,7 +1,7 @@
 /* Provide functionality for authentication buttons */
 /* global URL, location, alert, solid */
 
-(({ auth }) => {
+(({ auth }, $rdf) => {
   // Wire up DOM elements
   const [loginButton, logoutButton, registerButton, accountSettings] =
     ['login', 'logout', 'register', 'account-settings'].map(id =>
@@ -9,7 +9,9 @@
   loginButton.addEventListener('click', login)
   logoutButton.addEventListener('click', logout)
   registerButton.addEventListener('click', register)
-  document.addEventListener('DOMContentLoaded', getAccountInfo)
+  if ($rdf) {
+    document.addEventListener('DOMContentLoaded', getAccountInfo)
+  }
 
   // Track authentication status and update UI
   auth.trackSession(session => {
@@ -50,8 +52,30 @@
   }
 
   async function getAccountInfo () {
-    const account = new URL('/account', location)
-    const response = await auth.fetch(account)
-    console.log('test3', response)
+    const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
+
+    // load data
+    const accountUrl = new URL('/account', location).href
+    const accountStore = $rdf.graph()
+    const accountFetcher = new $rdf.Fetcher(accountStore)
+    await accountFetcher.load(accountUrl)
+
+    // get DOM and data-dependencies
+    const quotaNode = accountStore.any($rdf.sym(accountUrl), SOLID('storageQuota'))
+    const usageNode = accountStore.any($rdf.sym(accountUrl), SOLID('storageUsage'))
+    const storagePanel = document.getElementById('StoragePanel')
+    const storageQuota = document.getElementById('StorageQuota')
+    const storageUsage = document.getElementById('StorageUsage')
+    if (!quotaNode || !usageNode || !storagePanel || !storageQuota || !storageUsage) {
+      // If anything of this is not available, we do not need to do anything more
+      return
+    }
+
+    // do stuff
+    storagePanel.classList.remove('hidden')
+    const quotaValue = quotaNode.value
+    storageQuota.innerText = quotaValue
+    const usageValue = usageNode.value
+    storageUsage.innerText = usageValue
   }
-})(solid)
+})(solid, window.$rdf)
diff --git a/default-templates/new-account/index.html b/default-templates/new-account/index.html
index 7fe96bfa7..5c401dc61 100644
--- a/default-templates/new-account/index.html
+++ b/default-templates/new-account/index.html
@@ -69,6 +69,20 @@ <h1>Account settings</h1>
       </a>
     </div>
   </section>
+
+  <section class="hidden" id="StoragePanel">
+    <h1>Storage</h1>
+    <ul class="list-group">
+      <li class="list-group-item">
+        <span class="lead">Storage used:</span>
+        <span id="StorageUsage">0</span>
+      </li>
+      <li class="list-group-item">
+        <span class="lead">Storage available:</span>
+        <span id="StorageQuota">0</span>
+      </li>
+    </ul>
+  </section>
 </div>
 
 <script src="/common/js/solid-auth-client.bundle.js"></script>

From 803de27a720ec746c6eb083a1a74ae9ca35e1a35 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 22 Jan 2019 14:14:19 +0100
Subject: [PATCH 06/12] Implemented function that prints bytes in nice format

---
 common/js/auth-buttons.js | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/common/js/auth-buttons.js b/common/js/auth-buttons.js
index 137d086e8..33868a45e 100644
--- a/common/js/auth-buttons.js
+++ b/common/js/auth-buttons.js
@@ -74,8 +74,26 @@
     // do stuff
     storagePanel.classList.remove('hidden')
     const quotaValue = quotaNode.value
-    storageQuota.innerText = quotaValue
+    storageQuota.innerText = formatBytes(quotaValue)
     const usageValue = usageNode.value
-    storageUsage.innerText = usageValue
+    storageUsage.innerText = formatBytes(usageValue)
+  }
+
+  function formatBytes (number, units = [
+    'B',
+    'kB',
+    'MB',
+    'GB',
+    'TB',
+    'PB',
+    'EB',
+    'ZB',
+    'YB'
+  ]) {
+    const unit = units.shift()
+    if (number > 1000 && units.length > 0) {
+      return formatBytes(number / 1000, units)
+    }
+    return `${Math.round(number * 100) / 100} ${unit}`
   }
 })(solid, window.$rdf)

From 8ebda5d87f314b281e58936e086f1bc33bd20ee2 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 22 Jan 2019 14:24:52 +0100
Subject: [PATCH 07/12] Added progress bar to the mix

---
 common/js/auth-buttons.js                | 7 ++++++-
 default-templates/new-account/index.html | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/common/js/auth-buttons.js b/common/js/auth-buttons.js
index 33868a45e..5db39a36d 100644
--- a/common/js/auth-buttons.js
+++ b/common/js/auth-buttons.js
@@ -66,7 +66,8 @@
     const storagePanel = document.getElementById('StoragePanel')
     const storageQuota = document.getElementById('StorageQuota')
     const storageUsage = document.getElementById('StorageUsage')
-    if (!quotaNode || !usageNode || !storagePanel || !storageQuota || !storageUsage) {
+    const storageUsedBar = document.getElementById('StorageUsedBar')
+    if (!quotaNode || !usageNode || !storagePanel || !storageQuota || !storageUsage || !storageUsedBar) {
       // If anything of this is not available, we do not need to do anything more
       return
     }
@@ -77,6 +78,10 @@
     storageQuota.innerText = formatBytes(quotaValue)
     const usageValue = usageNode.value
     storageUsage.innerText = formatBytes(usageValue)
+    const usagePercent = Math.floor(usageValue / quotaValue * 1000) / 10
+    storageUsedBar.innerText = `${usagePercent}%`
+    storageUsedBar.setAttribute('aria-valuenow', usagePercent)
+    storageUsedBar.style.width = `${usagePercent}%`
   }
 
   function formatBytes (number, units = [
diff --git a/default-templates/new-account/index.html b/default-templates/new-account/index.html
index 5c401dc61..b1da6afef 100644
--- a/default-templates/new-account/index.html
+++ b/default-templates/new-account/index.html
@@ -72,6 +72,11 @@ <h1>Account settings</h1>
 
   <section class="hidden" id="StoragePanel">
     <h1>Storage</h1>
+    <div class="progress">
+      <div id="StorageUsedBar" class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="100" style="width: 0%; min-width: 3em;">
+        0%
+      </div>
+    </div>
     <ul class="list-group">
       <li class="list-group-item">
         <span class="lead">Storage used:</span>

From 8720f9bbc586bfc801a52a1e7409b8578779d32b Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 22 Jan 2019 15:00:10 +0100
Subject: [PATCH 08/12] A simple setup for caching

---
 lib/requests/get-account-info-request.js |  44 +++++++--
 package-lock.json                        | 115 ++++++++++++++++-------
 package.json                             |   3 +-
 3 files changed, 120 insertions(+), 42 deletions(-)

diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
index d817e12a4..818902518 100644
--- a/lib/requests/get-account-info-request.js
+++ b/lib/requests/get-account-info-request.js
@@ -5,10 +5,29 @@ const AuthRequest = require('./auth-request')
 const { actualSize } = require('../utils')
 const $rdf = require('rdflib')
 const HTTPError = require('../http-error')
+const LRU = require('lru-cache')
 
 const PIM = $rdf.Namespace('http://www.w3.org/ns/pim/space#')
 const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 
+const cache = new LRU({
+  max: 10000, // is this a reasonable amount to hold?
+  length: (n, key) => {
+    const keyType = typeof key
+    let length = 1
+    switch (keyType) {
+      case 'object':
+        length = Object.keys(key).length
+        break
+      case 'string':
+        length = key.length
+        break
+    }
+    return n * 2 + length
+  },
+  maxAge: 1000 * 60 * 60 // hold the value for one hour
+})
+
 class GetAccountInfoRequest extends AuthRequest {
   static async get (req, res) {
     const contentType = req.get('content-type') || 'text/turtle'
@@ -21,12 +40,17 @@ class GetAccountInfoRequest extends AuthRequest {
 }
 
 async function getBody (req, contentType) {
-  const ldp = req.app.locals.ldp
-  const rootUrl = `${ldp.resourceMapper.resolveUrl(req.hostname)}/`
   const userId = req.session.userId
+  const cacheKey = `${userId}-${contentType}`
   if (!userId) {
     return new HTTPError(401, 'Requires authentication')
   }
+  const cachedValue = cache.get(cacheKey)
+  if (cachedValue) {
+    return cachedValue
+  }
+  const ldp = req.app.locals.ldp
+  const rootUrl = `${ldp.resourceMapper.resolveUrl(req.hostname)}/`
   const acl = ACLChecker.createFromLDPAndRequest(rootUrl, ldp, req)
   const isAllowed = await acl.can(userId, 'Control')
   if (!isAllowed) {
@@ -37,13 +61,17 @@ async function getBody (req, contentType) {
   const userIdGraph = await ldp.getGraph(userId)
   const storageUrlNode = userIdGraph.any($rdf.sym(userId), PIM('storage'), null)
   if (!storageUrlNode) {
-    return new HTTPError(404, 'Unable to find pim:storage for webId')
+    const storageNotFoundError = new HTTPError(404, 'Unable to find pim:storage for webId')
+    cache.set(cacheKey, storageNotFoundError)
+    return storageNotFoundError
   }
   const serverSideUrl = `${storageUrlNode.value}settings/serverSide.ttl` // needs to be hardcoded for now
   const serverSideGraph = await ldp.getGraph(serverSideUrl)
   const quotaNode = serverSideGraph.any(storageUrlNode, SOLID('storageQuota'), null)
   if (!quotaNode) {
-    return new HTTPError(404, 'Unable to find solid:storageQuota')
+    const quotaNotFoundError = new HTTPError(404, 'Unable to find solid:storageQuota')
+    cache.set(quotaNotFoundError)
+    return quotaNotFoundError
   }
 
   // Get size of user's POD
@@ -53,10 +81,14 @@ async function getBody (req, contentType) {
   // Add triples to graph
   const store = $rdf.graph()
   store.add(storageUrlNode, SOLID('storageUsage'), $rdf.lit(size))
-  store.add(storageUrlNode, SOLID('storageQuota'), quotaNode.value)
+  store.add(storageUrlNode, SOLID('storageQuota'), quotaNode)
   return await new Promise((resolve, reject) => {
     $rdf.serialize(null, store, storageUrlNode.value, contentType, (err, result) => {
-      if (err) return reject(err)
+      if (err) {
+        cache.set(cacheKey, err)
+        return reject(err)
+      }
+      cache.set(cacheKey, result)
       resolve(result)
     })
   })
diff --git a/package-lock.json b/package-lock.json
index c59356d20..54ec0be13 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1604,7 +1604,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -1628,7 +1628,7 @@
     },
     "browserify-aes": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
       "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
       "requires": {
         "buffer-xor": "^1.0.3",
@@ -2052,7 +2052,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -2194,7 +2194,7 @@
     },
     "create-hash": {
       "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+      "resolved": "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
       "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
       "requires": {
         "cipher-base": "^1.0.1",
@@ -2206,7 +2206,7 @@
     },
     "create-hmac": {
       "version": "1.1.7",
-      "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+      "resolved": "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
       "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
       "requires": {
         "cipher-base": "^1.0.3",
@@ -2472,7 +2472,7 @@
       "dependencies": {
         "minimist": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
           "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
         }
       }
@@ -2494,7 +2494,7 @@
     },
     "diffie-hellman": {
       "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+      "resolved": "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
       "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
       "requires": {
         "bn.js": "^4.1.0",
@@ -2602,7 +2602,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -3455,7 +3455,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -3577,7 +3577,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -3861,7 +3861,7 @@
     },
     "http-errors": {
       "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "resolved": "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
       "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
       "requires": {
         "depd": "~1.1.2",
@@ -4237,7 +4237,7 @@
     },
     "is-obj": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "resolved": "http://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
       "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=",
       "dev": true
     },
@@ -4414,7 +4414,7 @@
     },
     "json5": {
       "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+      "resolved": "http://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
       "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
     },
     "jsonfile": {
@@ -4676,12 +4676,10 @@
       }
     },
     "lru-cache": {
-      "version": "4.1.4",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.4.tgz",
-      "integrity": "sha512-EPstzZ23znHUVLKj+lcXO1KvZkrlw+ZirdwvOmnAnA/1PB4ggyXJ77LRkCqkff+ShQ+cqoxCxLQOh4cKITO5iA==",
-      "dev": true,
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "requires": {
-        "pseudomap": "^1.0.2",
         "yallist": "^3.0.2"
       }
     },
@@ -4923,7 +4921,7 @@
       "dependencies": {
         "commander": {
           "version": "2.15.1",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+          "resolved": "http://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
           "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
           "dev": true
         },
@@ -4990,7 +4988,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -6539,7 +6537,7 @@
     },
     "os-locale": {
       "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
+      "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
       "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
       "dev": true,
       "requires": {
@@ -6644,7 +6642,7 @@
     },
     "parse-asn1": {
       "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
+      "resolved": "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz",
       "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==",
       "requires": {
         "asn1.js": "^4.0.0",
@@ -6869,7 +6867,7 @@
     },
     "proxy-agent": {
       "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz",
+      "resolved": "http://registry.npmjs.org/proxy-agent/-/proxy-agent-2.3.1.tgz",
       "integrity": "sha512-CNKuhC1jVtm8KJYFTS2ZRO71VCBx3QSA92So/e6NrY6GoJonkx3Irnk4047EsCcswczwqAekRj3s8qLRGahSKg==",
       "dev": true,
       "requires": {
@@ -6892,11 +6890,27 @@
             "ms": "^2.1.1"
           }
         },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
         }
       }
     },
@@ -7042,7 +7056,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -7412,7 +7426,7 @@
     },
     "sha.js": {
       "version": "2.4.11",
-      "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+      "resolved": "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
       "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
       "requires": {
         "inherits": "^2.0.1",
@@ -7733,7 +7747,7 @@
         },
         "external-editor": {
           "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
+          "resolved": "http://registry.npmjs.org/external-editor/-/external-editor-2.2.0.tgz",
           "integrity": "sha512-bSn6gvGxKt+b7+6TKEv1ZycHleA7aHhRHyAqJyp5pbUFuYYNIzpZnQDk7AsYckyWdEnTeAnay0aCy2aV6iTk9A==",
           "dev": true,
           "requires": {
@@ -8161,11 +8175,27 @@
             "ms": "^2.1.1"
           }
         },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
         }
       }
     },
@@ -8205,11 +8235,27 @@
             "ms": "^2.1.1"
           }
         },
+        "lru-cache": {
+          "version": "4.1.5",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+          "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+          "dev": true,
+          "requires": {
+            "pseudomap": "^1.0.2",
+            "yallist": "^2.1.2"
+          }
+        },
         "ms": {
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
           "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
           "dev": true
+        },
+        "yallist": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+          "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+          "dev": true
         }
       }
     },
@@ -8495,7 +8541,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -8533,7 +8579,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -8574,7 +8620,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -8612,7 +8658,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -8730,7 +8776,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "requires": {
@@ -8910,7 +8956,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "requires": {
             "core-util-is": "~1.0.0",
@@ -9435,7 +9481,7 @@
     },
     "wrap-ansi": {
       "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+      "resolved": "http://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
       "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
       "dev": true,
       "requires": {
@@ -9529,8 +9575,7 @@
     "yallist": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-      "dev": true
+      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
     },
     "yargs": {
       "version": "3.32.0",
diff --git a/package.json b/package.json
index 2568865e8..a0b506048 100644
--- a/package.json
+++ b/package.json
@@ -43,8 +43,8 @@
   "homepage": "https://github.com/solid/node-solid-server",
   "bugs": "https://github.com/solid/node-solid-server/issues",
   "dependencies": {
-    "@solid/oidc-auth-manager": "^0.17.1",
     "@solid/acl-check": "^0.1.3",
+    "@solid/oidc-auth-manager": "^0.17.1",
     "body-parser": "^1.18.3",
     "bootstrap": "^3.3.7",
     "busboy": "^0.2.12",
@@ -70,6 +70,7 @@
     "ip-range-check": "0.0.2",
     "is-ip": "^2.0.0",
     "li": "^1.0.1",
+    "lru-cache": "^5.1.1",
     "mashlib": "^0.7.15",
     "mime-types": "^2.1.11",
     "negotiator": "^0.6.0",

From 776679380b3000c9073d7bd89088326056e28bf2 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 22 Jan 2019 15:11:26 +0100
Subject: [PATCH 09/12] Needed some error handling in case graphs cannot be
 dereferenced

---
 lib/requests/get-account-info-request.js | 28 +++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
index 818902518..a4b7db6f4 100644
--- a/lib/requests/get-account-info-request.js
+++ b/lib/requests/get-account-info-request.js
@@ -57,20 +57,38 @@ async function getBody (req, contentType) {
     return await req.acl.getError(userId, 'Control')
   }
 
-  // Get total available size of user's POD
-  const userIdGraph = await ldp.getGraph(userId)
-  const storageUrlNode = userIdGraph.any($rdf.sym(userId), PIM('storage'), null)
+  // Dereference graph for webId
+  let userIdGraph
+  try {
+    userIdGraph = await ldp.getGraph(userId)
+  } catch (err) {
+    cache.set(cacheKey, err)
+    return err
+  }
+
+  // Get object value for pim:storage
+  const storageUrlNode = userIdGraph.any($rdf.sym(userId), PIM('storage'))
   if (!storageUrlNode) {
     const storageNotFoundError = new HTTPError(404, 'Unable to find pim:storage for webId')
     cache.set(cacheKey, storageNotFoundError)
     return storageNotFoundError
   }
+
+  // Dereference graph for serverSide.ttl
   const serverSideUrl = `${storageUrlNode.value}settings/serverSide.ttl` // needs to be hardcoded for now
-  const serverSideGraph = await ldp.getGraph(serverSideUrl)
+  let serverSideGraph
+  try {
+    serverSideGraph = await ldp.getGraph(serverSideUrl)
+  } catch (err) {
+    cache.set(cacheKey, err)
+    return err
+  }
+
+  // Get object value for solid:storageQuota
   const quotaNode = serverSideGraph.any(storageUrlNode, SOLID('storageQuota'), null)
   if (!quotaNode) {
     const quotaNotFoundError = new HTTPError(404, 'Unable to find solid:storageQuota')
-    cache.set(quotaNotFoundError)
+    cache.set(cacheKey, quotaNotFoundError)
     return quotaNotFoundError
   }
 

From ee1a116fca8c569051465432bfae1ffdb911811a Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Tue, 22 Jan 2019 15:40:20 +0100
Subject: [PATCH 10/12] Improved comment to be more explicit

---
 common/js/auth-buttons.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/js/auth-buttons.js b/common/js/auth-buttons.js
index 5db39a36d..e07a804f9 100644
--- a/common/js/auth-buttons.js
+++ b/common/js/auth-buttons.js
@@ -72,7 +72,7 @@
       return
     }
 
-    // do stuff
+    // manipulate DOM to present data
     storagePanel.classList.remove('hidden')
     const quotaValue = quotaNode.value
     storageQuota.innerText = formatBytes(quotaValue)

From b79bd563d3c582b6babb7018149a55e45e53ebb6 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Wed, 23 Jan 2019 14:15:05 +0100
Subject: [PATCH 11/12] Implementing some changes based on feedback

---
 common/js/auth-buttons.js | 20 ++++++++++++--------
 lib/utils.js              |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/common/js/auth-buttons.js b/common/js/auth-buttons.js
index e07a804f9..248b17535 100644
--- a/common/js/auth-buttons.js
+++ b/common/js/auth-buttons.js
@@ -54,21 +54,25 @@
   async function getAccountInfo () {
     const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 
+    // get DOM and data-dependencies
+    const storagePanel = document.getElementById('StoragePanel')
+    const storageQuota = document.getElementById('StorageQuota')
+    const storageUsage = document.getElementById('StorageUsage')
+    const storageUsedBar = document.getElementById('StorageUsedBar')
+    if (!storagePanel || !storageQuota || !storageUsage || !storageUsedBar) {
+      // If anything of these elements are not available, we do not need to do anything more
+      return
+    }
+
     // load data
     const accountUrl = new URL('/account', location).href
     const accountStore = $rdf.graph()
     const accountFetcher = new $rdf.Fetcher(accountStore)
     await accountFetcher.load(accountUrl)
-
-    // get DOM and data-dependencies
     const quotaNode = accountStore.any($rdf.sym(accountUrl), SOLID('storageQuota'))
     const usageNode = accountStore.any($rdf.sym(accountUrl), SOLID('storageUsage'))
-    const storagePanel = document.getElementById('StoragePanel')
-    const storageQuota = document.getElementById('StorageQuota')
-    const storageUsage = document.getElementById('StorageUsage')
-    const storageUsedBar = document.getElementById('StorageUsedBar')
-    if (!quotaNode || !usageNode || !storagePanel || !storageQuota || !storageUsage || !storageUsedBar) {
-      // If anything of this is not available, we do not need to do anything more
+    if (!quotaNode || !usageNode) {
+      // If data is not available, we do not need to do anything more
       return
     }
 
diff --git a/lib/utils.js b/lib/utils.js
index a02911e7f..79b76bd35 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -234,11 +234,11 @@ async function overQuota (root, serverUri) {
  * so it needs to be rewritten.
  */
 
-async function actualSize (root) {
+function actualSize (root) {
   return util.promisify(getSize)(root)
 }
 
-async function _asyncReadfile (filename) {
+function _asyncReadfile (filename) {
   return util.promisify(fs.readFile)(filename, 'utf-8')
 }
 

From 86a33e536aa8398cc4cd8b8aad650e26e0b67a33 Mon Sep 17 00:00:00 2001
From: Arne Hassel <arne.hassel@gmail.com>
Date: Wed, 23 Jan 2019 14:40:40 +0100
Subject: [PATCH 12/12] Removed caching until we know we need it

---
 lib/requests/get-account-info-request.js | 36 ++----------------------
 package-lock.json                        | 13 ---------
 package.json                             |  1 -
 3 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/lib/requests/get-account-info-request.js b/lib/requests/get-account-info-request.js
index a4b7db6f4..6243652fd 100644
--- a/lib/requests/get-account-info-request.js
+++ b/lib/requests/get-account-info-request.js
@@ -5,29 +5,10 @@ const AuthRequest = require('./auth-request')
 const { actualSize } = require('../utils')
 const $rdf = require('rdflib')
 const HTTPError = require('../http-error')
-const LRU = require('lru-cache')
 
 const PIM = $rdf.Namespace('http://www.w3.org/ns/pim/space#')
 const SOLID = $rdf.Namespace('http://www.w3.org/ns/solid/terms#')
 
-const cache = new LRU({
-  max: 10000, // is this a reasonable amount to hold?
-  length: (n, key) => {
-    const keyType = typeof key
-    let length = 1
-    switch (keyType) {
-      case 'object':
-        length = Object.keys(key).length
-        break
-      case 'string':
-        length = key.length
-        break
-    }
-    return n * 2 + length
-  },
-  maxAge: 1000 * 60 * 60 // hold the value for one hour
-})
-
 class GetAccountInfoRequest extends AuthRequest {
   static async get (req, res) {
     const contentType = req.get('content-type') || 'text/turtle'
@@ -41,14 +22,9 @@ class GetAccountInfoRequest extends AuthRequest {
 
 async function getBody (req, contentType) {
   const userId = req.session.userId
-  const cacheKey = `${userId}-${contentType}`
   if (!userId) {
     return new HTTPError(401, 'Requires authentication')
   }
-  const cachedValue = cache.get(cacheKey)
-  if (cachedValue) {
-    return cachedValue
-  }
   const ldp = req.app.locals.ldp
   const rootUrl = `${ldp.resourceMapper.resolveUrl(req.hostname)}/`
   const acl = ACLChecker.createFromLDPAndRequest(rootUrl, ldp, req)
@@ -62,16 +38,13 @@ async function getBody (req, contentType) {
   try {
     userIdGraph = await ldp.getGraph(userId)
   } catch (err) {
-    cache.set(cacheKey, err)
     return err
   }
 
   // Get object value for pim:storage
   const storageUrlNode = userIdGraph.any($rdf.sym(userId), PIM('storage'))
   if (!storageUrlNode) {
-    const storageNotFoundError = new HTTPError(404, 'Unable to find pim:storage for webId')
-    cache.set(cacheKey, storageNotFoundError)
-    return storageNotFoundError
+    return new HTTPError(404, 'Unable to find pim:storage for webId')
   }
 
   // Dereference graph for serverSide.ttl
@@ -80,16 +53,13 @@ async function getBody (req, contentType) {
   try {
     serverSideGraph = await ldp.getGraph(serverSideUrl)
   } catch (err) {
-    cache.set(cacheKey, err)
     return err
   }
 
   // Get object value for solid:storageQuota
   const quotaNode = serverSideGraph.any(storageUrlNode, SOLID('storageQuota'), null)
   if (!quotaNode) {
-    const quotaNotFoundError = new HTTPError(404, 'Unable to find solid:storageQuota')
-    cache.set(cacheKey, quotaNotFoundError)
-    return quotaNotFoundError
+    return new HTTPError(404, 'Unable to find solid:storageQuota')
   }
 
   // Get size of user's POD
@@ -103,10 +73,8 @@ async function getBody (req, contentType) {
   return await new Promise((resolve, reject) => {
     $rdf.serialize(null, store, storageUrlNode.value, contentType, (err, result) => {
       if (err) {
-        cache.set(cacheKey, err)
         return reject(err)
       }
-      cache.set(cacheKey, result)
       resolve(result)
     })
   })
diff --git a/package-lock.json b/package-lock.json
index 54ec0be13..d1ac34b23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4675,14 +4675,6 @@
         "js-tokens": "^3.0.0 || ^4.0.0"
       }
     },
-    "lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "requires": {
-        "yallist": "^3.0.2"
-      }
-    },
     "macos-release": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-1.1.0.tgz",
@@ -9572,11 +9564,6 @@
       "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
       "dev": true
     },
-    "yallist": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
-      "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A=="
-    },
     "yargs": {
       "version": "3.32.0",
       "resolved": "http://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz",
diff --git a/package.json b/package.json
index a0b506048..a4e8f6c67 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,6 @@
     "ip-range-check": "0.0.2",
     "is-ip": "^2.0.0",
     "li": "^1.0.1",
-    "lru-cache": "^5.1.1",
     "mashlib": "^0.7.15",
     "mime-types": "^2.1.11",
     "negotiator": "^0.6.0",