From 951b3c508cafb8e7da8508fbfad97f082f8312d1 Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Fri, 22 Oct 2021 07:47:28 -0700
Subject: [PATCH 01/16] Update index.html

---
 default-templates/server/index.html | 107 +++++++++++++++++++++-------
 1 file changed, 80 insertions(+), 27 deletions(-)
diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index 37df7b336..c7a84c3d2 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -1,23 +1,62 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Welcome to Solid</title>
+<!doctype html><html><head>
+  <meta charset="utf-8"/>
   <link rel="stylesheet" href="/common/css/bootstrap.min.css">
   <link rel="stylesheet" href="/common/css/solid.css">
-</head>
-<body>
-<div class="container">
-  <div class="page-header">
-    <div class="pull-right">
-      <button id="register" type="button" class="btn btn-primary">Register</button>
-      <button id="login"    type="button" class="hidden btn btn-default btn-success">Log in</button>
-      <button id="logout"   type="button" class="hidden btn btn-danger">Log out</button>
-    </div>
+  <script>
+    var keyname = 'SolidServerRootRedirectLink';
+    function register(){ alert(2); window.location.href="/register"; }
+    document.addEventListener('DOMContentLoaded', async function() {
+      if (!UI.authn.currentUser()) await UI.authn.checkUser();
+      let user = UI.authn.currentUser();
+
+// IF LOGGED IN: SET COOKIE. LOGOUT
+//
+      if( user ) {
+        window.localStorage.setItem(keyname,user.uri);
+        await UI.authn.authSession.logout();
+      }
+      else {
+        let webId = window.localStorage.getItem(keyname);
+
+// IF NOT LOGGED IN AND COOKIE EXISTS: REMOVE COOKIE, HIDE WELCOME, SHOW LINK TO PROFILE
+//
+        if( webId ) {
+          window.localStorage.removeItem(keyname);
+          document.getElementById('prototype').style.display = "none";
+          document.getElementById('loggedIn').style.display = "block";
+          document.getElementById('loggedIn').innerHTML = `<p>Your webId and profile address are</p> <p> &lt;${webId}&gt.</p><a href="${webId}">visit your profile to login</a></div>`;
+        }
+
+// IF NOT LOGGED IN AND COOKIE DOES NOT EXIST  
+//     SHOW WELCOME, SHOW LOGIN BUTTON
+//     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
+//
+        else {
+         let loginArea = document.getElementById('loginStatusArea');
+         document.getElementById('prototype').style.display = "block";
+         let html = `<input type="button" onclick="window.location.href="/register" value="register" style="padding: 1em; border-radius:0.5em; font-size: 100%;background-color: #efe;">`
+         let span = document.createElement("SPAN")
+         span.innerHTML=html
+         loginArea.appendChild(span); 
+         loginArea.appendChild(UI.authn.loginStatusBox(document, null, {}))
+         const signUpButton = loginArea.querySelectorAll('input')[2];         
+         signUpButton.style.display="none";  
+        }                    
+      }
+    })
+  </script>
+  <link href="/mash.css" rel="stylesheet">
+</head><body class="db-layout">
+
+<h1 style="margin:2em;padding:2em;border:8px solid green; display:none" id="loggedIn"></h1>
 
-    <h1>Welcome to the Solid Prototype</h1>
-  </div>
+<div id="prototype" class="container">
+
+  <div class="page-header">
+     <h1>Welcome to the Solid Prototype</h1>
+       <div id="loginStatusArea" class="pull-right"></div>
+     </h1>
+ </div>
 
   <p class="lead">
     This is a prototype implementation of a Solid server.
@@ -27,14 +66,9 @@ <h1>Welcome to the Solid Prototype</h1>
     If you have not already done so, please create an account.
   </p>
 
