From 010017a14176246d6a792f89b701c9a8655b70bb Mon Sep 17 00:00:00 2001
From: Joachim Van Herwegen <joachimvh@gmail.com>
Date: Fri, 6 Oct 2023 16:24:03 +0200
Subject: [PATCH] feat: Update configurations so ldp/accounts/oidc can be
 disabled

---
 RELEASE_NOTES.md                              |  5 +-
 config/default.json                           |  2 +-
 config/dynamic.json                           |  2 +-
 config/example-https-file.json                |  2 +-
 config/file-acp.json                          |  2 +-
 config/file-root.json                         |  4 +-
 config/file.json                              |  2 +-
 config/http/handler/default.json              |  1 -
 config/https-file-cli.json                    |  2 +-
 config/identity/README.md                     | 14 +++++-
 config/identity/handler/base/default.json     | 45 ++++++++++++++++++
 config/identity/handler/default.json          | 47 ++++---------------
 config/identity/handler/disabled.json         | 15 ++++++
 .../enable/account.json                       |  0
 .../enable/client-credentials.json            |  0
 .../enable/password.json                      |  0
 .../{interaction => handler}/enable/pod.json  |  0
 .../enable/webid.json                         |  0
 config/identity/handler/no-accounts.json      | 18 +++++++
 config/identity/handler/no-pods.json          | 18 +++++++
 .../routing/account/create.json               |  0
 .../routing/account/login.json                |  0
 .../routing/account/logout.json               |  0
 .../routing/account/main.json                 |  8 ++--
 .../routing/account/resource.json             |  0
 .../routing/client-credentials/create.json    |  0
 .../routing/client-credentials/resource.json  |  0
 .../routing/core/index.json                   |  0
 .../routing/core/login.json                   |  0
 .../routing/core/main.json                    |  4 +-
 .../routing/default.json                      | 22 ++++-----
 .../routing/oidc/cancel.json                  |  0
 .../routing/oidc/consent.json                 |  0
 .../routing/oidc/forget-webid.json            |  0
 .../routing/oidc/main.json                    | 10 ++--
 .../routing/oidc/pick-webid.json              |  0
 .../routing/oidc/prompt.json                  |  0
 .../routing/password/create.json              |  0
 .../routing/password/forgot.json              |  0
 .../routing/password/login.json               |  0
 .../handler/routing/password/main.json        | 11 +++++
 .../routing/password/reset.json               |  0
 .../routing/password/resource.json            |  0
 .../routing/pod/create.json                   |  0
 .../routing/pod/resource.json                 |  0
 .../routing/views/html.json                   |  0
 .../routing/webid/link.json                   |  0
 .../routing/webid/resource.json               |  0
 config/identity/interaction/default.json      | 16 -------
 config/identity/interaction/no-accounts.json  | 15 ------
 config/identity/interaction/no-pods.json      | 15 ------
 .../interaction/routing/password/main.json    | 11 -----
 .../oidc.json => identity/oidc/default.json}  |  0
 config/identity/oidc/disabled.json            | 10 ++++
 config/ldp/handler/disabled.json              | 19 ++++++++
 config/memory-subdomains.json                 |  2 +-
 config/oidc.json                              | 44 +++++++++++++++++
 config/path-routing.json                      |  4 +-
 config/quota-file.json                        |  2 +-
 config/restrict-idp.json                      |  2 +-
 config/sparql-endpoint-root.json              |  4 +-
 config/sparql-endpoint.json                   |  2 +-
 config/sparql-file-storage.json               |  2 +-
 templates/identity/account/resource.html.ejs  | 12 ++---
 test/integration/config/file-pod.json         |  2 +-
 test/integration/config/ldp-with-acp.json     |  4 +-
 test/integration/config/ldp-with-auth.json    |  4 +-
 .../integration/config/legacy-websockets.json |  2 +-
 test/integration/config/memory-pod.json       |  2 +-
 test/integration/config/permission-table.json |  4 +-
 test/integration/config/quota-global.json     |  2 +-
 test/integration/config/quota-pod.json        |  2 +-
 test/integration/config/restricted-idp.json   |  2 +-
 .../config/server-dynamic-unsafe.json         |  2 +-
 test/integration/config/server-file.json      |  2 +-
 test/integration/config/server-memory.json    |  2 +-
 .../integration/config/server-middleware.json |  2 +-
 .../integration/config/server-redis-lock.json |  4 +-
 .../config/server-subdomains-unsafe.json      |  2 +-
 .../config/server-without-auth.json           |  4 +-
 .../config/webhook-notifications.json         |  4 +-
 .../config/websocket-notifications.json       |  4 +-
 82 files changed, 276 insertions(+), 168 deletions(-)
 create mode 100644 config/identity/handler/base/default.json
 create mode 100644 config/identity/handler/disabled.json
 rename config/identity/{interaction => handler}/enable/account.json (100%)
 rename config/identity/{interaction => handler}/enable/client-credentials.json (100%)
 rename config/identity/{interaction => handler}/enable/password.json (100%)
 rename config/identity/{interaction => handler}/enable/pod.json (100%)
 rename config/identity/{interaction => handler}/enable/webid.json (100%)
 create mode 100644 config/identity/handler/no-accounts.json
 create mode 100644 config/identity/handler/no-pods.json
 rename config/identity/{interaction => handler}/routing/account/create.json (100%)
 rename config/identity/{interaction => handler}/routing/account/login.json (100%)
 rename config/identity/{interaction => handler}/routing/account/logout.json (100%)
 rename config/identity/{interaction => handler}/routing/account/main.json (80%)
 rename config/identity/{interaction => handler}/routing/account/resource.json (100%)
 rename config/identity/{interaction => handler}/routing/client-credentials/create.json (100%)
 rename config/identity/{interaction => handler}/routing/client-credentials/resource.json (100%)
 rename config/identity/{interaction => handler}/routing/core/index.json (100%)
 rename config/identity/{interaction => handler}/routing/core/login.json (100%)
 rename config/identity/{interaction => handler}/routing/core/main.json (89%)
 rename config/identity/{interaction => handler}/routing/default.json (80%)
 rename config/identity/{interaction => handler}/routing/oidc/cancel.json (100%)
 rename config/identity/{interaction => handler}/routing/oidc/consent.json (100%)
 rename config/identity/{interaction => handler}/routing/oidc/forget-webid.json (100%)
 rename config/identity/{interaction => handler}/routing/oidc/main.json (72%)
 rename config/identity/{interaction => handler}/routing/oidc/pick-webid.json (100%)
 rename config/identity/{interaction => handler}/routing/oidc/prompt.json (100%)
 rename config/identity/{interaction => handler}/routing/password/create.json (100%)
 rename config/identity/{interaction => handler}/routing/password/forgot.json (100%)
 rename config/identity/{interaction => handler}/routing/password/login.json (100%)
 create mode 100644 config/identity/handler/routing/password/main.json
 rename config/identity/{interaction => handler}/routing/password/reset.json (100%)
 rename config/identity/{interaction => handler}/routing/password/resource.json (100%)
 rename config/identity/{interaction => handler}/routing/pod/create.json (100%)
 rename config/identity/{interaction => handler}/routing/pod/resource.json (100%)
 rename config/identity/{interaction => handler}/routing/views/html.json (100%)
 rename config/identity/{interaction => handler}/routing/webid/link.json (100%)
 rename config/identity/{interaction => handler}/routing/webid/resource.json (100%)
 delete mode 100644 config/identity/interaction/default.json
 delete mode 100644 config/identity/interaction/no-accounts.json
 delete mode 100644 config/identity/interaction/no-pods.json
 delete mode 100644 config/identity/interaction/routing/password/main.json
 rename config/{http/handler/handlers/oidc.json => identity/oidc/default.json} (100%)
 create mode 100644 config/identity/oidc/disabled.json
 create mode 100644 config/ldp/handler/disabled.json
 create mode 100644 config/oidc.json

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index d49895c5b..98f7354fb 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -43,10 +43,13 @@ The `@context` needs to be updated to
 
 The following changes pertain to the imports in the default configs:
 
