Skip to content

Commit bc77c0c

Browse files
skyflow-bhartiskyflow-bharti
committed
SK-2682 add target in bus events
1 parent 128463d commit bc77c0c

8 files changed

Lines changed: 172 additions & 148 deletions

File tree

‎src/core/external/collect/compose-collect-container.ts‎

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -461,20 +461,22 @@ class ComposableContainer extends Container {
461461
reject(err);
462462
});
463463
window.addEventListener('message', (event) => {
464-
if (event.data?.type
464+
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
465+
if (event?.data?.type
465466
=== ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_CALL_RESPONSE + this.#containerId) {
466-
const data = event.data.data;
467-
if (!data || data?.error) {
468-
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
469-
reject(data?.error);
470-
} else if (data?.records) {
471-
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
472-
MessageType.LOG,
473-
this.#context.logLevel);
474-
resolve(data);
475-
} else {
476-
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
477-
reject(data);
467+
const data = event.data.data;
468+
if (!data || data?.error) {
469+
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
470+
reject(data?.error);
471+
} else if (data?.records) {
472+
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
473+
MessageType.LOG,
474+
this.#context.logLevel);
475+
resolve(data);
476+
} else {
477+
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
478+
reject(data);
479+
}
478480
}
479481
}
480482
});
@@ -546,20 +548,22 @@ class ComposableContainer extends Container {
546548
errorMessages: this.#customErrorMessages,
547549
});
548550
window.addEventListener('message', (event) => {
549-
if (event.data?.type
551+
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
552+
if (event.data?.type
550553
=== ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_FILE_CALL_RESPONSE + this.#containerId) {
551-
const data = event.data.data;
552-
if (!data || data?.error) {
553-
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
554-
reject(data?.error);
555-
} else if (data?.fileUploadResponse) {
556-
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
557-
MessageType.LOG,
558-
this.#context.logLevel);
559-
resolve(data);
560-
} else {
561-
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
562-
reject(data);
554+
const data = event.data.data;
555+
if (!data || data?.error) {
556+
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
557+
reject(data?.error);
558+
} else if (data?.fileUploadResponse) {
559+
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
560+
MessageType.LOG,
561+
this.#context.logLevel);
562+
resolve(data);
563+
} else {
564+
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
565+
reject(data);
566+
}
563567
}
564568
}
565569
});

‎src/core/external/reveal/composable-reveal-container.ts‎

Lines changed: 53 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -376,23 +376,25 @@ class ComposableRevealContainer extends Container {
376376
);
377377

378378
window?.addEventListener('message', (event) => {
379-
if (event?.data?.type
379+
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
380+
if (event?.data?.type
380381
=== ELEMENT_EVENTS_TO_IFRAME.REVEAL_RESPONSE_READY + this.#containerId) {
381-
const revealData = event?.data?.data;
382-
if (revealData?.errors) {
383-
printLog(
384-
parameterizedString(logs?.errorLogs?.FAILED_REVEAL),
385-
MessageType.ERROR,
386-
this.#context?.logLevel,
387-
);
388-
reject(revealData);
389-
} else {
390-
printLog(
391-
parameterizedString(logs?.infoLogs?.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
392-
MessageType.LOG,
393-
this.#context?.logLevel,
394-
);
395-
resolve(revealData);
382+
const revealData = event?.data?.data;
383+
if (revealData?.errors) {
384+
printLog(
385+
parameterizedString(logs?.errorLogs?.FAILED_REVEAL),
386+
MessageType.ERROR,
387+
this.#context?.logLevel,
388+
);
389+
reject(revealData);
390+
} else {
391+
printLog(
392+
parameterizedString(logs?.infoLogs?.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
393+
MessageType.LOG,
394+
this.#context?.logLevel,
395+
);
396+
resolve(revealData);
397+
}
396398
}
397399
}
398400
});
@@ -436,39 +438,45 @@ class ComposableRevealContainer extends Container {
436438
MessageType.LOG,
437439
this.#context.logLevel);
438440
window.addEventListener('message', (messagEevent) => {
439-
if (messagEevent?.data?.type === ELEMENT_EVENTS_TO_CLIENT.MOUNTED
441+
if (messagEevent?.origin === properties.IFRAME_SECURE_ORIGIN) {
442+
if (messagEevent?.data?.type === ELEMENT_EVENTS_TO_CLIENT.MOUNTED
440443
+ this.#containerId) {
441-
this.#emitEvent(
442-
ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_REVEAL + this.#containerId, {
443-
data: {
444-
type: REVEAL_TYPES.REVEAL,
445-
containerId: this.#containerId,
446-
elementIds,
444+
this.#emitEvent(
445+
ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_REVEAL + this.#containerId, {
446+
data: {
447+
type: REVEAL_TYPES.REVEAL,
448+
containerId: this.#containerId,
449+
elementIds,
450+
},
451+
clientConfig: {
452+
vaultURL: this.#metaData.clientJSON.config.vaultURL,
453+
vaultID: this.#metaData.clientJSON.config.vaultID,
454+
authToken,
455+
},
456+
context: this.#context,
447457
},
448-
clientConfig: {
449-
vaultURL: this.#metaData.clientJSON.config.vaultURL,
450-
vaultID: this.#metaData.clientJSON.config.vaultID,
451-
authToken,
452-
},
453-
context: this.#context,
454-
},
455-
);
456-
window.addEventListener('message', (event) => {
457-
if (event?.data?.type
458+
);
459+
window.addEventListener('message', (event) => {
460+
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
461+
if (event?.data?.type
458462
=== ELEMENT_EVENTS_TO_IFRAME.REVEAL_RESPONSE_READY + this.#containerId) {
459-
const revealData = event?.data?.data;
460-
if (revealData?.errors) {
461-
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
462-
MessageType.ERROR, this.#context.logLevel);
463-
reject(revealData);
464-
} else {
465-
printLog(parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
466-
MessageType.LOG,
467-
this.#context.logLevel);
468-
resolve(revealData);
463+
const revealData = event?.data?.data;
464+
if (revealData?.errors) {
465+
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
466+
MessageType.ERROR, this.#context.logLevel);
467+
reject(revealData);
468+
} else {
469+
printLog(
470+
parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
471+
MessageType.LOG,
472+
this.#context.logLevel,
473+
);
474+
resolve(revealData);
475+
}
476+
}
469477
}
470-
}
471-
});
478+
});
479+
}
472480
}
473481
});
474482
}).catch((err:any) => {

‎src/core/external/reveal/reveal-container.ts‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -270,28 +270,30 @@ class RevealContainer extends Container {
270270
}
271271

272272
#emitRevealRequest(resolve, reject) {
273-
bus.emit(
274-
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
275-
{
276-
type: REVEAL_TYPES.REVEAL,
277-
records: this.#revealRecords,
278-
containerId: this.#containerId,
279-
errorMessages: this.#customErrorMessages,
280-
},
281-
(revealData: any) => {
282-
this.#mountedRecords = [];
283-
if (revealData.error) {
284-
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
285-
MessageType.ERROR, this.#context.logLevel);
286-
reject(revealData.error);
287-
} else {
288-
printLog(parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
289-
MessageType.LOG,
290-
this.#context.logLevel);
291-
resolve(revealData);
292-
}
293-
},
294-
);
273+
bus
274+
.target(properties.IFRAME_SECURE_ORIGIN)
275+
.emit(
276+
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
277+
{
278+
type: REVEAL_TYPES.REVEAL,
279+
records: this.#revealRecords,
280+
containerId: this.#containerId,
281+
errorMessages: this.#customErrorMessages,
282+
},
283+
(revealData: any) => {
284+
this.#mountedRecords = [];
285+
if (revealData.error) {
286+
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
287+
MessageType.ERROR, this.#context.logLevel);
288+
reject(revealData.error);
289+
} else {
290+
printLog(parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
291+
MessageType.LOG,
292+
this.#context.logLevel);
293+
resolve(revealData);
294+
}
295+
},
296+
);
295297
}
296298
}
297299
export default RevealContainer;

‎src/core/external/reveal/reveal-element.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ class RevealElement extends SkyflowElement {
198198
loglevel);
199199
validateRenderElementRecord(this.#recordData);
200200
bus
201-
// .target(properties.IFRAME_SECURE_ORIGIN)
201+
.target(properties.IFRAME_SECURE_ORIGIN)
202202
.emit(
203203
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
204204
{
@@ -250,7 +250,7 @@ class RevealElement extends SkyflowElement {
250250
.target(properties.IFRAME_SECURE_ORIGIN)
251251
.on(ELEMENT_EVENTS_TO_IFRAME.SKYFLOW_FRAME_CONTROLLER_READY + this.#metaData.uuid, () => {
252252
bus
253-
// .target(properties.IFRAME_SECURE_ORIGIN)
253+
.target(properties.IFRAME_SECURE_ORIGIN)
254254
.emit(
255255
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
256256
{

0 commit comments

Comments
 (0)