feat: Update templates and generators to support ACP

config/app/init/initializers/prefilled-root.json

@@ -14,12 +14,9 @@
         "args_path": "/",
         "args_store": { "@id": "urn:solid-server:default:ResourceStore" },
         "args_generator": {
-          "@type": "TemplatedResourcesGenerator",
+          "@type": "StaticFolderGenerator",
           "templateFolder": "@css:templates/root/prefilled",
-          "factory": { "@type": "ExtensionBasedMapperFactory" },
-          "templateEngine": { "@id": "urn:solid-server:default:TemplateEngine" },
-          "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
-          "store": { "@id": "urn:solid-server:default:ResourceStore"}
+          "resourcesGenerator": { "@id": "urn:solid-server:default:TemplatedResourcesGenerator" }
         },
         "args_storageKey": "rootInitialized",
         "args_storage": { "@id": "urn:solid-server:default:SetupStorage" }

config/app/init/initializers/root.json

@@ -14,12 +14,9 @@
         "args_path": "/",
         "args_store": { "@id": "urn:solid-server:default:ResourceStore" },
         "args_generator": {
-          "@type": "TemplatedResourcesGenerator",
+          "@type": "StaticFolderGenerator",
           "templateFolder": "@css:templates/root/empty",
-          "factory": { "@type": "ExtensionBasedMapperFactory" },
-          "templateEngine": { "@id": "urn:solid-server:default:TemplateEngine" },
-          "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
-          "store": { "@id": "urn:solid-server:default:ResourceStore"}
+          "resourcesGenerator": { "@id": "urn:solid-server:default:TemplatedResourcesGenerator" }
         },
         "args_storageKey": "rootInitialized",
         "args_storage": { "@id": "urn:solid-server:default:SetupStorage" }

config/app/setup/handlers/setup.json

@@ -60,12 +60,9 @@
       "args_path": "/",
       "args_store": { "@id": "urn:solid-server:default:ResourceStore" },
       "args_generator": {
-        "@type": "TemplatedResourcesGenerator",
+        "@type": "StaticFolderGenerator",
         "templateFolder": "@css:templates/root/empty",
-        "factory": { "@type": "ExtensionBasedMapperFactory" },
-        "templateEngine": { "@id": "urn:solid-server:default:TemplateEngine" },
-        "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
-        "store": { "@id": "urn:solid-server:default:ResourceStore"}
+        "resourcesGenerator": { "@id": "urn:solid-server:default:TemplatedResourcesGenerator" }
       },
       "args_storageKey": "rootInitialized",
       "args_storage": { "@id": "urn:solid-server:default:SetupStorage" }

config/identity/access/initializers/idp.json

@@ -14,12 +14,9 @@
         "args_path": "/idp/",
         "args_store": { "@id": "urn:solid-server:default:ResourceStore" },
         "args_generator": {
-          "@type": "TemplatedResourcesGenerator",
+          "@type": "StaticFolderGenerator",
           "templateFolder": "@css:templates/root/empty",
-          "factory": { "@type": "ExtensionBasedMapperFactory" },
-          "templateEngine": { "@id": "urn:solid-server:default:TemplateEngine" },
-          "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
-          "store": { "@id": "urn:solid-server:default:ResourceStore"}
+          "resourcesGenerator": { "@id": "urn:solid-server:default:TemplatedResourcesGenerator" }
         },
         "args_storageKey": "idpContainerInitialized",
         "args_storage": { "@id": "urn:solid-server:default:SetupStorage" }

config/identity/access/initializers/well-known.json

@@ -14,12 +14,9 @@
         "args_path": "/.well-known/",
         "args_store": { "@id": "urn:solid-server:default:ResourceStore" },
         "args_generator": {
-          "@type": "TemplatedResourcesGenerator",
+          "@type": "StaticFolderGenerator",
           "templateFolder": "@css:templates/root/empty",
-          "factory": { "@type": "ExtensionBasedMapperFactory" },
-          "templateEngine": { "@id": "urn:solid-server:default:TemplateEngine" },
-          "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
-          "store": { "@id": "urn:solid-server:default:ResourceStore"}
+          "resourcesGenerator": { "@id": "urn:solid-server:default:TemplatedResourcesGenerator" }
         },
         "args_storageKey": "wellKnownContainerInitialized",
         "args_storage": { "@id": "urn:solid-server:default:SetupStorage" }

