diff --git a/packages/core/src/common/utils/platform-specific-version.injectable.ts b/packages/core/src/common/utils/platform-specific-version.injectable.ts index 71f611216d..79abad6a49 100644 --- a/packages/core/src/common/utils/platform-specific-version.injectable.ts +++ b/packages/core/src/common/utils/platform-specific-version.injectable.ts @@ -17,17 +17,11 @@ const platformSpecificVersionInjectable = getInjectable({ instantiate: (di: DiContainerForInjection) => { const targetPlatform = di.inject(platformInjectable); - return (token: InjectionToken, void>) => { - const impls = di.injectMany(token); - - const impl = impls.find(impl => impl.platform === targetPlatform); - - if (!impl) { - throw new Error(`No platform specific implementation of "${token.id}" found`); - } - - return impl.instantiate(); - }; + return (token: InjectionToken, void>) => ( + di.injectMany(token) + .find(impl => impl.platform === targetPlatform) + ?.instantiate() + ); }, }); diff --git a/packages/core/src/features/certificate-authorities/main/request-system-cas.injectable.ts b/packages/core/src/features/certificate-authorities/main/request-system-cas.injectable.ts index 814bbdbde6..f17f538529 100644 --- a/packages/core/src/features/certificate-authorities/main/request-system-cas.injectable.ts +++ b/packages/core/src/features/certificate-authorities/main/request-system-cas.injectable.ts @@ -8,7 +8,12 @@ import { platformSpecificRequestSystemCAsInjectionToken, requestSystemCAsInjecti const requestSystemCAsInjectable = getInjectable({ id: "request-system-cas", - instantiate: (di) => di.inject(platformSpecificVersionInjectable)(platformSpecificRequestSystemCAsInjectionToken), + instantiate: (di) => { + const platformSpecificVersion = di.inject(platformSpecificVersionInjectable); + const platformSpecificRequestSystemCAs = platformSpecificVersion(platformSpecificRequestSystemCAsInjectionToken); + + return platformSpecificRequestSystemCAs ?? (async () => []); + }, injectionToken: requestSystemCAsInjectionToken, });