Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "skyflow-js",
"preferGlobal": true,
"analyze": false,
"version": "2.7.4",
"version": "2.7.4-dev.967e7d1",
"author": "Skyflow",
"description": "Skyflow JavaScript SDK",
"homepage": "https://github.com/skyflowapi/skyflow-js",
Expand Down
58 changes: 32 additions & 26 deletions src/core/external/collect/compose-collect-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -461,20 +461,23 @@ class ComposableContainer extends Container {
reject(err);
});
window.addEventListener('message', (event) => {
if (event.data?.type
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
console.log('origin matches, processing message: in external comp col', properties.IFRAME_SECURE_ORIGIN, event?.origin);
if (event?.data?.type
=== ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_CALL_RESPONSE + this.#containerId) {
const data = event.data.data;
if (!data || data?.error) {
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
reject(data?.error);
} else if (data?.records) {
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(data);
} else {
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
reject(data);
const data = event.data.data;
if (!data || data?.error) {
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
reject(data?.error);
} else if (data?.records) {
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(data);
} else {
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
reject(data);
}
}
}
});
Expand Down Expand Up @@ -546,20 +549,23 @@ class ComposableContainer extends Container {
errorMessages: this.#customErrorMessages,
});
window.addEventListener('message', (event) => {
if (event.data?.type
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
console.log('origin matches, processing message: in external comp col', properties.IFRAME_SECURE_ORIGIN, event?.origin);
if (event.data?.type
=== ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_FILE_CALL_RESPONSE + this.#containerId) {
const data = event.data.data;
if (!data || data?.error) {
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
reject(data?.error);
} else if (data?.fileUploadResponse) {
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(data);
} else {
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
reject(data);
const data = event.data.data;
if (!data || data?.error) {
printLog(`${JSON.stringify(data?.error)}`, MessageType.ERROR, this.#context.logLevel);
reject(data?.error);
} else if (data?.fileUploadResponse) {
printLog(parameterizedString(logs.infoLogs.COLLECT_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(data);
} else {
printLog(`${JSON.stringify(data)}`, MessageType.ERROR, this.#context.logLevel);
reject(data);
}
}
}
});
Expand Down
100 changes: 55 additions & 45 deletions src/core/external/reveal/composable-reveal-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,26 @@ class ComposableRevealContainer extends Container {
);

window?.addEventListener('message', (event) => {
if (event?.data?.type
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
console.log('origin matches, processing message: in external comp rev', properties.IFRAME_SECURE_ORIGIN, event?.origin);
if (event?.data?.type
=== ELEMENT_EVENTS_TO_IFRAME.REVEAL_RESPONSE_READY + this.#containerId) {
const revealData = event?.data?.data;
if (revealData?.errors) {
printLog(
parameterizedString(logs?.errorLogs?.FAILED_REVEAL),
MessageType.ERROR,
this.#context?.logLevel,
);
reject(revealData);
} else {
printLog(
parameterizedString(logs?.infoLogs?.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context?.logLevel,
);
resolve(revealData);
const revealData = event?.data?.data;
if (revealData?.errors) {
printLog(
parameterizedString(logs?.errorLogs?.FAILED_REVEAL),
MessageType.ERROR,
this.#context?.logLevel,
);
reject(revealData);
} else {
printLog(
parameterizedString(logs?.infoLogs?.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context?.logLevel,
);
resolve(revealData);
}
}
}
});
Expand Down Expand Up @@ -436,39 +439,46 @@ class ComposableRevealContainer extends Container {
MessageType.LOG,
this.#context.logLevel);
window.addEventListener('message', (messagEevent) => {
if (messagEevent?.data?.type === ELEMENT_EVENTS_TO_CLIENT.MOUNTED
if (messagEevent?.origin === properties.IFRAME_SECURE_ORIGIN) {
console.log('origin matches, processing message: in external comp rev', properties.IFRAME_SECURE_ORIGIN, messagEevent?.origin);
if (messagEevent?.data?.type === ELEMENT_EVENTS_TO_CLIENT.MOUNTED
+ this.#containerId) {
this.#emitEvent(
ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_REVEAL + this.#containerId, {
data: {
type: REVEAL_TYPES.REVEAL,
containerId: this.#containerId,
elementIds,
this.#emitEvent(
ELEMENT_EVENTS_TO_IFRAME.COMPOSABLE_REVEAL + this.#containerId, {
data: {
type: REVEAL_TYPES.REVEAL,
containerId: this.#containerId,
elementIds,
},
clientConfig: {
vaultURL: this.#metaData.clientJSON.config.vaultURL,
vaultID: this.#metaData.clientJSON.config.vaultID,
authToken,
},
context: this.#context,
},
clientConfig: {
vaultURL: this.#metaData.clientJSON.config.vaultURL,
vaultID: this.#metaData.clientJSON.config.vaultID,
authToken,
},
context: this.#context,
},
);
window.addEventListener('message', (event) => {
if (event?.data?.type
);
window.addEventListener('message', (event) => {
if (event?.origin === properties.IFRAME_SECURE_ORIGIN) {
if (event?.data?.type
=== ELEMENT_EVENTS_TO_IFRAME.REVEAL_RESPONSE_READY + this.#containerId) {
const revealData = event?.data?.data;
if (revealData?.errors) {
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
MessageType.ERROR, this.#context.logLevel);
reject(revealData);
} else {
printLog(parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(revealData);
const revealData = event?.data?.data;
if (revealData?.errors) {
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
MessageType.ERROR, this.#context.logLevel);
reject(revealData);
} else {
printLog(
parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel,
);
resolve(revealData);
}
}
}
}
});
});
}
}
});
}).catch((err:any) => {
Expand Down
46 changes: 24 additions & 22 deletions src/core/external/reveal/reveal-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -270,28 +270,30 @@ class RevealContainer extends Container {
}

#emitRevealRequest(resolve, reject) {
bus.emit(
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
{
type: REVEAL_TYPES.REVEAL,
records: this.#revealRecords,
containerId: this.#containerId,
errorMessages: this.#customErrorMessages,
},
(revealData: any) => {
this.#mountedRecords = [];
if (revealData.error) {
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
MessageType.ERROR, this.#context.logLevel);
reject(revealData.error);
} else {
printLog(parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(revealData);
}
},
);
bus
.target(properties.IFRAME_SECURE_ORIGIN)
.emit(
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
{
type: REVEAL_TYPES.REVEAL,
records: this.#revealRecords,
containerId: this.#containerId,
errorMessages: this.#customErrorMessages,
},
(revealData: any) => {
this.#mountedRecords = [];
if (revealData.error) {
printLog(parameterizedString(logs.errorLogs.FAILED_REVEAL),
MessageType.ERROR, this.#context.logLevel);
reject(revealData.error);
} else {
printLog(parameterizedString(logs.infoLogs.REVEAL_SUBMIT_SUCCESS, CLASS_NAME),
MessageType.LOG,
this.#context.logLevel);
resolve(revealData);
}
},
);
}
}
export default RevealContainer;
4 changes: 2 additions & 2 deletions src/core/external/reveal/reveal-element.ts
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ class RevealElement extends SkyflowElement {
loglevel);
validateRenderElementRecord(this.#recordData);
bus
// .target(properties.IFRAME_SECURE_ORIGIN)
.target(properties.IFRAME_SECURE_ORIGIN)
.emit(
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
{
Expand Down Expand Up @@ -250,7 +250,7 @@ class RevealElement extends SkyflowElement {
.target(properties.IFRAME_SECURE_ORIGIN)
.on(ELEMENT_EVENTS_TO_IFRAME.SKYFLOW_FRAME_CONTROLLER_READY + this.#metaData.uuid, () => {
bus
// .target(properties.IFRAME_SECURE_ORIGIN)
.target(properties.IFRAME_SECURE_ORIGIN)
.emit(
ELEMENT_EVENTS_TO_IFRAME.REVEAL_CALL_REQUESTS + this.#metaData.uuid,
{
Expand Down
Loading