solid-server 5.7.10 → 5.7.11

package/common/js/index-buttons.js

@@ -30,7 +30,7 @@ document.addEventListener('DOMContentLoaded', async function() {
         //     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
         else {
         let loginArea = document.getElementById('loginStatusArea');
-        let html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button">`
+        let html = `<input type="button" onclick="window.location.href='/register'" value="Register to get a Pod" class="register-button" style="padding: 1em; border-radius:0.2em; font-size: 100%;margin: 0.75em 0 0.75em 0.5em !important; padding: 0.5em !important;background-color: #efe;">`
         let span = document.createElement("span")
         span.innerHTML = html
         loginArea.appendChild(span);
@@ -41,4 +41,4 @@ document.addEventListener('DOMContentLoaded', async function() {
         signUpButton.style.display = "none";
         }                    
     }
-})
+})

package/lib/ldp.js

@@ -103,7 +103,6 @@ class LDP {
 
   async listContainer (container, reqUri, containerData, hostname) {
     const resourceGraph = $rdf.graph()
-
     try {
       $rdf.parse(containerData, resourceGraph, reqUri, 'text/turtle')
     } catch (err) {
@@ -220,19 +219,16 @@ class LDP {
 
   async put (url, stream, contentType) {
     const container = (url.url || url).endsWith('/')
-
     // PUT without content type is forbidden, unless PUTting container
     if (!contentType && !container) {
       throw error(400,
         'PUT request requires a content-type via the Content-Type header')
     }
-
     // reject resource with percent-encoded $ extension
     const dollarExtensionRegex = /%(?:24)\.[^%(?:24)]*$/ // /\$\.[^$]*$/
     if ((url.url || url).match(dollarExtensionRegex)) {
       throw error(400, 'Resource with a $.ext is not allowed by the server')
     }
-
     // First check if we are above quota
     let isOverQuota
     // Someone had a reason to make url actually a req sometimes but not
@@ -246,7 +242,6 @@ class LDP {
     if (isOverQuota) {
       throw error(413, 'User has exceeded their storage quota')
     }
-
     // Set url using folder/.meta. This is Hack to find folder path
     if (container) {
       if (typeof url !== 'string') {
@@ -256,22 +251,18 @@ class LDP {
       }
       contentType = 'text/turtle'
     }
-
     const { path } = await this.resourceMapper.mapUrlToFile({ url, contentType, createIfNotExists: true })
     // debug.handlers(container + ' item ' + (url.url || url) + ' ' + contentType + ' ' + path)
     // check if file exists, and in that case that it has the same extension
     if (!container) { await this.checkFileExtension(url, path) }
-
     // Create the enclosing directory, if necessary, do not create pubsub if PUT create container
     await this.createDirectory(path, hostname, !container)
-
     // clear cache
     if (path.endsWith(this.suffixAcl)) {
       const { url: aclUrl } = await this.resourceMapper.mapFileToUrl({ path, hostname })
       clearAclCache(aclUrl)
       // clearAclCache()
     }
-
     // Directory created, now write the file
     if (container) return
     return withLock(path, () => new Promise((resolve, reject) => {

package/lib/models/account-manager.js

@@ -89,12 +89,10 @@ class AccountManager {
     try {
       accountUri = this.accountUriFor(accountName)
       accountUri = url.parse(accountUri).hostname
-
       cardPath = url.resolve('/', this.pathCard)
     } catch (err) {
       return Promise.reject(err)
     }
-
     return this.accountUriExists(accountUri, cardPath)
   }
 

package/lib/utils.js

@@ -201,7 +201,7 @@ async function getQuota (root, serverUri) {
     return Infinity
   }
   const graph = $rdf.graph()
-  const storageUri = serverUri + '/'
+  const storageUri = serverUri.endsWith('/') ? serverUri : serverUri + '/'
   try {
     $rdf.parse(prefs, graph, storageUri, 'text/turtle')
   } catch (error) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "5.7.10",
+  "version": "5.7.11",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"
@@ -89,7 +89,7 @@
     "ip-range-check": "0.2.0",
     "is-ip": "^3.1.0",
     "li": "^1.3.0",
-    "mashlib": "^1.8.10",
+    "mashlib": "^1.8.11",
     "mime-types": "^2.1.35",
     "negotiator": "^0.6.3",
     "node-fetch": "^2.7.0",
@@ -147,6 +147,13 @@
     "nyc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 nyc --reporter=text-summary mocha --recursive test/integration/ test/unit/",
     "mocha": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/ test/unit/",
     "mocha-integration": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/http-test.js",
+    "mocha-account-creation-oidc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/account-creation-oidc-test.js",
+    "mocha-account-manager": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/account-manager-test.js",
+    "mocha-account-template": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/account-template-test.js",
+    "mocha-acl-oidc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/acl-oidc-test.js",
+    "mocha-authentication-oidc": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/authentication-oidc-test.js",
+    "mocha-header": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/header-test.js",
+    "mocha-ldp": "cross-env NODE_TLS_REJECT_UNAUTHORIZED=0 mocha --recursive test/integration/ldp-test.js",
     "prepublishOnly": "npm test",
     "postpublish": "git push --follow-tags",
     "test": "npm run standard && npm run validate && npm run nyc",