Merge pull request #1370 from danieltigse/master

Hirobreak · web-flow · commit 11ca20ec2a5a · 2020-02-17T10:29:18.000-05:00
fix getting files in composer
diff --git a/electron_app/package.json b/electron_app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "author": {
     "name": "Criptext Inc",
     "email": "support@criptext.com",
diff --git a/electron_app/src/database/DBEmanager.js b/electron_app/src/database/DBEmanager.js
@@ -1052,7 +1052,9 @@ const createFile = (files, trx) => {
 };
 
 const getFilesByEmailId = emailId => {
-  return File().findAll({ where: { emailId } });
+  return File()
+    .findAll({ where: { emailId } })
+    .map(file => file.toJSON());
 };
 
 const getFilesByTokens = tokens => {
diff --git a/email_composer/package.json b/email_composer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_composer",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_loading/package.json b/email_loading/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_loading",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_login/package.json b/email_login/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_login",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_mailbox/package.json b/email_mailbox/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_mailbox",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",
diff --git a/email_pin/package.json b/email_pin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "email_pin",
-  "version": "0.27.1",
+  "version": "0.27.2",
   "private": true,
   "dependencies": {
     "@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "criptext",`
`3`		`- "version": "0.27.1",`
	`3`	`+ "version": "0.27.2",`
`4`	`4`	`"author": {`
`5`	`5`	`"name": "Criptext Inc",`
`6`	`6`	`"email": "[email protected]",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_composer",`
`3`		`- "version": "0.27.1",`
	`3`	`+ "version": "0.27.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_loading",`
`3`		`- "version": "0.27.1",`
	`3`	`+ "version": "0.27.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_login",`
`3`		`- "version": "0.27.1",`
	`3`	`+ "version": "0.27.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_mailbox",`
`3`		`- "version": "0.27.1",`
	`3`	`+ "version": "0.27.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "email_pin",`
`3`		`- "version": "0.27.1",`
	`3`	`+ "version": "0.27.2",`
`4`	`4`	`"private": true,`
`5`	`5`	`"dependencies": {`
`6`	`6`	`"@criptext/electron-better-ipc": "^0.7.0-rc1-0.2",`