feat: Move storage location decision to separate import

config/default.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/dynamic.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/dynamic.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/example-https-file.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/file-acp.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acr.json",
     "css:config/util/identifiers/suffix.json",

config/file-root.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/file.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/https-file-cli.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/identity/registration/disabled.json

@@ -3,12 +3,6 @@
   "@graph": [
     {
       "comment": "Disable registration by not attaching a registration handler."
-    },
-    {
-      "comment": "If registration is disabled, the base URL of the server is the root storage.",
-      "@id": "urn:solid-server:default:StorageLocationStrategy",
-      "@type": "RootStorageLocationStrategy",
-      "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" }
     }
   ]
 }

config/identity/registration/enabled.json

@@ -4,12 +4,6 @@
     "css:config/identity/registration/route/registration.json"
   ],
   "@graph": [
-    {
-      "comment": "If registration is enabled, the pod locations will be root storages.",
-      "@id": "urn:solid-server:default:StorageLocationStrategy",
-      "@type": "PodStorageLocationStrategy",
-      "generator": { "@id": "urn:solid-server:default:IdentifierGenerator" }
-    },
     {
       "@id": "urn:solid-server:auth:password:InteractionRouteHandler",
       "@type": "WaterfallHandler",

config/memory-subdomains.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/subdomain.json",

config/path-routing.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/regex.json",
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/quota-file.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/pod-quota-file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/restrict-idp.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/sparql-endpoint-root.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/sparql.json",
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/sparql-endpoint.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/sparql.json",
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/sparql-file-storage.json

@@ -23,6 +23,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

config/storage/location/pod.json

@@ -0,0 +1,11 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "@graph": [
+    {
+      "comment": "Determine root storage locations based on pod identifiers.",
+      "@id": "urn:solid-server:default:StorageLocationStrategy",
+      "@type": "PodStorageLocationStrategy",
+      "generator": { "@id": "urn:solid-server:default:IdentifierGenerator" }
+    }
+  ]
+}

config/storage/location/root.json

@@ -0,0 +1,11 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "@graph": [
+    {
+      "comment": "Set the base URL of the server as the root storage.",
+      "@id": "urn:solid-server:default:StorageLocationStrategy",
+      "@type": "RootStorageLocationStrategy",
+      "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" }
+    }
+  ]
+}

test/integration/config/ldp-with-acp.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acr.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/ldp-with-auth.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/legacy-websockets.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/permission-table.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
 
     "css:config/util/identifiers/suffix.json",

test/integration/config/quota-global.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/global-quota-file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/quota-pod.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/pod-quota-file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/restricted-idp.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/pod.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/server-dynamic-unsafe.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/dynamic.json",
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/server-file.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/file.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/server-memory.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/server-middleware.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/server-redis-lock.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/server-subdomains-unsafe.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/subdomain.json",

test/integration/config/server-without-auth.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
     "css:config/storage/backend/memory.json",
     "css:config/storage/key-value/memory.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/webhook-notifications.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",

test/integration/config/websocket-notifications.json

@@ -22,6 +22,7 @@
     "css:config/ldp/modes/default.json",
 
     "css:config/storage/key-value/resource-store.json",
+    "css:config/storage/location/root.json",
     "css:config/storage/middleware/default.json",
     "css:config/util/auxiliary/acl.json",
     "css:config/util/identifiers/suffix.json",