-  <p class="lead hidden" id="loggedIn">
-    You are logged in as
-    <a href="#" id="profileLink"></a>.
-  </p>
-
   <section>
     {{#if serverLogo}}
-    <img src="{{serverLogo}}" />
+    <img src="{{serverLogo}}" /> 
     {{/if}}
     <h2>Server info</h2>
     <dl>
@@ -49,7 +83,26 @@ <h2>Server info</h2>
     </dl>
   </section>
 </div>
-<script src="/common/js/solid-auth-client.bundle.js"></script>
-<script src="/common/js/auth-buttons.js"></script>
-</body>
-</html>
+  <header class="db-layout__header header" id="PageHeader"></header>
+  <div class="TabulatorOutline db-layout__content" id="DummyUUID" role="main">
+    <table id="outline"></table>
+    <div id="GlobalDashboard"></div>
+  </div><footer class="db-layout__footer" id="PageFooter"></footer>
+  <style>
+  #prototype {
+    margin : 2em;
+    padding : 1em;
+  }
+  #prototype input {
+    margin : 1em;
+    padding : 0.5em !important;
+  }
+  #loginStatusArea {
+    float:right;
+    clear:right;
+    margin-top:-5em;
+  }
+  </style>
+
+  <script src="/mashlib.js"></script>
+</body></html> 

From 754cbadda16e7c37c539e3f871040e942895e284 Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Fri, 22 Oct 2021 09:42:42 -0700
Subject: [PATCH 02/16] Update default-templates/server/index.html

Co-authored-by: Ted Thibodeau Jr <tthibodeau@openlinksw.com>
---
 default-templates/server/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index c7a84c3d2..e973c078a 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -24,7 +24,7 @@
           window.localStorage.removeItem(keyname);
           document.getElementById('prototype').style.display = "none";
           document.getElementById('loggedIn').style.display = "block";
-          document.getElementById('loggedIn').innerHTML = `<p>Your webId and profile address are</p> <p> &lt;${webId}&gt.</p><a href="${webId}">visit your profile to login</a></div>`;
+          document.getElementById('loggedIn').innerHTML = `<p>Your WebID and profile address are</p> <p> &lt;${webId}&gt.</p><a href="${webId}">Visit your profile to log in.</a></div>`;
         }
 
 // IF NOT LOGGED IN AND COOKIE DOES NOT EXIST  

From 7f625734780c3713264372aed1a108ad989bff82 Mon Sep 17 00:00:00 2001
From: bourgeoa <alain.bourgeois10@gmail.com>
Date: Sat, 23 Oct 2021 16:41:51 +0200
Subject: [PATCH 03/16] lint

---
 default-templates/server/index.html | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index e973c078a..032cbf6cc 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -32,15 +32,15 @@
 //     HIDE LOGIN BUTTON, ADD REGISTER BUTTON
 //
         else {
-         let loginArea = document.getElementById('loginStatusArea');
-         document.getElementById('prototype').style.display = "block";
-         let html = `<input type="button" onclick="window.location.href="/register" value="register" style="padding: 1em; border-radius:0.5em; font-size: 100%;background-color: #efe;">`
-         let span = document.createElement("SPAN")
-         span.innerHTML=html
-         loginArea.appendChild(span); 
-         loginArea.appendChild(UI.authn.loginStatusBox(document, null, {}))
-         const signUpButton = loginArea.querySelectorAll('input')[2];         
-         signUpButton.style.display="none";  
+          let loginArea = document.getElementById('loginStatusArea');
+          document.getElementById('prototype').style.display = "block";
+          let html = `<input type="button" onclick="window.location.href="/register" value="register" style="padding: 1em; border-radius:0.5em; font-size: 100%;background-color: #efe;">`
+          let span = document.createElement("SPAN")
+          span.innerHTML=html
+          loginArea.appendChild(span);
+          loginArea.appendChild(UI.authn.loginStatusBox(document, null, {}))
+          const signUpButton = loginArea.querySelectorAll('input')[2];
+          signUpButton.style.display="none";
         }                    
       }
     })

From b98e88371eadc35221521fb1bfcfa63d42bdb475 Mon Sep 17 00:00:00 2001
From: bourgeoa <alain.bourgeois10@gmail.com>
Date: Sun, 24 Oct 2021 11:30:02 +0200
Subject: [PATCH 04/16] redirect for Login to serverRoot

