feat: Update configurations so ldp/accounts/oidc can be disabled

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.
 

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",

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",

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",

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",

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",

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",

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": [

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",

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
 

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" }
+    }
+  ]
+}

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."
     }
   ]
 }

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"
+    }
+  ]
+}

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."
+    }
+  ]
+}

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."
+    }
+  ]
+}

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": [
     {

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": [
     {

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": [
     {

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": [
     {

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": []
+}

config/identity/interaction/default.json

@@ -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."
-    }
-  ]
-}

config/identity/interaction/no-accounts.json

@@ -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."
-    }
-  ]
-}

config/identity/interaction/no-pods.json

@@ -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."
-    }
-  ]
-}

config/identity/interaction/routing/password/main.json

@@ -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": []
-}

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"
+    }
+  ]
+}

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"
+    }
+  ]
+}

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",

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."
+      ]
+    }
+  ]
+}

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",

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",

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",

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",

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",

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",

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.

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",

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",