Merge pull request #133 from accounts-js/remove-email-server

Remove emailjs dependency

Author: pradel

packages/password/__tests__/accounts-password.ts

@@ -335,7 +335,7 @@ describe('AccountsPassword', () => {
       password.setStore({ findUserByEmail, addEmailVerificationToken } as any);
       password.server = {
         prepareMail,
-        email: { sendMail },
+        options: { sendMail },
         sanitizeUser,
       } as any;
       set(password.server, 'options.emailTemplates', {});
@@ -354,7 +354,7 @@ describe('AccountsPassword', () => {
       password.setStore({ findUserByEmail, addEmailVerificationToken } as any);
       password.server = {
         prepareMail,
-        email: { sendMail },
+        options: { sendMail },
         sanitizeUser,
       } as any;
       set(password.server, 'options.emailTemplates', {});
@@ -399,7 +399,7 @@ describe('AccountsPassword', () => {
       password.setStore({ findUserByEmail, addResetPasswordToken } as any);
       password.server = {
         prepareMail,
-        email: { sendMail },
+        options: { sendMail },
         sanitizeUser,
         getFirstUserEmail,
       } as any;
@@ -436,7 +436,7 @@ describe('AccountsPassword', () => {
       password.setStore({ findUserByEmail, addResetPasswordToken } as any);
       password.server = {
         prepareMail,
-        email: { sendMail },
+        options: { sendMail },
         sanitizeUser,
         getFirstUserEmail,
       } as any;

packages/password/src/accounts-password.ts

@@ -276,7 +276,7 @@ export default class AccountsPassword implements AuthService {
       this.server.options.emailTemplates.from
     );
 
-    await this.server.email.sendMail(resetPasswordMail);
+    await this.server.options.sendMail(resetPasswordMail);
   }
 
   /**
@@ -307,7 +307,7 @@ export default class AccountsPassword implements AuthService {
       this.server.options.emailTemplates.from
     );
 
-    await this.server.email.sendMail(resetPasswordMail);
+    await this.server.options.sendMail(resetPasswordMail);
   }
 
   /**
@@ -335,7 +335,7 @@ export default class AccountsPassword implements AuthService {
       this.server.options.emailTemplates.from
     );
 
-    await this.server.email.sendMail(enrollmentMail);
+    await this.server.options.sendMail(enrollmentMail);
   }
 
   /**

packages/server/package.json

@@ -52,7 +52,6 @@
     "babel-polyfill": "^6.23.0",
     "bcryptjs": "^2.4.0",
     "crypto": "^0.0.3",
-    "emailjs": "^1.0.8",
     "jsonwebtoken": "^7.2.1",
     "jwt-decode": "^2.1.0",
     "lodash": "^4.16.4"

packages/server/src/accounts-server.ts

@@ -13,11 +13,14 @@ import {
   HookListener,
 } from '@accounts/common';
 import config from './config';
-import { generateAccessToken, generateRefreshToken } from './tokens';
-import Email, {
+import {
+  generateAccessToken,
+  generateRefreshToken,
+} from './tokens';
+import {
   emailTemplates,
-  EmailConnector,
   EmailTemplateType,
+  sendMail,
 } from './email';
 import {
   AccountsServerOptions,
@@ -45,6 +48,7 @@ const defaultOptions = {
   },
   emailTemplates,
   userObjectSanitizer: (user: UserObjectType) => user,
+  sendMail,
 };
 
 export type RemoveListnerHandle = () => EventEmitter;
@@ -66,7 +70,6 @@ export const ServerHooks = {
 
 export class AccountsServer {
   public options: AccountsServerOptions;
-  public email: EmailConnector;
   private services: { [key: string]: AuthService };
   private db: DBInterface;
   private hooks: EventEmitter;
@@ -88,11 +91,6 @@ export class AccountsServer {
       this.services[service].server = this;
     }
 
-    // Initialize emails
-    this.email = this.options.sendMail
-      ? { sendMail: this.options.sendMail }
-      : new Email(this.options.email);
-
     // Initialize hooks
     this.hooks = new EventEmitter();
   }

packages/server/src/email.ts

@@ -1,5 +1,3 @@
-import * as emailServer from 'emailjs';
-import { Client } from 'emailjs'; // tslint:disable-line no-duplicate-imports
 import { UserObjectType } from '@accounts/common';
 
 export interface EmailTemplateType {
@@ -37,40 +35,13 @@ export const emailTemplates = {
   },
 };
 
-export interface EmailConnector {
-  sendMail(mail: object): Promise<object>;
-}
-
-class Email {
-  private server: Client;
-
-  constructor(emailConfig: object) {
-    if (emailConfig) {
-      this.server = emailServer.connect(emailConfig);
-    }
-  }
-
-  public sendMail(mail: object): Promise<object> {
-    return new Promise((resolve, reject) => {
-      // If no configuration for email just warn the user
-      if (!this.server) {
-        // tslint:disable-next-line no-console
-        console.warn(
-          'No configuration for email, you must set an email configuration'
-        );
-        // tslint:disable-next-line no-console
-        console.log(mail);
-        resolve();
-        return;
-      }
-      this.server.send(mail, (err: object, message: object) => {
-        if (err) {
-          return reject(err);
-        }
-        return resolve(message);
-      });
-    });
-  }
-}
+export type SendMailType = (mail: object) => Promise<void>;
 
-export default Email;
+export const sendMail = async (mail: object): Promise<void> => {
+  // tslint:disable-next-line no-console
+  console.warn(
+    'No configuration for email, you must set an email configuration'
+  );
+  // tslint:disable-next-line no-console
+  console.log(mail);
+}

packages/server/src/types.ts

@@ -1,5 +1,5 @@
 import { UserObjectType, CreateUserType, SessionType } from '@accounts/common';
-import { EmailTemplatesType, EmailTemplateType } from './email';
+import { EmailTemplatesType, EmailTemplateType, SendMailType } from './email';
 import { AccountsServer } from './accounts-server';
 
 export interface AuthService {
@@ -31,10 +31,6 @@ export type PrepareMailFunction = (
 
 export type EmailType = EmailTemplateType & { to: string };
 
-export type SendMailFunction = (
-  emailConfig: EmailType | object
-) => Promise<object>;
-
 export interface AccountsServerOptions {
   db: DBInterface;
   tokenSecret: string;
@@ -56,7 +52,7 @@ export interface AccountsServerOptions {
   resumeSessionValidator?: ResumeSessionValidator;
   siteUrl?: string;
   prepareMail?: PrepareMailFunction;
-  sendMail?: SendMailFunction;
+  sendMail?: SendMailType;
   // https://github.com/eleith/emailjs#emailserverconnectoptions
   email?: object;
 }

packages/server/yarn.lock

@@ -16,14 +16,6 @@
   version "8.0.47"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.47.tgz#968e596f91acd59069054558a00708c445ca30c2"
 
-addressparser@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-0.3.2.tgz#59873f35e8fcf6c7361c10239261d76e15348bb2"
-
-addressparser@~0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/addressparser/-/addressparser-0.2.1.tgz#d11a5b2eeda04cfefebdf3196c10ae13db6cd607"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -102,8 +94,8 @@ [email protected]:
     hoek "2.x.x"
 
 brace-expansion@^1.1.7:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
@@ -112,10 +104,6 @@ [email protected]:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
-[email protected]:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/bufferjs/-/bufferjs-1.1.0.tgz#095ffa39c5e6b40a2178a1169c9effc584a73201"
-
 caseless@~0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.11.0.tgz#715b96ea9841593cc33067923f5ec60ebda4f7d7"
@@ -199,23 +187,6 @@ [email protected]:
     base64url "^2.0.0"
     safe-buffer "^5.0.1"
 
-emailjs@^1.0.8:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/emailjs/-/emailjs-1.0.12.tgz#bd6559c51c4963125218626da098be722f7a1c72"
-  dependencies:
-    addressparser "^0.3.2"
-    mimelib "0.2.14"
-    moment "2.15.2"
-    starttls "1.0.1"
-  optionalDependencies:
-    bufferjs "1.1.0"
-
-encoding@~0.1:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  dependencies:
-    iconv-lite "~0.4.13"
-
 escape-string-regexp@^1.0.2:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
@@ -311,9 +282,16 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@~0.4.13:
-  version "0.4.13"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.13.tgz#1f88aba4ab0b1508e8312acc39345f36e992e2f2"
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
 inflight@^1.0.4:
   version "1.0.6"
@@ -449,12 +427,11 @@ mime-types@^2.1.12, mime-types@~2.1.7:
   dependencies:
     mime-db "~1.30.0"
 
-[email protected]:
-  version "0.2.14"
-  resolved "https://registry.yarnpkg.com/mimelib/-/mimelib-0.2.14.tgz#2a1aa724bd190b85bd526e6317ab6106edfd6831"
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   dependencies:
-    addressparser "~0.2.0"
-    encoding "~0.1"
+    brace-expansion "^1.1.7"
 
 minimatch@^3.0.4:
   version "3.0.4"
@@ -466,10 +443,6 @@ [email protected]:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-[email protected]:
-  version "2.15.2"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.15.2.tgz#1bfdedf6a6e345f322fe956d5df5bd08a8ce84dc"
-
 [email protected]:
   version "2.11.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.11.2.tgz#87968e5f95ac038c2e42ac959c75819cd3f52901"
@@ -577,10 +550,6 @@ sshpk@^1.7.0:
     jsbn "~0.1.0"
     tweetnacl "~0.14.0"
 
-[email protected]:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/starttls/-/starttls-1.0.1.tgz#e6081c25de6b178f5a75f8f271c1487449183b42"
-
 stringstream@~0.0.4:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878"