refactor: Use Components.js override for account handler

Author: joachimvh

packages/css/config/default.json

@@ -14,7 +14,7 @@
     "css:config/http/static/default.json",
     "css:config/identity/access/public.json",
     "css:config/identity/email/default.json",
-    "uma-css:config/identity/handler/default.json",
+    "css:config/identity/handler/default.json",
     "css:config/identity/oidc/default.json",
     "css:config/identity/ownership/token.json",
     "css:config/identity/pod/static.json",
@@ -76,6 +76,20 @@
           }
         }
       }]
+    },
+    {
+      "comment": "Replace the account store with the UMA version that stores AS settings.",
+      "@id": "urn:solid-server:override:AccountStore",
+      "@type": "Override",
+      "overrideInstance": {
+        "@id": "urn:solid-server:default:AccountStore"
+      },
+      "overrideParameters": {
+        "@type": "UmaAccountStore",
+        "storage": {
+          "@id": "urn:solid-server:default:AccountStorage"
+        }
+      }
     }
   ]
 }

packages/css/config/identity/handler/base/default.json

@@ -1,10 +1,10 @@
 
 import { Initializer, getLoggerFor, createErrorMessage, InternalServerError } from '@solid/community-server';
 import { AccountLoginStorage, ACCOUNT_TYPE } from './LoginStorage';
-import { ACCOUNT_SETTINGS_AS_TOKEN, ACCOUNT_SETTINGS_AUTHZ_SERVER, ACCOUNT_SETTINGS_KEYS, 
+import { ACCOUNT_SETTINGS_AS_TOKEN, ACCOUNT_SETTINGS_AUTHZ_SERVER, ACCOUNT_SETTINGS_KEYS,
   ACCOUNT_SETTINGS_REMEMBER_LOGIN, AccountSettings, AccountStore } from './AccountStore';
 import { ValueType } from '../../../../storage/keyvalue/IndexedStorage';
-  
+
 export const ACCOUNT_STORAGE_DESCRIPTION = {
   [ACCOUNT_SETTINGS_REMEMBER_LOGIN]: 'boolean?',
   [ACCOUNT_SETTINGS_AUTHZ_SERVER]: 'string?',
@@ -16,7 +16,7 @@ export const ACCOUNT_STORAGE_DESCRIPTION = {
  * A {@link AccountStore} that uses an {@link AccountLoginStorage} to keep track of the accounts.
  * Needs to be initialized before it can be used.
  */
-export class BaseAccountStore extends Initializer implements AccountStore {
+export class UmaAccountStore extends Initializer implements AccountStore {
   private readonly logger = getLoggerFor(this);
 
   private readonly storage: AccountLoginStorage<{ [ACCOUNT_TYPE]: typeof ACCOUNT_STORAGE_DESCRIPTION }>;

packages/css/config/identity/handler/default.json

@@ -9,8 +9,8 @@ export * from './http/output/metadata/UmaTicketMetadataWriter';
 // export * from './identity/configuration/InMemoryJwksKeyHolder';
 
 export * from './identity/interaction/account/util/AccountStore';
-export * from './identity/interaction/account/util/BaseAccountStore';
 export * from './identity/interaction/account/util/LoginStorage';
+export * from './identity/interaction/account/util/UmaAccountStore';
 
 export * from './init/UmaSeededAccountInitializer';