+- There is a new `identity/oidc` import set that needs to be added to each config.
+  Options are `default.json` and `disabled.json`.
 - There is a new `static-root.json` import option for `app/init`, setting a static page for the root container.
-- There is a new set of imports `identity/interaction` to determine the IDP features.
+- There are more `identity/handler` options to finetune account management availability.
 - There is a new set of imports `storage/location` to determine where the root storage of the server is located.
 - The `app/setup`and `identity/registration` imports have been removed.
+- There is a new `ldp/handler/disabled.json` import to disable the LDP API.
 
 The following changes are relevant for v6 custom configs that replaced certain features.
 
diff --git a/config/default.json b/config/default.json
index 42da36f12..2e3e615ea 100644
--- a/config/default.json
+++ b/config/default.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/dynamic.json b/config/dynamic.json
index 9780c7d40..03ba89d89 100644
--- a/config/dynamic.json
+++ b/config/dynamic.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/dynamic.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/example-https-file.json b/config/example-https-file.json
index f0c37f0a0..66529fc92 100644
--- a/config/example-https-file.json
+++ b/config/example-https-file.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/file-acp.json b/config/file-acp.json
index efbd5b01c..af1c96e99 100644
--- a/config/file-acp.json
+++ b/config/file-acp.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/file-root.json b/config/file-root.json
index 1b8961400..1e31139c0 100644
--- a/config/file-root.json
+++ b/config/file-root.json
@@ -11,8 +11,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/file.json b/config/file.json
index 7a8dde0fb..d3239399d 100644
--- a/config/file.json
+++ b/config/file.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/http/handler/default.json b/config/http/handler/default.json
index c90f00267..cef5aee3d 100644
--- a/config/http/handler/default.json
+++ b/config/http/handler/default.json
@@ -1,7 +1,6 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "import": [
-    "css:config/http/handler/handlers/oidc.json",
     "css:config/http/handler/handlers/storage-description.json"
   ],
   "@graph": [
diff --git a/config/https-file-cli.json b/config/https-file-cli.json
index a96ae265c..716e059fd 100644
--- a/config/https-file-cli.json
+++ b/config/https-file-cli.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/identity/README.md b/config/identity/README.md
index 3335355cb..1a7aac67b 100644
--- a/config/identity/README.md
+++ b/config/identity/README.md
@@ -25,9 +25,19 @@ Necessary for sending e-mail when using IDP.
 
 ## Handler
 
-Contains everything needed for setting up the Identity Provider.
+Contains everything needed for setting up the account management.
 
-* *default*: Contains all the core components of the IDP.
+* *default*: All account features enabled.
+* *disabled*: Completely disables everything account related.
+* *no-accounts*: Disables the creation of new accounts.
+* *no-pods*: Disables the creation of new pods.
+
+## OIDC
+
+Determines if OIDC interactions are supported as an identity provider.
+
+* *default*: OIDC is enabled.
+* *disabled*: OIDC is disabled.
 
 ## Interaction
 
diff --git a/config/identity/handler/base/default.json b/config/identity/handler/base/default.json
new file mode 100644
index 000000000..d7a6b89fa
--- /dev/null
+++ b/config/identity/handler/base/default.json
@@ -0,0 +1,45 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/identity/handler/adapter-factory/webid.json",
+    "css:config/identity/handler/jwks/default.json",
+    "css:config/identity/handler/provider-factory/identity.json",
+    "css:config/identity/handler/storage/default.json"
+  ],
+  "@graph": [
+    {
+      "comment": "Routes all IDP related requests to the relevant handlers.",
+      "@id": "urn:solid-server:default:IdentityProviderHandler",
+      "@type": "RouterHandler",
+      "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" },
+      "targetExtractor": { "@id": "urn:solid-server:default:TargetExtractor" },
+      "allowedPathNames": [ "^/.account/.*" ],
+      "handler": { "@id": "urn:solid-server:default:IdentityProviderParsingHandler" }
+    },
+    {
+      "comment": "Handles IDP input parsing.",
+      "@id": "urn:solid-server:default:IdentityProviderParsingHandler",
+      "@type": "ParsingHttpHandler",
+      "requestParser": { "@id": "urn:solid-server:default:RequestParser" },
+      "errorHandler": { "@id": "urn:solid-server:default:ErrorHandler" },
+      "responseWriter": { "@id": "urn:solid-server:default:ResponseWriter" },
+      "operationHandler": {
+        "comment": "Handles IDP input authorization. Permission reader should be set to allow all if no authorization is needed.",
+        "@type": "AuthorizingHttpHandler",
+        "@id": "urn:solid-server:default:IdentityProviderAuthorizingHandler",
+        "credentialsExtractor": { "@id": "urn:solid-server:default:CredentialsExtractor" },
+        "modesExtractor": { "@id": "urn:solid-server:default:ModesExtractor" },
+        "authorizer": { "@id": "urn:solid-server:default:Authorizer" },
+        "operationHandler": { "@id": "urn:solid-server:default:IdentityProviderHttpHandler" }
+      }
+    },
+    {
+      "comment": "Handles IDP handler behaviour.",
+      "@id": "urn:solid-server:default:IdentityProviderHttpHandler",
+      "@type": "IdentityProviderHttpHandler",
+      "providerFactory": { "@id": "urn:solid-server:default:IdentityProviderFactory" },
+      "cookieStore": { "@id": "urn:solid-server:default:CookieStore" },
+      "handler": { "@id": "urn:solid-server:default:InteractionHandler" }
+    }
+  ]
+}
diff --git a/config/identity/handler/default.json b/config/identity/handler/default.json
index 00fc69688..eefec9729 100644
--- a/config/identity/handler/default.json
+++ b/config/identity/handler/default.json
@@ -1,46 +1,19 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "import": [
-    "css:config/identity/handler/adapter-factory/webid.json",
-    "css:config/identity/handler/jwks/default.json",
-    "css:config/identity/handler/provider-factory/identity.json",
-    "css:config/identity/handler/storage/default.json",
-    "css:config/identity/handler/storage/password.json"
+    "css:config/identity/handler/base/default.json",
+    "css:config/identity/handler/routing/default.json",
+    "css:config/identity/handler/storage/password.json",
+
+    "css:config/identity/handler/enable/account.json",
+    "css:config/identity/handler/enable/client-credentials.json",
+    "css:config/identity/handler/enable/password.json",
+    "css:config/identity/handler/enable/pod.json",
+    "css:config/identity/handler/enable/webid.json"
   ],
   "@graph": [
     {
-      "comment": "Routes all IDP related requests to the relevant handlers.",
-      "@id": "urn:solid-server:default:IdentityProviderHandler",
-      "@type": "RouterHandler",
-      "baseUrl": { "@id": "urn:solid-server:default:variable:baseUrl" },
-      "targetExtractor": { "@id": "urn:solid-server:default:TargetExtractor" },
-      "allowedPathNames": [ "^/.account/.*" ],
-      "handler": { "@id": "urn:solid-server:default:IdentityProviderParsingHandler" }
-    },
-    {
-      "comment": "Handles IDP input parsing.",
-      "@id": "urn:solid-server:default:IdentityProviderParsingHandler",
-      "@type": "ParsingHttpHandler",
-      "requestParser": { "@id": "urn:solid-server:default:RequestParser" },
-      "errorHandler": { "@id": "urn:solid-server:default:ErrorHandler" },
-      "responseWriter": { "@id": "urn:solid-server:default:ResponseWriter" },
-      "operationHandler": {
-        "comment": "Handles IDP input authorization. Permission reader should be set to allow all if no authorization is needed.",
-        "@type": "AuthorizingHttpHandler",
-        "@id": "urn:solid-server:default:IdentityProviderAuthorizingHandler",
-        "credentialsExtractor": { "@id": "urn:solid-server:default:CredentialsExtractor" },
-        "modesExtractor": { "@id": "urn:solid-server:default:ModesExtractor" },
-        "authorizer": { "@id": "urn:solid-server:default:Authorizer" },
-        "operationHandler": { "@id": "urn:solid-server:default:IdentityProviderHttpHandler" }
-      }
-    },
-    {
-      "comment": "Handles IDP handler behaviour.",
-      "@id": "urn:solid-server:default:IdentityProviderHttpHandler",
-      "@type": "IdentityProviderHttpHandler",
-      "providerFactory": { "@id": "urn:solid-server:default:IdentityProviderFactory" },
-      "cookieStore": { "@id": "urn:solid-server:default:CookieStore" },
-      "handler": { "@id": "urn:solid-server:default:InteractionHandler" }
+      "comment": "Enables all account-related features."
     }
   ]
 }