---
 default-views/account/register-form.hbs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/default-views/account/register-form.hbs b/default-views/account/register-form.hbs
index bf8691ef1..fe01c725d 100644
--- a/default-views/account/register-form.hbs
+++ b/default-views/account/register-form.hbs
@@ -90,8 +90,9 @@
       <div class="panel-body">
         <h2>Already have an account?</h2>
         <p>
-          <a class="btn btn-lg btn-success" href="{{{loginUrl}}}">
-            Please Log In
+          <!-- old login redirect <a class="btn btn-lg btn-success" href="{{{loginUrl}}}">Please Log In</a> --->
+          <a class="btn btn-lg btn-success" href="/">
+            Goto Log in
           </a>
         </p>
       </div>

From 9edd3fd63c3863bcf81f479ecad96fc57b069f8c Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:17:10 -0700
Subject: [PATCH 05/16] Update default-templates/server/index.html

Co-authored-by: Timea <timea.turdean@gmail.com>
---
 default-templates/server/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index 032cbf6cc..f790f3a0a 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -54,7 +54,7 @@ <h1 style="margin:2em;padding:2em;border:8px solid green; display:none" id="logg
 
   <div class="page-header">
      <h1>Welcome to the Solid Prototype</h1>
-       <div id="loginStatusArea" class="pull-right"></div>
+       <div id="loginStatusArea" class="pull-right" style="display: inline-flex;float: right;margin: 10px;"></div>
      </h1>
  </div>
 

From a773f11cdc3421225ee7b780107e22b0f0b6d7bf Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:17:20 -0700
Subject: [PATCH 06/16] Update default-templates/server/index.html

Co-authored-by: Timea <timea.turdean@gmail.com>
---
 default-templates/server/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index f790f3a0a..d5bb2e5d7 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -55,7 +55,7 @@ <h1 style="margin:2em;padding:2em;border:8px solid green; display:none" id="logg
   <div class="page-header">
      <h1>Welcome to the Solid Prototype</h1>
        <div id="loginStatusArea" class="pull-right" style="display: inline-flex;float: right;margin: 10px;"></div>
-     </h1>
+     
  </div>
 
   <p class="lead">

From 18dfda3ccf94caf04447b515b4f279f5704b3fd3 Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:17:27 -0700
Subject: [PATCH 07/16] Update default-templates/server/index.html

