diff --git a/src/models/backup.model.ts b/src/models/backup.model.ts index 5050688..2f60b0a 100644 --- a/src/models/backup.model.ts +++ b/src/models/backup.model.ts @@ -1,4 +1,4 @@ -import { Device, Process, SecretsStore } from "pkg/sdk_client"; +import { Device, Process, SecretsStore } from "../pkg/sdk_client.js"; export interface BackUp { device: Device, diff --git a/src/pages/account/document-validation.ts b/src/pages/account/document-validation.ts index 0fe233a..1821333 100644 --- a/src/pages/account/document-validation.ts +++ b/src/pages/account/document-validation.ts @@ -1,4 +1,4 @@ -import { ProcessState } from '../../../pkg/sdk_client'; +import { ProcessState } from '../../../pkg/sdk_client.js'; import Services from '../../services/service'; interface State { diff --git a/src/pages/account/key-value-section.ts b/src/pages/account/key-value-section.ts index a43bfad..46f739a 100644 --- a/src/pages/account/key-value-section.ts +++ b/src/pages/account/key-value-section.ts @@ -1,4 +1,4 @@ -import { ValidationRule, RoleDefinition } from '../../../pkg/sdk_client'; +import { ValidationRule, RoleDefinition } from '../../../pkg/sdk_client.js'; import { showValidationRuleModal } from '../../components/validation-rule-modal/validation-rule-modal'; export function createKeyValueSection(title: string, id: string, isRoleSection = false) { diff --git a/src/pages/account/process-creation.ts b/src/pages/account/process-creation.ts index 586a108..67b53f2 100644 --- a/src/pages/account/process-creation.ts +++ b/src/pages/account/process-creation.ts @@ -1,7 +1,7 @@ import { createKeyValueSection } from './key-value-section'; import { loadValidationRuleModal } from '../../components/validation-rule-modal/validation-rule-modal'; import Services from '../../services/service'; -import { RoleDefinition } from '../../../pkg/sdk_client'; +import { RoleDefinition } from '../../../pkg/sdk_client.js'; export async function getProcessCreation(container: HTMLElement) { await loadValidationRuleModal(); diff --git a/src/pages/chat/chat.ts b/src/pages/chat/chat.ts index 344bce5..22663ba 100755 --- a/src/pages/chat/chat.ts +++ b/src/pages/chat/chat.ts @@ -5,7 +5,7 @@ } import { membersMock } from '../../mocks/mock-signature/membersMocks'; -import { ApiReturn, Device, Member, Process, RoleDefinition } from '../../../pkg/sdk_client'; +import { ApiReturn, Device, Member, Process, RoleDefinition } from '../../../pkg/sdk_client.js'; import { getCorrectDOM } from '../../utils/document.utils'; import chatStyle from '../../../public/style/chat.css?inline'; import { addressToEmoji } from '../../utils/sp-address.utils'; diff --git a/src/pages/process-element/process-element.ts b/src/pages/process-element/process-element.ts index ee94c4a..2a6ae9d 100755 --- a/src/pages/process-element/process-element.ts +++ b/src/pages/process-element/process-element.ts @@ -1,6 +1,6 @@ import { interpolate } from '../../utils/html.utils'; import Services from '../../services/service'; -import { Process } from 'pkg/sdk_client'; +import { Process } from '../../pkg/sdk_client.js'; import { getCorrectDOM } from '~/utils/document.utils'; let currentPageStyle: HTMLStyleElement | null = null; diff --git a/src/router.ts b/src/router.ts index ec38abb..56347fa 100755 --- a/src/router.ts +++ b/src/router.ts @@ -10,7 +10,7 @@ import { prepareAndSendPairingTx } from './utils/sp-address.utils'; import ModalService from './services/modal.service'; import { MessageType } from './models/process.model'; import { splitPrivateData, isValid32ByteHex } from './utils/service.utils'; -import { MerkleProofResult } from 'pkg/sdk_client.js'; +import { MerkleProofResult } from '../pkg/sdk_client.js'; const routes: { [key: string]: string } = { home: '/src/pages/home/home.html', @@ -148,7 +148,7 @@ export async function init(): Promise { } else { services.restoreDevice(device); } - + // If we create a new device, we most probably don't have anything in db, but just in case await services.restoreProcessesFromDB(); await services.restoreSecretsFromDB(); @@ -176,10 +176,10 @@ export async function registerAllListeners() { const services = await Services.getInstance(); const tokenService = await TokenService.getInstance(); - const errorResponse = (errorMsg: string, origin: string, messageId?: string) => { + const errorResponse = (errorMsg: string, origin: string, messageId?: string) => { window.parent.postMessage( - { - type: MessageType.ERROR, + { + type: MessageType.ERROR, error: errorMsg, messageId }, @@ -213,9 +213,9 @@ export async function registerAllListeners() { } try { - const tokens = await tokenService.generateSessionToken(event.origin); + const tokens = await tokenService.generateSessionToken(event.origin); const acceptedMsg = { - type: MessageType.LINK_ACCEPTED, + type: MessageType.LINK_ACCEPTED, accessToken: tokens.accessToken, refreshToken: tokens.refreshToken, messageId: event.data.messageId @@ -262,7 +262,7 @@ export async function registerAllListeners() { await services.handleApiReturn(approveChangeReturn); await services.confirmPairing(); - + // Send success response const successMsg = { type: MessageType.PAIRING_CREATED, @@ -295,9 +295,9 @@ export async function registerAllListeners() { } const myProcesses = await services.getMyProcesses(); - + window.parent.postMessage( - { + { type: MessageType.GET_MY_PROCESSES, myProcesses, messageId: event.data.messageId @@ -308,8 +308,8 @@ export async function registerAllListeners() { const errorMsg = `Failed to get processes: ${e}`; errorResponse(errorMsg, event.origin, event.data.messageId); } - } - + } + const handleGetProcesses = async (event: MessageEvent) => { if (event.data.type !== MessageType.GET_PROCESSES) { return; @@ -332,9 +332,9 @@ export async function registerAllListeners() { } const processes = await services.getProcesses(); - + window.parent.postMessage( - { + { type: MessageType.PROCESSES_RETRIEVED, processes, messageId: event.data.messageId @@ -345,7 +345,7 @@ export async function registerAllListeners() { const errorMsg = `Failed to get processes: ${e}`; errorResponse(errorMsg, event.origin, event.data.messageId); } - } + } /// We got a state for some process and return as many clear attributes as we can const handleDecryptState = async (event: MessageEvent) => { @@ -393,7 +393,7 @@ export async function registerAllListeners() { } window.parent.postMessage( - { + { type: MessageType.DATA_RETRIEVED, data: res, messageId: event.data.messageId @@ -435,23 +435,23 @@ export async function registerAllListeners() { if (event.data.type !== MessageType.RENEW_TOKEN) { return; } - + try { const refreshToken = event.data.refreshToken; - + if (!refreshToken) { throw new Error('No refresh token provided'); } - + const newAccessToken = await tokenService.refreshAccessToken(refreshToken, event.origin); - + if (!newAccessToken) { throw new Error('Failed to refresh token'); } - + window.parent.postMessage( - { - type: MessageType.RENEW_TOKEN, + { + type: MessageType.RENEW_TOKEN, accessToken: newAccessToken, refreshToken: refreshToken, messageId: event.data.messageId @@ -481,9 +481,9 @@ export async function registerAllListeners() { } const userPairingId = services.getPairingProcessId(); - + window.parent.postMessage( - { + { type: MessageType.GET_PAIRING_ID, userPairingId, messageId: event.data.messageId @@ -530,7 +530,7 @@ export async function registerAllListeners() { } window.parent.postMessage( - { + { type: MessageType.PROCESS_CREATED, processCreated: res, messageId: event.data.messageId @@ -567,7 +567,7 @@ export async function registerAllListeners() { await services.handleApiReturn(res); window.parent.postMessage( - { + { type: MessageType.UPDATE_NOTIFIED, messageId: event.data.messageId }, @@ -599,7 +599,7 @@ export async function registerAllListeners() { await services.handleApiReturn(res); window.parent.postMessage( - { + { type: MessageType.STATE_VALIDATED, validatedProcess: res.updated_process, messageId: event.data.messageId @@ -611,7 +611,7 @@ export async function registerAllListeners() { errorResponse(errorMsg, event.origin, event.data.messageId); } } - + const handleUpdateProcess = async (event: MessageEvent) => { if (event.data.type !== MessageType.UPDATE_PROCESS) return; @@ -703,12 +703,12 @@ export async function registerAllListeners() { } // We'll let the wasm check if roles are consistent - + const res = await services.updateProcess(process, privateData, publicData, roles); await services.handleApiReturn(res); window.parent.postMessage( - { + { type: MessageType.PROCESS_UPDATED, updatedProcess: res.updated_process, messageId: event.data.messageId @@ -736,11 +736,11 @@ export async function registerAllListeners() { if (!accessToken || !(await tokenService.validateToken(accessToken, event.origin))) { throw new Error('Invalid or expired session token'); } - + const decodedData = services.decodeValue(encodedData); window.parent.postMessage( - { + { type: MessageType.PUBLIC_DATA_DECODED, decodedData, messageId: event.data.messageId @@ -764,11 +764,11 @@ export async function registerAllListeners() { if (!accessToken || !(await tokenService.validateToken(accessToken, event.origin))) { throw new Error('Invalid or expired session token'); } - + const hash = services.getHashForFile(commitedIn, label, fileBlob); window.parent.postMessage( - { + { type: MessageType.VALUE_HASHED, hash, messageId: event.data.messageId @@ -794,7 +794,7 @@ export async function registerAllListeners() { const proof = services.getMerkleProofForFile(processState, attributeName); window.parent.postMessage( - { + { type: MessageType.MERKLE_PROOF_RETRIEVED, proof, messageId: event.data.messageId @@ -829,7 +829,7 @@ export async function registerAllListeners() { const res = services.validateMerkleProof(parsedMerkleProof, documentHash); window.parent.postMessage( - { + { type: MessageType.MERKLE_PROOF_VALIDATED, isValid: res, messageId: event.data.messageId @@ -939,9 +939,9 @@ document.addEventListener('navigate', ((e: Event) => { if (event.detail.page === 'chat') { const container = document.querySelector('.container'); if (container) container.innerHTML = ''; - + //initChat(); - + const chatElement = document.querySelector('chat-element'); if (chatElement) { chatElement.setAttribute('process-id', event.detail.processId || ''); diff --git a/src/services/modal.service.ts b/src/services/modal.service.ts index 284bd70..918a0ae 100755 --- a/src/services/modal.service.ts +++ b/src/services/modal.service.ts @@ -4,7 +4,7 @@ import validationModalStyle from '../components/validation-modal/validation-moda import Services from './service'; import { init, navigate } from '../router'; import { addressToEmoji } from '../utils/sp-address.utils'; -import { RoleDefinition } from 'pkg/sdk_client'; +import { RoleDefinition } from '../pkg/sdk_client.js'; import { initValidationModal } from '~/components/validation-modal/validation-modal'; import { interpolate } from '~/utils/html.utils'; diff --git a/src/services/service.ts b/src/services/service.ts index 4e931a7..c4a54cf 100755 --- a/src/services/service.ts +++ b/src/services/service.ts @@ -58,7 +58,7 @@ export default class Services { public async init(): Promise { this.notifications = this.getNotifications(); - // SDK is now imported as ES module at the top of the file + // SDK ES module est déjà importé statiquement si nécessaire this.sdkClient = await import('../../pkg/sdk_client.js'); this.sdkClient.setup(); for (const wsurl of Object.values(BOOTSTRAPURL)) { diff --git a/src/websockets.ts b/src/websockets.ts index 530dea0..145c844 100755 --- a/src/websockets.ts +++ b/src/websockets.ts @@ -1,4 +1,4 @@ -import { AnkFlag } from 'pkg/sdk_client'; +import { AnkFlag } from '../pkg/sdk_client.js'; import Services from './services/service'; let ws: WebSocket;