diff --git a/config/identity/handler/disabled.json b/config/identity/handler/disabled.json
new file mode 100644
index 000000000..a97f83f34
--- /dev/null
+++ b/config/identity/handler/disabled.json
@@ -0,0 +1,15 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/identity/handler/base/default.json",
+    "css:config/identity/handler/routing/default.json",
+    "css:config/identity/handler/storage/password.json"
+  ],
+  "@graph": [
+    {
+      "comment": "Disabled the account component.",
+      "@id": "urn:solid-server:default:IdentityProviderHandler",
+      "@type": "UnsupportedAsyncHandler"
+    }
+  ]
+}
diff --git a/config/identity/interaction/enable/account.json b/config/identity/handler/enable/account.json
similarity index 100%
rename from config/identity/interaction/enable/account.json
rename to config/identity/handler/enable/account.json
diff --git a/config/identity/interaction/enable/client-credentials.json b/config/identity/handler/enable/client-credentials.json
similarity index 100%
rename from config/identity/interaction/enable/client-credentials.json
rename to config/identity/handler/enable/client-credentials.json
diff --git a/config/identity/interaction/enable/password.json b/config/identity/handler/enable/password.json
similarity index 100%
rename from config/identity/interaction/enable/password.json
rename to config/identity/handler/enable/password.json
diff --git a/config/identity/interaction/enable/pod.json b/config/identity/handler/enable/pod.json
similarity index 100%
rename from config/identity/interaction/enable/pod.json
rename to config/identity/handler/enable/pod.json
diff --git a/config/identity/interaction/enable/webid.json b/config/identity/handler/enable/webid.json
similarity index 100%
rename from config/identity/interaction/enable/webid.json
rename to config/identity/handler/enable/webid.json
diff --git a/config/identity/handler/no-accounts.json b/config/identity/handler/no-accounts.json
new file mode 100644
index 000000000..a8570d79d
--- /dev/null
+++ b/config/identity/handler/no-accounts.json
@@ -0,0 +1,18 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/identity/handler/base/default.json",
+    "css:config/identity/handler/routing/default.json",
+    "css:config/identity/handler/storage/password.json",
+
+    "css:config/identity/handler/enable/client-credentials.json",
+    "css:config/identity/handler/enable/password.json",
+    "css:config/identity/handler/enable/pod.json",
+    "css:config/identity/handler/enable/webid.json"
+  ],
+  "@graph": [
+    {
+      "comment": "Disables account creation."
+    }
+  ]
+}
diff --git a/config/identity/handler/no-pods.json b/config/identity/handler/no-pods.json
new file mode 100644
index 000000000..708397755
--- /dev/null
+++ b/config/identity/handler/no-pods.json
@@ -0,0 +1,18 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/identity/handler/base/default.json",
+    "css:config/identity/handler/routing/default.json",
+    "css:config/identity/handler/storage/password.json",
+
+    "css:config/identity/handler/enable/account.json",
+    "css:config/identity/handler/enable/client-credentials.json",
+    "css:config/identity/handler/enable/password.json",
+    "css:config/identity/handler/enable/webid.json"
+  ],
+  "@graph": [
+    {
+      "comment": "Disabled pod creation."
+    }
+  ]
+}
diff --git a/config/identity/interaction/routing/account/create.json b/config/identity/handler/routing/account/create.json
similarity index 100%
rename from config/identity/interaction/routing/account/create.json
rename to config/identity/handler/routing/account/create.json
diff --git a/config/identity/interaction/routing/account/login.json b/config/identity/handler/routing/account/login.json
similarity index 100%
rename from config/identity/interaction/routing/account/login.json
rename to config/identity/handler/routing/account/login.json
diff --git a/config/identity/interaction/routing/account/logout.json b/config/identity/handler/routing/account/logout.json
similarity index 100%
rename from config/identity/interaction/routing/account/logout.json
rename to config/identity/handler/routing/account/logout.json
diff --git a/config/identity/interaction/routing/account/main.json b/config/identity/handler/routing/account/main.json
similarity index 80%
rename from config/identity/interaction/routing/account/main.json
rename to config/identity/handler/routing/account/main.json
index 9591bc533..52db49d8a 100644
--- a/config/identity/interaction/routing/account/main.json
+++ b/config/identity/handler/routing/account/main.json
@@ -1,10 +1,10 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "import": [
-    "css:config/identity/interaction/routing/account/create.json",
-    "css:config/identity/interaction/routing/account/login.json",
-    "css:config/identity/interaction/routing/account/logout.json",
-    "css:config/identity/interaction/routing/account/resource.json"
+    "css:config/identity/handler/routing/account/create.json",
+    "css:config/identity/handler/routing/account/login.json",
+    "css:config/identity/handler/routing/account/logout.json",
+    "css:config/identity/handler/routing/account/resource.json"
   ],
   "@graph": [
     {
diff --git a/config/identity/interaction/routing/account/resource.json b/config/identity/handler/routing/account/resource.json
similarity index 100%
rename from config/identity/interaction/routing/account/resource.json
rename to config/identity/handler/routing/account/resource.json
diff --git a/config/identity/interaction/routing/client-credentials/create.json b/config/identity/handler/routing/client-credentials/create.json
similarity index 100%
rename from config/identity/interaction/routing/client-credentials/create.json
rename to config/identity/handler/routing/client-credentials/create.json
diff --git a/config/identity/interaction/routing/client-credentials/resource.json b/config/identity/handler/routing/client-credentials/resource.json
similarity index 100%
rename from config/identity/interaction/routing/client-credentials/resource.json
rename to config/identity/handler/routing/client-credentials/resource.json
diff --git a/config/identity/interaction/routing/core/index.json b/config/identity/handler/routing/core/index.json
similarity index 100%
rename from config/identity/interaction/routing/core/index.json
rename to config/identity/handler/routing/core/index.json
diff --git a/config/identity/interaction/routing/core/login.json b/config/identity/handler/routing/core/login.json
similarity index 100%
rename from config/identity/interaction/routing/core/login.json
rename to config/identity/handler/routing/core/login.json
diff --git a/config/identity/interaction/routing/core/main.json b/config/identity/handler/routing/core/main.json
similarity index 89%
rename from config/identity/interaction/routing/core/main.json
rename to config/identity/handler/routing/core/main.json
index 73978b3cb..e9465c3a0 100644
--- a/config/identity/interaction/routing/core/main.json
+++ b/config/identity/handler/routing/core/main.json
@@ -1,8 +1,8 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "import": [
-    "css:config/identity/interaction/routing/core/index.json",
-    "css:config/identity/interaction/routing/core/login.json"
+    "css:config/identity/handler/routing/core/index.json",
+    "css:config/identity/handler/routing/core/login.json"
   ],
   "@graph": [
     {
diff --git a/config/identity/interaction/routing/default.json b/config/identity/handler/routing/default.json
similarity index 80%
rename from config/identity/interaction/routing/default.json
rename to config/identity/handler/routing/default.json
index ed5d6c9d1..c35d3b8e7 100644
--- a/config/identity/interaction/routing/default.json
+++ b/config/identity/handler/routing/default.json
@@ -1,18 +1,18 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "import": [
-    "css:config/identity/interaction/routing/account/main.json",
-    "css:config/identity/interaction/routing/client-credentials/create.json",
-    "css:config/identity/interaction/routing/client-credentials/resource.json",
-    "css:config/identity/interaction/routing/core/main.json",
-    "css:config/identity/interaction/routing/oidc/main.json",
-    "css:config/identity/interaction/routing/password/main.json",
-    "css:config/identity/interaction/routing/pod/create.json",
-    "css:config/identity/interaction/routing/pod/resource.json",
-    "css:config/identity/interaction/routing/webid/link.json",
-    "css:config/identity/interaction/routing/webid/resource.json",
+    "css:config/identity/handler/routing/account/main.json",
+    "css:config/identity/handler/routing/client-credentials/create.json",
+    "css:config/identity/handler/routing/client-credentials/resource.json",
+    "css:config/identity/handler/routing/core/main.json",
+    "css:config/identity/handler/routing/oidc/main.json",
+    "css:config/identity/handler/routing/password/main.json",
+    "css:config/identity/handler/routing/pod/create.json",
+    "css:config/identity/handler/routing/pod/resource.json",
+    "css:config/identity/handler/routing/webid/link.json",
+    "css:config/identity/handler/routing/webid/resource.json",
 
-    "css:config/identity/interaction/routing/views/html.json"
+    "css:config/identity/handler/routing/views/html.json"
   ],
   "@graph": [
     {
diff --git a/config/identity/interaction/routing/oidc/cancel.json b/config/identity/handler/routing/oidc/cancel.json
similarity index 100%
rename from config/identity/interaction/routing/oidc/cancel.json
rename to config/identity/handler/routing/oidc/cancel.json
diff --git a/config/identity/interaction/routing/oidc/consent.json b/config/identity/handler/routing/oidc/consent.json
similarity index 100%
rename from config/identity/interaction/routing/oidc/consent.json
rename to config/identity/handler/routing/oidc/consent.json
diff --git a/config/identity/interaction/routing/oidc/forget-webid.json b/config/identity/handler/routing/oidc/forget-webid.json
similarity index 100%
rename from config/identity/interaction/routing/oidc/forget-webid.json
rename to config/identity/handler/routing/oidc/forget-webid.json
diff --git a/config/identity/interaction/routing/oidc/main.json b/config/identity/handler/routing/oidc/main.json
similarity index 72%
rename from config/identity/interaction/routing/oidc/main.json
rename to config/identity/handler/routing/oidc/main.json
index 72df29378..0d13b5372 100644
--- a/config/identity/interaction/routing/oidc/main.json
+++ b/config/identity/handler/routing/oidc/main.json
@@ -1,11 +1,11 @@
 {
   "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
   "import": [
-    "css:config/identity/interaction/routing/oidc/cancel.json",
-    "css:config/identity/interaction/routing/oidc/consent.json",
-    "css:config/identity/interaction/routing/oidc/forget-webid.json",
-    "css:config/identity/interaction/routing/oidc/prompt.json",
-    "css:config/identity/interaction/routing/oidc/pick-webid.json"
+    "css:config/identity/handler/routing/oidc/cancel.json",
+    "css:config/identity/handler/routing/oidc/consent.json",
+    "css:config/identity/handler/routing/oidc/forget-webid.json",
+    "css:config/identity/handler/routing/oidc/prompt.json",
+    "css:config/identity/handler/routing/oidc/pick-webid.json"
   ],
   "@graph": [
     {
diff --git a/config/identity/interaction/routing/oidc/pick-webid.json b/config/identity/handler/routing/oidc/pick-webid.json
similarity index 100%
rename from config/identity/interaction/routing/oidc/pick-webid.json
rename to config/identity/handler/routing/oidc/pick-webid.json
diff --git a/config/identity/interaction/routing/oidc/prompt.json b/config/identity/handler/routing/oidc/prompt.json
similarity index 100%
rename from config/identity/interaction/routing/oidc/prompt.json
rename to config/identity/handler/routing/oidc/prompt.json
diff --git a/config/identity/interaction/routing/password/create.json b/config/identity/handler/routing/password/create.json
similarity index 100%
rename from config/identity/interaction/routing/password/create.json
rename to config/identity/handler/routing/password/create.json
diff --git a/config/identity/interaction/routing/password/forgot.json b/config/identity/handler/routing/password/forgot.json
similarity index 100%
rename from config/identity/interaction/routing/password/forgot.json
rename to config/identity/handler/routing/password/forgot.json
diff --git a/config/identity/interaction/routing/password/login.json b/config/identity/handler/routing/password/login.json
similarity index 100%
rename from config/identity/interaction/routing/password/login.json
rename to config/identity/handler/routing/password/login.json
diff --git a/config/identity/handler/routing/password/main.json b/config/identity/handler/routing/password/main.json
new file mode 100644
index 000000000..4b33b76a5
--- /dev/null
+++ b/config/identity/handler/routing/password/main.json
@@ -0,0 +1,11 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/identity/handler/routing/password/create.json",
+    "css:config/identity/handler/routing/password/forgot.json",
+    "css:config/identity/handler/routing/password/login.json",
+    "css:config/identity/handler/routing/password/reset.json",
+    "css:config/identity/handler/routing/password/resource.json"
+  ],
+  "@graph": []
+}
diff --git a/config/identity/interaction/routing/password/reset.json b/config/identity/handler/routing/password/reset.json
similarity index 100%
rename from config/identity/interaction/routing/password/reset.json
rename to config/identity/handler/routing/password/reset.json
diff --git a/config/identity/interaction/routing/password/resource.json b/config/identity/handler/routing/password/resource.json
similarity index 100%
rename from config/identity/interaction/routing/password/resource.json
rename to config/identity/handler/routing/password/resource.json
diff --git a/config/identity/interaction/routing/pod/create.json b/config/identity/handler/routing/pod/create.json
similarity index 100%
rename from config/identity/interaction/routing/pod/create.json
rename to config/identity/handler/routing/pod/create.json
diff --git a/config/identity/interaction/routing/pod/resource.json b/config/identity/handler/routing/pod/resource.json
similarity index 100%
rename from config/identity/interaction/routing/pod/resource.json
rename to config/identity/handler/routing/pod/resource.json
diff --git a/config/identity/interaction/routing/views/html.json b/config/identity/handler/routing/views/html.json
similarity index 100%
rename from config/identity/interaction/routing/views/html.json
rename to config/identity/handler/routing/views/html.json
diff --git a/config/identity/interaction/routing/webid/link.json b/config/identity/handler/routing/webid/link.json
similarity index 100%
rename from config/identity/interaction/routing/webid/link.json
rename to config/identity/handler/routing/webid/link.json
diff --git a/config/identity/interaction/routing/webid/resource.json b/config/identity/handler/routing/webid/resource.json
similarity index 100%
rename from config/identity/interaction/routing/webid/resource.json
rename to config/identity/handler/routing/webid/resource.json
diff --git a/config/identity/interaction/default.json b/config/identity/interaction/default.json
deleted file mode 100644
index 42c50b204..000000000
--- a/config/identity/interaction/default.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
-  "import": [
-    "css:config/identity/interaction/routing/default.json",
-    "css:config/identity/interaction/enable/account.json",
-    "css:config/identity/interaction/enable/client-credentials.json",
-    "css:config/identity/interaction/enable/password.json",
-    "css:config/identity/interaction/enable/pod.json",
-    "css:config/identity/interaction/enable/webid.json"
-  ],
-  "@graph": [
-    {
-      "comment": "Enables all account-related features."
-    }
-  ]
-}
diff --git a/config/identity/interaction/no-accounts.json b/config/identity/interaction/no-accounts.json
deleted file mode 100644
index 4d25c2c35..000000000
--- a/config/identity/interaction/no-accounts.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
-  "import": [
-    "css:config/identity/interaction/routing/default.json",
-    "css:config/identity/interaction/enable/client-credentials.json",
-    "css:config/identity/interaction/enable/password.json",
-    "css:config/identity/interaction/enable/pod.json",
-    "css:config/identity/interaction/enable/webid.json"
-  ],
-  "@graph": [
-    {
-      "comment": "Disables account creation."
-    }
-  ]
-}
diff --git a/config/identity/interaction/no-pods.json b/config/identity/interaction/no-pods.json
deleted file mode 100644
index 92091ad3f..000000000
--- a/config/identity/interaction/no-pods.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
-  "import": [
-    "css:config/identity/interaction/routing/default.json",
-    "css:config/identity/interaction/enable/account.json",
-    "css:config/identity/interaction/enable/client-credentials.json",
-    "css:config/identity/interaction/enable/password.json",
-    "css:config/identity/interaction/enable/webid.json"
-  ],
-  "@graph": [
-    {
-      "comment": "Disabled pod creation."
-    }
-  ]
-}
diff --git a/config/identity/interaction/routing/password/main.json b/config/identity/interaction/routing/password/main.json
deleted file mode 100644
index 0e9a509e3..000000000
--- a/config/identity/interaction/routing/password/main.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
-  "import": [
-    "css:config/identity/interaction/routing/password/create.json",
-    "css:config/identity/interaction/routing/password/forgot.json",
-    "css:config/identity/interaction/routing/password/login.json",
-    "css:config/identity/interaction/routing/password/reset.json",
-    "css:config/identity/interaction/routing/password/resource.json"
-  ],
-  "@graph": []
-}
diff --git a/config/http/handler/handlers/oidc.json b/config/identity/oidc/default.json
similarity index 100%
rename from config/http/handler/handlers/oidc.json
rename to config/identity/oidc/default.json
diff --git a/config/identity/oidc/disabled.json b/config/identity/oidc/disabled.json
new file mode 100644
index 000000000..123cdf9bd
--- /dev/null
+++ b/config/identity/oidc/disabled.json
@@ -0,0 +1,10 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "@graph": [
+    {
+      "comment": "Disabled the OIDC component.",
+      "@id": "urn:solid-server:default:OidcHandler",
+      "@type": "UnsupportedAsyncHandler"
+    }
+  ]
+}
diff --git a/config/ldp/handler/disabled.json b/config/ldp/handler/disabled.json
new file mode 100644
index 000000000..ee8525fa4
--- /dev/null
+++ b/config/ldp/handler/disabled.json
@@ -0,0 +1,19 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/ldp/handler/components/authorizer.json",
+    "css:config/ldp/handler/components/error-handler.json",
+    "css:config/ldp/handler/components/operation-handler.json",
+    "css:config/ldp/handler/components/operation-metadata.json",
+    "css:config/ldp/handler/components/preferences.json",
+    "css:config/ldp/handler/components/request-parser.json",
+    "css:config/ldp/handler/components/response-writer.json"
+  ],
+  "@graph": [
+    {
+      "comment": "Disabled the LDP component.",
+      "@id": "urn:solid-server:default:LdpHandler",
+      "@type": "UnsupportedAsyncHandler"
+    }
+  ]
+}
diff --git a/config/memory-subdomains.json b/config/memory-subdomains.json
index ac65e72ba..cd9b15338 100644
--- a/config/memory-subdomains.json
+++ b/config/memory-subdomains.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/oidc.json b/config/oidc.json
new file mode 100644
index 000000000..f7b22cedf
--- /dev/null
+++ b/config/oidc.json
@@ -0,0 +1,44 @@
+{
+  "@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^6.0.0/components/context.jsonld",
+  "import": [
+    "css:config/app/main/default.json",
+    "css:config/app/init/static-root.json",
+    "css:config/app/variables/default.json",
+    "css:config/http/handler/default.json",
+    "css:config/http/middleware/default.json",
+    "css:config/http/notifications/disabled.json",
+    "css:config/http/server-factory/http.json",
+    "css:config/http/static/default.json",
+    "css:config/identity/access/public.json",
+    "css:config/identity/email/default.json",
+    "css:config/identity/handler/no-pods.json",
+    "css:config/identity/oidc/default.json",
+    "css:config/identity/ownership/token.json",
+    "css:config/identity/pod/static.json",
+    "css:config/ldp/authentication/dpop-bearer.json",
+    "css:config/ldp/authorization/allow-all.json",
+    "css:config/ldp/handler/disabled.json",
+    "css:config/ldp/metadata-parser/default.json",
+    "css:config/ldp/metadata-writer/default.json",
+    "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/empty.json",
+    "css:config/util/identifiers/suffix.json",
+    "css:config/util/index/default.json",
+    "css:config/util/logging/winston.json",
+    "css:config/util/representation-conversion/default.json",
+    "css:config/util/resource-locker/file.json",
+    "css:config/util/variables/default.json"
+  ],
+  "@graph": [
+    {
+      "comment": [
+        "A Solid server that only supports account management and OIDC interaction, without pods.",
+        "Note that several of the imports above are irrelevant due to there not being pods."
+      ]
+    }
+  ]
+}
diff --git a/config/path-routing.json b/config/path-routing.json
index 8e4722d96..5ca80b4aa 100644
--- a/config/path-routing.json
+++ b/config/path-routing.json
@@ -11,8 +11,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/quota-file.json b/config/quota-file.json
index 0fb9d4067..000b339b2 100644
--- a/config/quota-file.json
+++ b/config/quota-file.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/restrict-idp.json b/config/restrict-idp.json
index ddb5768cb..c72a49775 100644
--- a/config/restrict-idp.json
+++ b/config/restrict-idp.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/restricted.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/sparql-endpoint-root.json b/config/sparql-endpoint-root.json
index 9e494a0cc..4ca35e650 100644
--- a/config/sparql-endpoint-root.json
+++ b/config/sparql-endpoint-root.json
@@ -11,8 +11,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/sparql-endpoint.json b/config/sparql-endpoint.json
index 77162ebea..3eb038ab3 100644
--- a/config/sparql-endpoint.json
+++ b/config/sparql-endpoint.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/config/sparql-file-storage.json b/config/sparql-file-storage.json
index 353c349bf..5bdf5008b 100644
--- a/config/sparql-file-storage.json
+++ b/config/sparql-file-storage.json
@@ -12,7 +12,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/templates/identity/account/resource.html.ejs b/templates/identity/account/resource.html.ejs
index fbe904d53..dd74d5287 100644
--- a/templates/identity/account/resource.html.ejs
+++ b/templates/identity/account/resource.html.ejs
@@ -59,8 +59,8 @@
       'Are you sure you want to delete this login method? This will prevent you from logging in to your account with these credentials.');
 
     // Update pod entries