Co-authored-by: Timea <timea.turdean@gmail.com>
---
 default-templates/server/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index d5bb2e5d7..0ebd9a300 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -34,7 +34,7 @@
         else {
           let loginArea = document.getElementById('loginStatusArea');
           document.getElementById('prototype').style.display = "block";
-          let html = `<input type="button" onclick="window.location.href="/register" value="register" style="padding: 1em; border-radius:0.5em; font-size: 100%;background-color: #efe;">`
+          let html = `<input type="button" onclick="window.location.href='/register'" value="register" style="padding: 1em; border-radius:0.5em; font-size: 100%;background-color: #efe;">`
           let span = document.createElement("SPAN")
           span.innerHTML=html
           loginArea.appendChild(span);

From df6faa5de6691bf8e3371ab4b24a8f90145b7697 Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:17:38 -0700
Subject: [PATCH 08/16] Update default-templates/server/index.html

Co-authored-by: Timea <timea.turdean@gmail.com>
---
 default-templates/server/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index 0ebd9a300..4201b0c9a 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -52,7 +52,7 @@ <h1 style="margin:2em;padding:2em;border:8px solid green; display:none" id="logg
 
 <div id="prototype" class="container">
 
-  <div class="page-header">
+  <div class="page-header" style="display: inline-flex;">
      <h1>Welcome to the Solid Prototype</h1>
        <div id="loginStatusArea" class="pull-right" style="display: inline-flex;float: right;margin: 10px;"></div>
      

From b2e4c0a6604190db05dd01dc50253881cfe86e11 Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:17:46 -0700
Subject: [PATCH 09/16] Update default-views/account/register-form.hbs

Co-authored-by: Timea <timea.turdean@gmail.com>
---
 default-views/account/register-form.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-views/account/register-form.hbs b/default-views/account/register-form.hbs
index fe01c725d..4f05e078a 100644
--- a/default-views/account/register-form.hbs
+++ b/default-views/account/register-form.hbs
@@ -92,7 +92,7 @@
         <p>
           <!-- old login redirect <a class="btn btn-lg btn-success" href="{{{loginUrl}}}">Please Log In</a> --->
           <a class="btn btn-lg btn-success" href="/">
-            Goto Log in
+            Go to Log in
           </a>
         </p>
       </div>

From 337b5b0ba0c29e8954368d21a7a8e6cf804c5f9b Mon Sep 17 00:00:00 2001
From: Jeff Zucker <44732708+jeff-zucker@users.noreply.github.com>
Date: Thu, 28 Oct 2021 09:20:02 -0700
Subject: [PATCH 10/16] Update default-templates/server/index.html

Co-authored-by: Timea <timea.turdean@gmail.com>
---
 default-templates/server/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default-templates/server/index.html b/default-templates/server/index.html
index 4201b0c9a..4badf90fe 100644
--- a/default-templates/server/index.html
+++ b/default-templates/server/index.html
@@ -48,7 +48,7 @@
   <link href="/mash.css" rel="stylesheet">
 </head><body class="db-layout">
 
-<h1 style="margin:2em;padding:2em;border:8px solid green; display:none" id="loggedIn"></h1>
+<h3 style="padding:2em; border:8px solid #7C4DFF; display:none" id="loggedIn" class="container"></h3>
 
 <div id="prototype" class="container">
 

From 7a637c9a41ae33565965f9b2acde87a1c1734c94 Mon Sep 17 00:00:00 2001
From: bourgeoa <alain.bourgeois10@gmail.com>
Date: Sun, 31 Oct 2021 00:19:20 +0200
Subject: [PATCH 11/16] add space:Storage

---
 lib/header.js        | 6 ++++++
 lib/ldp-container.js | 8 ++++++++
 lib/ldp.js           | 2 +-
 lib/metadata.js      | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lib/header.js b/lib/header.js
index 6f307dd51..d0f086826 100644
--- a/lib/header.js
+++ b/lib/header.js
@@ -39,6 +39,9 @@ function addLinks (res, fileMetadata) {
   if (fileMetadata.isDirectContainer) {
     addLink(res, 'http://www.w3.org/ns/ldp#DirectContainer', 'type')
   }
+  if (fileMetadata.isStorage) {
+    addLink(res, 'http://www.w3.org/ns/pim/space#Storage', 'type')
+  }
 }
 
 async function linksHandler (req, res, next) {
@@ -64,6 +67,7 @@ async function linksHandler (req, res, next) {
   }
   const fileMetadata = new metadata.Metadata()
   if (filename.endsWith('/')) {
+    if (filename === '/') fileMetadata.isStorage = true
     fileMetadata.isContainer = true
     fileMetadata.isBasicContainer = true
   } else {
@@ -102,6 +106,8 @@ function parseMetadataFromHeader (linkHeader) {
           fileMetadata.isBasicContainer = true
         } else if (parsedLinks[rel] === 'http://www.w3.org/ns/ldp#DirectContainer') {
           fileMetadata.isDirectContainer = true
+        } else if (parsedLinks[rel] === 'http://www.w3.org/ns/pim/space#Storage') {
+          fileMetadata.isStorage = true
         }
       }
     }
diff --git a/lib/ldp-container.js b/lib/ldp-container.js
index b5e77e2f1..c99328008 100644
--- a/lib/ldp-container.js
+++ b/lib/ldp-container.js
@@ -14,6 +14,14 @@ const path = require('path')
 async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
   const containerStats = await ldp.stat(filename)
   addStats(resourceGraph, reqUri, containerStats, filename)
+  const storage = new URL(reqUri)
+  if (reqUri === storage.origin + '/') {
+    resourceGraph.add(
+      resourceGraph.sym(reqUri),
+      ns.rdf('type'),
+      ns.space('Storage')
+    )
+  }
   resourceGraph.add(
     resourceGraph.sym(reqUri),
     ns.rdf('type'),
diff --git a/lib/ldp.js b/lib/ldp.js
index 978229182..2720869f1 100644
--- a/lib/ldp.js
+++ b/lib/ldp.js
@@ -108,7 +108,7 @@ class LDP {
       $rdf.parse(containerData, resourceGraph, reqUri, 'text/turtle')
     } catch (err) {
       debug.handlers('GET -- Error parsing data: ' + err)
-      throw error(500, "Can't parse container")
+      throw error(500, "Can't parse container .meta")
     }
 
     try {
diff --git a/lib/metadata.js b/lib/metadata.js
index a232c2691..925904cef 100644
--- a/lib/metadata.js
+++ b/lib/metadata.js
@@ -7,4 +7,5 @@ function Metadata () {
   this.isContainer = false
   this.isBasicContainer = false
   this.isDirectContainer = false
+  this.isStorage = false
 }

From 3cca6ea0a8d55583f3209978c16c75ef4a1252a5 Mon Sep 17 00:00:00 2001
From: bourgeoa <alain.bourgeois10@gmail.com>
Date: Sun, 31 Oct 2021 19:53:57 +0100
Subject: [PATCH 12/16] use storage

---
 lib/header.js        | 4 ++--
 lib/ldp-container.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/header.js b/lib/header.js
index d0f086826..1481ba8b1 100644
--- a/lib/header.js
+++ b/lib/header.js
@@ -40,7 +40,7 @@ function addLinks (res, fileMetadata) {
     addLink(res, 'http://www.w3.org/ns/ldp#DirectContainer', 'type')
   }
   if (fileMetadata.isStorage) {
-    addLink(res, 'http://www.w3.org/ns/pim/space#Storage', 'type')
+    addLink(res, 'http://www.w3.org/ns/pim/space#storage', 'type')
   }
 }
 
@@ -106,7 +106,7 @@ function parseMetadataFromHeader (linkHeader) {
           fileMetadata.isBasicContainer = true
         } else if (parsedLinks[rel] === 'http://www.w3.org/ns/ldp#DirectContainer') {
           fileMetadata.isDirectContainer = true
-        } else if (parsedLinks[rel] === 'http://www.w3.org/ns/pim/space#Storage') {
+        } else if (parsedLinks[rel] === 'http://www.w3.org/ns/pim/space#storage') {
           fileMetadata.isStorage = true
         }
       }
diff --git a/lib/ldp-container.js b/lib/ldp-container.js
index c99328008..21b146e3f 100644
--- a/lib/ldp-container.js
+++ b/lib/ldp-container.js
@@ -19,7 +19,7 @@ async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
     resourceGraph.add(
       resourceGraph.sym(reqUri),
       ns.rdf('type'),
-      ns.space('Storage')
+      ns.space('storage')
     )
   }
   resourceGraph.add(

From d0cdeb32d83242e4df267de13dd966b792e085f0 Mon Sep 17 00:00:00 2001
From: Alain Bourgeois <alain.bourgeois10@gmail.com>
Date: Mon, 1 Nov 2021 17:03:36 +0100
Subject: [PATCH 13/16] update to class Storage

Co-authored-by: Sarven Capadisli <info@csarven.ca>
---
 lib/ldp-container.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ldp-container.js b/lib/ldp-container.js
index 21b146e3f..c99328008 100644
--- a/lib/ldp-container.js
+++ b/lib/ldp-container.js
@@ -19,7 +19,7 @@ async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
     resourceGraph.add(
       resourceGraph.sym(reqUri),
       ns.rdf('type'),
-      ns.space('storage')
+      ns.space('Storage')
     )
   }
   resourceGraph.add(

From f4ac09b0a4f5afbb153733c22b20f32877bf0364 Mon Sep 17 00:00:00 2001
From: Alain Bourgeois <alain.bourgeois10@gmail.com>
Date: Mon, 1 Nov 2021 17:04:55 +0100
Subject: [PATCH 14/16] update to class Storage lib/header.js

Co-authored-by: Sarven Capadisli <info@csarven.ca>
---
 lib/header.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/header.js b/lib/header.js
index 1481ba8b1..02b783135 100644
--- a/lib/header.js
+++ b/lib/header.js
@@ -106,7 +106,7 @@ function parseMetadataFromHeader (linkHeader) {
           fileMetadata.isBasicContainer = true
         } else if (parsedLinks[rel] === 'http://www.w3.org/ns/ldp#DirectContainer') {
           fileMetadata.isDirectContainer = true
-        } else if (parsedLinks[rel] === 'http://www.w3.org/ns/pim/space#storage') {
+        } else if (parsedLinks[rel] === 'http://www.w3.org/ns/pim/space#Storage') {
           fileMetadata.isStorage = true
         }
       }

