ptorx-server - npm Package Compare versions

Comparing version 6.6.1 to 6.7.0

__tests__/mail.ts

@@ -129,8 +129,5 @@ import 'lib/tests/prepare';
     from: '[e-mail]',
-    headers: null,
-    html: null,
     subject: 'subject',
     raw: 'raw',
-    to: `user@${process.enve.DOMAIN}`,
-    text: null
+    to: `user@${process.enve.DOMAIN}`
   };
@@ -407,3 +404,2 @@ expect(message).toMatchObject(_message);
       from: '[e-mail]',
-      text: 'Hello World',
       to: alias.fullAddress
@@ -410,0 +406,0 @@ },

__tests__/messages.ts

@@ -46,3 +46,3 @@ import 'lib/tests/prepare';
   );
-  expect(Object.keys(message).length).toBe(14);
+  expect(Object.keys(message).length).toBe(11);
   expect(message.id).toBeNumber();
@@ -119,3 +119,2 @@ expect(message.created).toBeNumber();
   const unexpiredMessage = await getMessage(messages[0].id, 1234);
-  unexpiredMessage.attachments = [];
   const expiredMessage = await addMessage(unexpiredMessage, 1234);
@@ -122,0 +121,0 @@ const db = new MySQL();

__tests__/payments.ts

@@ -8,3 +8,3 @@ import 'lib/tests/prepare';
 import { signJWT } from 'lib/jwt/sign';
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { Ptorx } from 'types/ptorx';
@@ -11,0 +11,0 @@

__tests__/users.ts

@@ -5,3 +5,3 @@ import 'lib/tests/prepare';
 import { getUser } from 'lib/users/get';
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { Ptorx } from 'types/ptorx';
@@ -8,0 +8,0 @@

api/controllers.ts

@@ -22,3 +22,2 @@ export * from './users/get';
 export * from './messages/send';
-export * from './messages/attachment';
 
@@ -25,0 +24,0 @@ export * from './payments/finish';

api/router.ts

@@ -16,3 +16,2 @@ import * as Express from 'express';
 router.post('/messages/reply', c.api_replyToMessage);
-router.get('/messages/attachment', c.api_getMessageAttachmentBin);
 
@@ -19,0 +18,0 @@ router.get('/filters', c.api_getFilters);

jobs/reset-tiers.ts

@@ -1,2 +0,2 @@
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { MySQL } from 'lib/MySQL';
@@ -3,0 +3,0 @@

jobs/top-up-credits.ts

@@ -1,2 +0,2 @@
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { MySQL } from 'lib/MySQL';
@@ -3,0 +3,0 @@

lib/messages/get.ts

@@ -0,3 +1,3 @@
+import { Ptorx } from 'types/ptorx';
 import { MySQL } from 'lib/MySQL';
-import { Ptorx } from 'types/ptorx';
 
@@ -27,13 +27,2 @@ export async function getMessage(
 
-    if (!message.raw) {
-      message.headers = JSON.parse(message.headers || '[]');
-      message.attachments = await db.query(
-        `
-          SELECT id, filename, contentType, size
-          FROM message_attachments WHERE messageId = ?
-        `,
-        [messageId]
-      );
-    }
-
     db.release();
@@ -46,24 +35,1 @@ return message;
 }
-
-export async function getMessageAttachmentBin(
-  messageAttachmentId: Ptorx.Message['attachments'][0]['id'],
-  userId: number
-): Promise<Buffer> {
-  const db = new MySQL();
-  try {
-    const [row] = await db.query(
-      `
-        SELECT ma.content
-        FROM message_attachments ma
-        LEFT JOIN messages m ON m.id = ma.messageId
-        LEFT JOIN aliases a ON a.id = m.aliasId
-        WHERE ma.id = ? AND a.userId = ?
-      `,
-      [messageAttachmentId, userId]
-    );
-    return row.content;
-  } catch (err) {
-    db.release();
-    throw err;
-  }
-}

lib/payments/edit.ts

 import { getPayment } from 'lib/payments/get';
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { Ptorx } from 'types/ptorx';
@@ -4,0 +4,0 @@ import { MySQL } from 'lib/MySQL';

lib/payments/finish.ts

@@ -7,3 +7,3 @@ import { editPayment } from 'lib/payments/edit';
 import * as moment from 'moment';
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { Ptorx } from 'types/ptorx';
@@ -10,0 +10,0 @@

lib/users/get.ts

 import { addPrimaryEmail } from 'lib/primary-emails/add';
-import { TIERS } from 'constants/tiers';
+import { TIERS } from 'lib/users/tiers';
 import { Ptorx } from 'types/ptorx';
@@ -4,0 +4,0 @@ import { MySQL } from 'lib/MySQL';

package.json

 {
   "name": "ptorx-server",
-  "version": "6.6.1",
+  "version": "6.7.0",
   "description": "Send and receive mail anonymously with email forwarding and aliases through Ptorx.",
@@ -22,10 +22,10 @@ "main": "app.js",
     "app-module-path": "^2.2.0",
-    "axios": "^0.18.0",
+    "axios": "^0.19.0",
     "body-parser": "^1.19.0",
     "cookie-parser": "^1.4.4",
     "dotenv": "^8.0.0",
-    "ejs": "^2.6.1",
+    "ejs": "^2.6.2",
     "enve": "^1.0.1",
     "escape-string-regexp": "^2.0.0",
-    "express": "^4.16.4",
+    "express": "^4.17.1",
     "jsonwebtoken": "^8.5.1",
@@ -35,5 +35,5 @@ "mailparser": "^2.7.1",
     "mysql": "^2.17.1",
-    "node-forge": "^0.8.3",
-    "nodemailer": "^6.1.1",
-    "openpgp": "^4.5.1",
+    "node-forge": "^0.8.4",
+    "nodemailer": "^6.2.1",
+    "openpgp": "^4.5.3",
     "rword": "^3.1.1",
@@ -50,10 +50,10 @@ "sender-rewriting-scheme": "^1.0.0",
     "@types/escape-string-regexp": "^2.0.1",
-    "@types/express": "^4.16.1",
-    "@types/jest": "^24.0.13",
+    "@types/express": "^4.17.0",
+    "@types/jest": "^24.0.15",
     "@types/jsonwebtoken": "^8.3.2",
     "@types/mailparser": "^2.4.0",
     "@types/mysql": "^2.15.6",
-    "@types/node": "^12.0.2",
+    "@types/node": "^12.0.8",
     "@types/node-forge": "^0.8.3",
-    "@types/openpgp": "^4.4.4",
+    "@types/openpgp": "^4.4.5",
     "@types/smtp-server": "^3.5.1",
@@ -63,3 +63,3 @@ "@types/uuid": "^3.4.4",
     "jest-extended": "^0.11.1",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.2"
   },
@@ -66,0 +66,0 @@ "keywords": [

No alert changes

Worsened metrics

Total package byte prevSize

193486

decreased by-1.31%

Lines of code

3853

decreased by-1.28%

Dependency changes

• + Addedaxios@0.19.2(transitive)

• - Removedaxios@0.18.1(transitive)

• - Removedis-buffer@2.0.5(transitive)

• Updatedaxios@^0.19.0

• Updatedejs@^2.6.2

• Updatedexpress@^4.17.1

• Updatednode-forge@^0.8.4

• Updatednodemailer@^6.2.1

• Updatedopenpgp@^4.5.3