-    const { pods } = await fetchJson(controls.account.pod);
-    if (!controls.html.account.createPod && Object.keys(pods).length === 0) {
+    const { pods } = controls.account.pod ? await fetchJson(controls.account.pod) : {};
+    if (!controls.html.account.createPod && Object.keys(pods ?? {}).length === 0) {
       setVisibility('pods', false);
     } else {
       updateElement('createPod', controls.html.account.createPod, { href: true });
@@ -68,8 +68,8 @@
     }
 
     // Update WebID entries
-    const { webIdLinks } = await fetchJson(controls.account.webId);
-    if (!controls.html.account.linkWebId && Object.keys(webIdLinks).length === 0) {
+    const { webIdLinks } = controls.account.webId ? await fetchJson(controls.account.webId) : {};
+    if (!controls.html.account.linkWebId && Object.keys(webIdLinks ?? {}).length === 0) {
       setVisibility('webIds', false);
     } else {
       updateElement('linkWebId', controls.html.account.linkWebId, { href: true });
@@ -80,8 +80,8 @@
     }
 
     // Update Client Credentials entries
-    const { clientCredentials } = await fetchJson(controls.account.clientCredentials);
-    if (!controls.html.account.createClientCredentials && Object.keys(clientCredentials).length === 0) {
+    const { clientCredentials } = controls.account.clientCredentials ? await fetchJson(controls.account.clientCredentials) : {};
+    if (!controls.html.account.createClientCredentials && Object.keys(clientCredentials ?? {}).length === 0) {
       setVisibility('clientCredentials', false);
     } else {
       // Initial boolean is so the create button gets hidden if the account has no WebIDs.
diff --git a/test/integration/config/file-pod.json b/test/integration/config/file-pod.json
index 8f1824b32..3ff14f1d6 100644
--- a/test/integration/config/file-pod.json
+++ b/test/integration/config/file-pod.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/example.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/ldp-with-acp.json b/test/integration/config/ldp-with-acp.json
index d6cb3f569..911b4831e 100644
--- a/test/integration/config/ldp-with-acp.json
+++ b/test/integration/config/ldp-with-acp.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
 
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/ldp-with-auth.json b/test/integration/config/ldp-with-auth.json
index ea49cc7bb..ff82f955c 100644
--- a/test/integration/config/ldp-with-auth.json
+++ b/test/integration/config/ldp-with-auth.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
 
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/legacy-websockets.json b/test/integration/config/legacy-websockets.json
index be555f20e..aeaf13e64 100644
--- a/test/integration/config/legacy-websockets.json
+++ b/test/integration/config/legacy-websockets.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/memory-pod.json b/test/integration/config/memory-pod.json
index 1062e7690..3ee765441 100644
--- a/test/integration/config/memory-pod.json
+++ b/test/integration/config/memory-pod.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/example.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/permission-table.json b/test/integration/config/permission-table.json
index 3ead1c696..8724c2aef 100644
--- a/test/integration/config/permission-table.json
+++ b/test/integration/config/permission-table.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
 
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/quota-global.json b/test/integration/config/quota-global.json
index 540f943a4..1f05abedf 100644
--- a/test/integration/config/quota-global.json
+++ b/test/integration/config/quota-global.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/quota-pod.json b/test/integration/config/quota-pod.json
index 4bed789c7..ae2909ba6 100644
--- a/test/integration/config/quota-pod.json
+++ b/test/integration/config/quota-pod.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/restricted-idp.json b/test/integration/config/restricted-idp.json
index 843418055..a88e4496e 100644
--- a/test/integration/config/restricted-idp.json
+++ b/test/integration/config/restricted-idp.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/restricted.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/server-dynamic-unsafe.json b/test/integration/config/server-dynamic-unsafe.json
index a14dec36a..19a076225 100644
--- a/test/integration/config/server-dynamic-unsafe.json
+++ b/test/integration/config/server-dynamic-unsafe.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/unsafe-no-check.json",
     "css:config/identity/pod/dynamic.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/server-file.json b/test/integration/config/server-file.json
index 1d39cdd0b..4de723510 100644
--- a/test/integration/config/server-file.json
+++ b/test/integration/config/server-file.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
 
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/server-memory.json b/test/integration/config/server-memory.json
index aae4f109a..0152c408b 100644
--- a/test/integration/config/server-memory.json
+++ b/test/integration/config/server-memory.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
 
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/server-middleware.json b/test/integration/config/server-middleware.json
index c1b40eeff..cfa445896 100644
--- a/test/integration/config/server-middleware.json
+++ b/test/integration/config/server-middleware.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/server-redis-lock.json b/test/integration/config/server-redis-lock.json
index 8adf98b41..1fa847f17 100644
--- a/test/integration/config/server-redis-lock.json
+++ b/test/integration/config/server-redis-lock.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/unsafe-no-check.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/server-subdomains-unsafe.json b/test/integration/config/server-subdomains-unsafe.json
index 983e8666c..42bafcf3e 100644
--- a/test/integration/config/server-subdomains-unsafe.json
+++ b/test/integration/config/server-subdomains-unsafe.json
@@ -11,7 +11,7 @@
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
     "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/default.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/unsafe-no-check.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/server-without-auth.json b/test/integration/config/server-without-auth.json
index da86fcb84..604b5c282 100644
--- a/test/integration/config/server-without-auth.json
+++ b/test/integration/config/server-without-auth.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/unsafe-no-check.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/dpop-bearer.json",
diff --git a/test/integration/config/webhook-notifications.json b/test/integration/config/webhook-notifications.json
index b29b2b5d8..79bba120a 100644
--- a/test/integration/config/webhook-notifications.json
+++ b/test/integration/config/webhook-notifications.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",
diff --git a/test/integration/config/websocket-notifications.json b/test/integration/config/websocket-notifications.json
index 794eb56ed..562bec188 100644
--- a/test/integration/config/websocket-notifications.json
+++ b/test/integration/config/websocket-notifications.json
@@ -10,8 +10,8 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "css:config/identity/handler/default.json",
-    "css:config/identity/interaction/no-accounts.json",
+    "css:config/identity/handler/no-accounts.json",
+    "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
     "css:config/ldp/authentication/debug-auth-header.json",