config/identity/pod/dynamic.json

@@ -12,7 +12,7 @@
       "@type": "ConfigPodManager",
       "podGenerator": { "@id": "urn:solid-server:default:PodGenerator" },
       "routingStorage": { "@id": "urn:solid-server:default:PodRoutingStorage" },
-      "resourcesGenerator": { "@id": "urn:solid-server:default:ResourcesGenerator" },
+      "resourcesGenerator": { "@id": "urn:solid-server:default:PodResourcesGenerator" },
       "store": { "@id": "urn:solid-server:default:ResourceStore" }
     },
 

config/identity/pod/resource-generators/templated.json

@@ -2,16 +2,31 @@
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld",
   "@graph": [
     {
-      "comment": "Generates resources based on the templates stored in the template folder.",
-      "@id": "urn:solid-server:default:ResourcesGenerator",
-      "@type": "TemplatedResourcesGenerator",
+      "comment": "Generates pods based on the templates in the corresponding folder.",
+      "@id": "urn:solid-server:default:PodResourcesGenerator",
+      "@type": "StaticFolderGenerator",
       "templateFolder": "@css:templates/pod",
-      "factory": {
-        "@type": "ExtensionBasedMapperFactory"
-      },
-      "templateEngine": { "@id": "urn:solid-server:default:TemplateEngine" },
-      "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
-      "store": { "@id": "urn:solid-server:default:ResourceStore"}
+      "resourcesGenerator": { "@id": "urn:solid-server:default:TemplatedResourcesGenerator" }
+    },
+    {
+      "comment": [
+        "Generates resources in the base subfolder of the provided folder.",
+        "Authorization configurations should add their corresponding subfolder containing the relevant authorization files."
+      ],
+      "@id": "urn:solid-server:default:TemplatedResourcesGenerator",
+      "@type": "SubfolderResourcesGenerator",
+      "subfolders": [ "base" ],
+      "resourcesGenerator": {
+        "@type": "BaseResourcesGenerator",
+        "factory": {
+          "@type": "ExtensionBasedMapperFactory"
+        },
+        "templateEngine": {
+          "@id": "urn:solid-server:default:TemplateEngine"
+        },
+        "metadataStrategy": { "@id": "urn:solid-server:default:MetadataStrategy" },
+        "store": { "@id": "urn:solid-server:default:ResourceStore"}
+      }
     }
   ]
 }

config/identity/pod/static.json

@@ -9,7 +9,7 @@
       "@id": "urn:solid-server:default:PodManager",
       "@type": "GeneratedPodManager",
       "store": { "@id": "urn:solid-server:default:ResourceStore" },
-      "resourcesGenerator": { "@id": "urn:solid-server:default:ResourcesGenerator" }
+      "resourcesGenerator": { "@id": "urn:solid-server:default:PodResourcesGenerator" }
     }
   ]
 }

config/ldp/authorization/acp.json

@@ -31,6 +31,12 @@
         ]
       }
     },
+    {
+      "comment": "The templates for ACP authorization documents are in the acp subfolder.",
+      "@id": "urn:solid-server:default:TemplatedResourcesGenerator",
+      "@type": "SubfolderResourcesGenerator",
+      "subfolders": [ "acp" ]
+    },
     {
       "comment": "In case of ACP authorization the ACR resources determine authorization.",
       "@id": "urn:solid-server:default:AuthResourceHttpHandler",

config/ldp/authorization/webacl.json

@@ -31,6 +31,12 @@
         ]
       }
     },
+    {
+      "comment": "The templates for WAC authorization documents are in the wac subfolder.",
+      "@id": "urn:solid-server:default:TemplatedResourcesGenerator",
+      "@type": "SubfolderResourcesGenerator",
+      "subfolders": [ "wac" ]
+    },
     {
       "comment": "In case of WebACL authorization the ACL resources determine authorization.",
       "@id": "urn:solid-server:default:AuthResourceHttpHandler",