diff --git a/src/App.tsx b/src/App.tsx index 1a0b510..e02f78d 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -11,8 +11,8 @@ import UserStore from './sdk/UserStrore'; import Iframe from './sdk/Iframe' import BlockchainViewer from './components/ProcessesViewer'; import FolderModal from './components/FolderModal'; -import type { ProfileData } from './sdk/models/ProfileData' -import type { FolderData } from './sdk/models/FolderData' +import type { ProfileCreated, ProfileData } from './sdk/models/ProfileData' +import type { FolderCreated, FolderData } from './sdk/models/FolderData' const iframeUrl = 'https://dev3.4nkweb.com' @@ -115,7 +115,7 @@ function App() { validator: '884cb36a346a79af8697559f16940141f068bdf1656f88fa0df0e9ecd7311fb8:0' }; - MessageBus.getInstance(iframeUrl).createProfile(completeProfileData).then((_profileData: ProfileData) => { + MessageBus.getInstance(iframeUrl).createProfile(completeProfileData).then((_profileCreated: ProfileCreated) => { MessageBus.getInstance(iframeUrl).getProcesses().then((processes: any) => { setProcesses(processes); }); @@ -126,7 +126,7 @@ function App() { // Gestionnaire pour soumettre les données du dossier const handleFolderSubmit = useCallback((folderData: FolderData) => { - MessageBus.getInstance(iframeUrl).createFolder(folderData).then((_folderData: FolderData) => { + MessageBus.getInstance(iframeUrl).createFolder(folderData).then((_folderCreated: FolderCreated) => { MessageBus.getInstance(iframeUrl).getProcesses().then((processes: any) => { setProcesses(processes); }); diff --git a/src/sdk/MessageBus.ts b/src/sdk/MessageBus.ts index 1e55837..defa3e6 100644 --- a/src/sdk/MessageBus.ts +++ b/src/sdk/MessageBus.ts @@ -1,8 +1,8 @@ import IframeReference from './IframeReference'; import EventBus from './EventBus'; import UserStore from './UserStrore'; -import type { ProfileData } from './models/ProfileData'; -import type { FolderData } from './models/FolderData'; +import type { ProfileCreated, ProfileData } from './models/ProfileData'; +import type { FolderCreated, FolderData } from './models/FolderData'; import { v4 as uuidv4 } from 'uuid'; export default class MessageBus { @@ -300,23 +300,22 @@ export default class MessageBus { }); } - public createProfile(profileData: ProfileData): Promise { - return new Promise((resolve: (profileData: ProfileData) => void, reject: (error: string) => void) => { + public createProfile(profileData: ProfileData): Promise { + return new Promise((resolve: (profileCreated: ProfileCreated) => void, reject: (error: string) => void) => { this.checkToken().then(() => { const userStore = UserStore.getInstance(); const accessToken = userStore.getAccessToken()!; - const refreshToken = userStore.getRefreshToken()!; const correlationId = uuidv4(); this.initMessageListener(correlationId); - const unsubscribe = EventBus.getInstance().on('PROFILE_CREATED', (responseId: string, profileData: ProfileData) => { + const unsubscribe = EventBus.getInstance().on('PROFILE_CREATED', (responseId: string, profileCreated: ProfileCreated) => { if (responseId !== correlationId) { return; } unsubscribe(); this.destroyMessageListener(); - resolve(profileData); + resolve(profileCreated); }); const unsubscribeError = EventBus.getInstance().on('ERROR_PROFILE_CREATED', (responseId: string, error: string) => { @@ -332,14 +331,13 @@ export default class MessageBus { type: 'CREATE_PROFILE', profileData, accessToken, - refreshToken }); }).catch(console.error); }); } - public createFolder(folderData: FolderData): Promise { - return new Promise((resolve: (folderData: FolderData) => void, reject: (error: string) => void) => { + public createFolder(folderData: FolderData): Promise { + return new Promise((resolve: (folderData: FolderCreated) => void, reject: (error: string) => void) => { this.checkToken().then(() => { const userStore = UserStore.getInstance(); const accessToken = userStore.getAccessToken()!; @@ -347,13 +345,13 @@ export default class MessageBus { const correlationId = uuidv4(); this.initMessageListener(correlationId); - const unsubscribe = EventBus.getInstance().on('FOLDER_CREATED', (responseId: string, folderData: FolderData) => { + const unsubscribe = EventBus.getInstance().on('FOLDER_CREATED', (responseId: string, folderCreated: FolderCreated) => { if (responseId !== correlationId) { return; } unsubscribe(); this.destroyMessageListener(); - resolve(folderData); + resolve(folderCreated); }); const unsubscribeError = EventBus.getInstance().on('ERROR_FOLDER_CREATED', (responseId: string, error: string) => { @@ -497,7 +495,7 @@ export default class MessageBus { return; } EventBus.getInstance().emit('MESSAGE_RECEIVED', message); - EventBus.getInstance().emit('PROFILE_CREATED', correlationId, message.profileData); + EventBus.getInstance().emit('PROFILE_CREATED', correlationId, message.profileCreated); break; case 'FOLDER_CREATED': // CREATE_FOLDER @@ -508,6 +506,7 @@ export default class MessageBus { return; } EventBus.getInstance().emit('MESSAGE_RECEIVED', message); + EventBus.getInstance().emit('FOLDER_CREATED', message.folderCreated); break; case 'DATA_RETRIEVED': // RETRIEVE_DATA