From 08a9c9b2b22830ca8ab61ab8268b0a30941a35b0 Mon Sep 17 00:00:00 2001
From: Alain Bourgeois <alain.bourgeois10@gmail.com>
Date: Mon, 1 Nov 2021 17:05:28 +0100
Subject: [PATCH 15/16] Update update to class Storage lib/header.js

Co-authored-by: Sarven Capadisli <info@csarven.ca>
---
 lib/header.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/header.js b/lib/header.js
index 02b783135..d0f086826 100644
--- a/lib/header.js
+++ b/lib/header.js
@@ -40,7 +40,7 @@ function addLinks (res, fileMetadata) {
     addLink(res, 'http://www.w3.org/ns/ldp#DirectContainer', 'type')
   }
   if (fileMetadata.isStorage) {
-    addLink(res, 'http://www.w3.org/ns/pim/space#storage', 'type')
+    addLink(res, 'http://www.w3.org/ns/pim/space#Storage', 'type')
   }
 }
 

From 49c045632d7a29180bef1af7a0fca13ed3ae9832 Mon Sep 17 00:00:00 2001
From: bourgeoa <alain.bourgeois10@gmail.com>
Date: Mon, 1 Nov 2021 22:57:17 +0100
Subject: [PATCH 16/16] update linksHandler() and add tests

