remove emailjs dependency

Author: pradel

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

@@ -17,10 +17,10 @@ import {
   generateAccessToken,
   generateRefreshToken,
 } from './tokens';
-import Email, {
+import {
   emailTemplates,
-  EmailConnector,
   EmailTemplateType,
+  sendMail,
 } from './email';
 import {
   AccountsServerOptions,
@@ -48,6 +48,7 @@ const defaultOptions = {
   },
   emailTemplates,
   userObjectSanitizer: (user: UserObjectType) => user,
+  sendMail,
 };
 
 export type RemoveListnerHandle = () => EventEmitter;
@@ -69,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;
@@ -91,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

@@ -2,12 +2,6 @@
 # yarn lockfile v1
 
 
-"@accounts/common@^0.1.0":
-  version "0.1.0-alpha.b5d6f4ab"
-  resolved "https://registry.yarnpkg.com/@accounts/common/-/common-0.1.0-alpha.b5d6f4ab.tgz#ed1ddb111a4a2b022e49933755b85e945f0097ed"
-  dependencies:
-    lodash "^4.16.4"
-
 "@types/jsonwebtoken@^7.2.3":
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-7.2.3.tgz#483c8f39945e1e6d308dcc51fd4aeca5208d4dca"
@@ -22,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"
@@ -83,6 +69,10 @@ babel-runtime@^6.26.0:
     core-js "^2.4.0"
     regenerator-runtime "^0.11.0"
 
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
 [email protected], base64url@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-2.0.0.tgz#eac16e03ea1438eff9423d69baa36262ed1f70bb"
@@ -103,14 +93,17 @@ [email protected]:
   dependencies:
     hoek "2.x.x"
 
+brace-expansion@^1.1.7:
+  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"
+
 [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"
@@ -135,6 +128,10 @@ commander@^2.9.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.11.0.tgz#157152fd1e7a6c8d98a5b715cf376df928004563"
 
+[email protected]:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+
 core-js@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.4.1.tgz#4de911e667b0eae9124e34254b53aea6fc618d3e"
@@ -190,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"
@@ -235,6 +215,10 @@ form-data@~2.1.1:
     combined-stream "^1.0.5"
     mime-types "^2.1.12"
 
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
 generate-function@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.0.0.tgz#6858fe7c0969b7d4e9093337647ac79f60dfbe74"
@@ -251,6 +235,17 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+glob@^7.0.5:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 har-validator@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-2.0.6.tgz#cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d"
@@ -287,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"
 
 is-my-json-valid@^2.12.4:
   version "2.16.1"
@@ -414,21 +416,16 @@ 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"
 
 [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"
@@ -441,6 +438,16 @@ oauth-sign@~0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.8.2.tgz#46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"
 
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -492,6 +499,12 @@ [email protected]:
     tunnel-agent "~0.4.1"
     uuid "^3.0.0"
 
+rimraf@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
+  dependencies:
+    glob "^7.0.5"
+
 safe-buffer@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.0.1.tgz#d263ca54696cd8a306b5ca6551e92de57918fbe7"
@@ -520,10 +533,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"
@@ -570,6 +579,10 @@ [email protected]:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
 xtend@^4.0.0, xtend@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"