Remove byte units and the logic to support it. Also use anyValue method

Author: kjetilk

default-templates/new-account/settings/serverSide.ttl

@@ -9,5 +9,5 @@
   dct:description "Administrative settings for the POD that the user can only read." .
 
 </>
-    solid:storageQuota "25"^^unit:megabyte .
+    solid:storageQuota "25000000" .
 

lib/utils.js

@@ -253,7 +253,6 @@ function routeResolvedFile (router, path, file, appendFileName = true) {
 
 async function getQuota (root, serverUri) {
   const filename = path.join(root, 'settings/serverSide.ttl')
-  var quota = Infinity
   var prefs
   try {
     prefs = await _asyncReadfile(filename)
@@ -268,24 +267,7 @@ async function getQuota (root, serverUri) {
   } catch (error) {
     throw new Error('Failed to parse serverSide.ttl, got ' + error)
   }
-  const lit = graph.each($rdf.sym(storageUri), ns.solid('storageQuota'), undefined)[0]
-  if (lit) {
-    quota = lit.value
-    const unitUri = 'http://www.w3.invalid/ns#'
-    // The following should be encoded in the ontology
-    switch (lit.datatype.value) {
-      case unitUri + 'kilobyte':
-        quota *= 1000
-        break
-      case unitUri + 'megabyte':
-        quota *= 1000000
-        break
-      case unitUri + 'gigabyte':
-        quota *= 1000000000
-        break
-    }
-  }
-  return quota
+  return Number(graph.anyValue($rdf.sym(storageUri), ns.solid('storageQuota'))) || Infinity
 }
 
 /**

test/resources/accounts-acl/config/templates/new-account/settings/serverSide.ttl

@@ -9,5 +9,6 @@
   dct:description "Administrative settings for the server that are only readable to the user." .
 
 </>
-    solid:storageQuota "2"^^unit:kilobyte .
+    solid:storageQuota "2000" .
+    
 

test/settings/serverSide.ttl

@@ -9,5 +9,6 @@
   dct:description "Administrative settings for the server that are only readable to the user." .
 
 </>
-    solid:storageQuota "1230"^^unit:kilobyte .
+    solid:storageQuota "1230" .
+