---
 lib/header.js                 |  2 +-
 test/integration/http-test.js | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/lib/header.js b/lib/header.js
index d0f086826..9a9ef3dc9 100644
--- a/lib/header.js
+++ b/lib/header.js
@@ -67,7 +67,7 @@ async function linksHandler (req, res, next) {
   }
   const fileMetadata = new metadata.Metadata()
   if (filename.endsWith('/')) {
-    if (filename === '/') fileMetadata.isStorage = true
+    if (req.path === '/') fileMetadata.isStorage = true
     fileMetadata.isContainer = true
     fileMetadata.isBasicContainer = true
   } else {
diff --git a/test/integration/http-test.js b/test/integration/http-test.js
index 65c8b17a1..72af343d4 100644
--- a/test/integration/http-test.js
+++ b/test/integration/http-test.js
@@ -76,6 +76,30 @@ describe('HTTP APIs', function () {
         .expect('content-type', /text\/turtle/)
         .expect(200, done)
     })
+    it('should contain space:Storage triple', function (done) {
+      server.get('/')
+        .expect('content-type', /text\/turtle/)
+        .expect(200, done)
+        .expect((res) => {
+          const turtle = res.text
+          assert.match(turtle, /space:Storage/)
+          const kb = rdf.graph()
+          rdf.parse(turtle, kb, 'https://localhost/', 'text/turtle')
+
+          assert(kb.match(undefined,
+            rdf.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
+            rdf.namedNode('http://www.w3.org/ns/pim/space#Storage')
+          ).length, 'Must contain a triple space:Storage')
+        })
+    })
+    it('should have set Link as Container/BasicContainer/Storage', function (done) {
+      server.get('/')
+        .expect('content-type', /text\/turtle/)
+        .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#BasicContainer>; rel="type"/)
+        .expect('Link', /<http:\/\/www.w3.org\/ns\/ldp#Container>; rel="type"/)
+        .expect('Link', /<http:\/\/www.w3.org\/ns\/pim\/space#Storage>; rel="type"/)
+        .expect(200, done)
+    })
   })
 
   describe('OPTIONS API', function () {
