diff --git a/.idea/chat-example.iml b/.idea/chat-example.iml new file mode 100644 index 0000000..44b4ed1 --- /dev/null +++ b/.idea/chat-example.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..61458f7 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e5e9263 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..32984a5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1545684502781 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server.js b/server.js index 76284bc..8d9f84e 100644 --- a/server.js +++ b/server.js @@ -285,6 +285,7 @@ app.post('/deCryptMessage', (req, res) => { var receiverSessionCipher = new libsignal.SessionCipher(receiverStore, SENDER_ADDRESS); //ubaceno receiverSessionCipher.decryptPreKeyWhisperMessage(buf5, 'binary').then(function (ciphertext) { poruka = ciphertext.toString(); + console.log(poruka) res.json({ data: { message: poruka diff --git a/src/Chat.js b/src/Chat.js index 08080ee..c7f7959 100644 --- a/src/Chat.js +++ b/src/Chat.js @@ -17,7 +17,7 @@ class Chat extends Component { messages: [], receiverStore: null, SENDER_ADDRESS: null, - message: "" + message: {} } @@ -38,14 +38,14 @@ class Chat extends Component { this.setState({ currentUser }) console.log('Bleep bloop 🤖 You are connected to Chatkit') return currentUser.subscribeToRoom({ - roomId: 19377916, // Replace with YOUR ROOM ID + roomId: 19378901, // Replace with YOUR ROOM ID messageLimit: 100, hooks: { onNewMessage: message => { if (message != "") { console.log("ČITAVA PORUKA:", message) - this.onDeCryptingMessage2(this.state.poruka); + this.onDeCryptingMessage2(message); } }, @@ -63,43 +63,6 @@ class Chat extends Component { } - onDeCryptingMessage = message => { - - console.log("DEKRIPCIJA, poruka primljena:", message); - fetch('http://localhost:3001/decryptMessage2', { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ - data: { - senderAdress: "xxxxxxxxx", - receiverAdress: "yyyyyyyyyyyyy", - receiverPreKeyId: 1337, - receiverSignedKeyId: 1, - message: message - } - }) - }) - .then(response => { console.log("REPSONSE:", response); return response.json(); }) - .then(data => { - console.log("DATA:", data.data) - this.setState({ - message: data.data.message - }) - this.setState({ - messages: [...this.state.messages, message] - }) - return data.data.message - }) - .catch(error => { - console.error('error', error) - }).catch(error => { - console.error('error', error) - }) - } - - onSend = text => { //ubaceno console.log("Primljena poruka:", text); @@ -161,17 +124,16 @@ class Chat extends Component { data: { receiverStore: this.state.receiverStore, SENDER_ADDRESS: this.state.SENDER_ADDRESS, - message: message, + message: message.text, senderAdress: "xxxxxxxxx" } }) }) .then(response => { console.log("REPSONSE:", response); return response.json(); }) .then(data => { - console.log("DATA:", data.data) - this.setState({ - message: data.data.message - }) + message.text = data.data.message + this.state.message = message; + console.log("PORUKA 3:",this.state.message) this.setState({ messages: [...this.state.messages, this.state.message] }) @@ -240,4 +202,39 @@ export default Chat }) } -*/ \ No newline at end of file +*/ +/*onDeCryptingMessage = message => { + + console.log("DEKRIPCIJA, poruka primljena:", message); + fetch('http://localhost:3001/decryptMessage2', { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify({ + data: { + senderAdress: "xxxxxxxxx", + receiverAdress: "yyyyyyyyyyyyy", + receiverPreKeyId: 1337, + receiverSignedKeyId: 1, + message: message + } + }) + }) + .then(response => { console.log("REPSONSE:", response); return response.json(); }) + .then(data => { + console.log("DATA:", data.data) + this.setState({ + message: data.data.message + }) + this.setState({ + messages: [...this.state.messages, message] + }) + return data.data.message + }) + .catch(error => { + console.error('error', error) + }).catch(error => { + console.error('error', error) + }) + } */ \ No newline at end of file diff --git a/src/MessageList.js b/src/MessageList.js index 4c4dbb3..98e84f9 100644 --- a/src/MessageList.js +++ b/src/MessageList.js @@ -26,10 +26,10 @@ class MessageList extends Component { return ( - {"you"}: + {message.sender.name}: - {message} + {message.text} )