@twin.org/dataspace-control-plane-service 0.9.1-next.6 → 0.9.1-next.8

package/dist/es/dataspaceControlPlaneService.js

@@ -192,7 +192,7 @@ export class DataspaceControlPlaneService {
         this._trustComponent = ComponentFactory.get(options?.trustComponentType ?? "trust");
         this._overrideTrustGeneratorType = options?.config?.overrideTrustGeneratorType;
         this._dataPlanePath = Is.stringValue(options?.config?.dataPlanePath)
-            ? StringHelper.trimTrailingSlashes(StringHelper.trimLeadingSlashes(options.config.dataPlanePath))
+            ? StringHelper.trimLeadingAndTrailingSlashes(options.config.dataPlanePath)
             : undefined;
         this._callbackPath = Is.stringValue(options?.config?.callbackPath)
             ? StringHelper.trimLeadingAndTrailingSlashes(options.config.callbackPath)
@@ -281,72 +281,6 @@ export class DataspaceControlPlaneService {
             });
             return;
         }
-        await this._loggingComponent?.log({
-            level: "info",
-            ts: Date.now(),
-            source: DataspaceControlPlaneService.CLASS_NAME,
-            message: "populatingFederatedCatalogue"
-        });
-        let registeredCount = 0;
-        let errorCount = 0;
-        let totalDatasets = 0;
-        // The platform component execute is used so that the dataset publication runs in the
-        // tenant context, also works in single tenant mode
-        await this._platformComponent.execute(async () => {
-            // The tenant context id is set here for each system tenant
-            let cursor;
-            do {
-                const page = await this._dataspaceAppDatasetStorage.query(undefined, undefined, undefined, cursor);
-                if (Is.arrayValue(page.entities)) {
-                    for (const entity of page.entities) {
-                        const appDataset = entity;
-                        totalDatasets++;
-                        try {
-                            await this.publishAppDataset(appDataset);
-                            registeredCount++;
-                            await this._loggingComponent?.log({
-                                level: "debug",
-                                ts: Date.now(),
-                                source: DataspaceControlPlaneService.CLASS_NAME,
-                                message: "datasetRegistered",
-                                data: {
-                                    datasetId: appDataset.id,
-                                    appId: appDataset.appId,
-                                    tenantId: appDataset.tenantId
-                                }
-                            });
-                        }
-                        catch (error) {
-                            errorCount++;
-                            await this._loggingComponent?.log({
-                                level: "error",
-                                ts: Date.now(),
-                                source: DataspaceControlPlaneService.CLASS_NAME,
-                                message: "datasetPublishFailed",
-                                error: BaseError.fromError(error),
-                                data: {
-                                    datasetId: appDataset.id,
-                                    appId: appDataset.appId,
-                                    tenantId: appDataset.tenantId
-                                }
-                            });
-                        }
-                    }
-                }
-                cursor = page.cursor;
-            } while (Is.stringValue(cursor));
-        });
-        await this._loggingComponent?.log({
-            level: "info",
-            ts: Date.now(),
-            source: DataspaceControlPlaneService.CLASS_NAME,
-            message: "federatedCataloguePopulated",
-            data: {
-                registeredCount,
-                errorCount,
-                totalDatasets
-            }
-        });
         if (this._taskScheduler) {
             await this._taskScheduler.addTask("control-plane-negotiation-cleanup", [
                 {
@@ -560,12 +494,7 @@ export class DataspaceControlPlaneService {
         // Callback the provider POSTs DSP messages back to: mount path + `?organization=` so the inbound
         // POST routes to the right consumer tenant (mirrors buildCallbackUrl). The bare `origin` is kept for
         // the PUSH-inbox base below (a different mount).
-        let callbackAddress = Is.stringValue(this._callbackPath)
-            ? `${origin}/${this._callbackPath}`
-            : origin;
-        if (Is.stringValue(organizationIdentity)) {
-            callbackAddress = HttpUrlHelper.addQueryStringParam(callbackAddress, ContextIdKeys.Organization, organizationIdentity);
-        }
+        const callbackAddress = HttpUrlHelper.addQueryStringParam(Is.stringValue(this._callbackPath) ? `${origin}/${this._callbackPath}` : origin, ContextIdKeys.Organization, organizationIdentity);
         const transferRequestMessage = {
             "@context": [DataspaceProtocolContexts.Context],
             "@type": DataspaceProtocolTransferProcessTypes.TransferRequestMessage,