Merge branch 'master' into add-eslint

src/api/routes/auth.ts

@@ -7,7 +7,7 @@ import { celebrate, Joi } from 'celebrate';
 
 const route = Router();
 
-export default app => {
+export default (app: Router) => {
   app.use('/auth', route);
 
   route.post(
@@ -61,7 +61,7 @@ export default app => {
    * emitted for the session and add it to a black list.
    * It's really annoying to develop that but if you had to, please use Redis as your data store
    */
-  route.post('/logout', middlewares.isAuth, async (req: Request, res: Response, next: NextFunction) => {
+  route.post('/logout', middlewares.isAuth, (req: Request, res: Response, next: NextFunction) => {
     try {
       //@TODO AuthService.Logout(req.user) do some clever stuff
       return res.status(200).end();

src/api/routes/user.ts

@@ -2,10 +2,10 @@ import { Router, Request, Response } from 'express';
 import middlewares from '../middlewares';
 const route = Router();
 
-export default app => {
+export default (app: Router) => {
   app.use('/users', route);
 
-  route.get('/me', middlewares.isAuth, middlewares.attachCurrentUser, async (req: Request, res: Response) => {
+  route.get('/me', middlewares.isAuth, middlewares.attachCurrentUser, (req: Request, res: Response) => {
     return res.json({ user: req.currentUser }).status(200);
   });
 };

src/app.ts

@@ -21,9 +21,11 @@ async function startServer() {
       process.exit(1);
       return;
     }
-    console.log('################################################');
-    console.log(' 🛡️  Server listening on port: ', config.port, ' 🛡️ ');
-    console.log('################################################');
+    console.log(`
+      ################################################
+      🛡️  Server listening on port: ${config.port} 🛡️ 
+      ################################################
+    `);
   });
 }
 

src/decorators/eventDispatcher.ts

@@ -6,8 +6,8 @@
 import { EventDispatcher as EventDispatcherClass } from 'event-dispatch';
 import { Container } from 'typedi';
 
-export function EventDispatcher(): any {
-  return (object: any, propertyName: string, index?: number): any => {
+export function EventDispatcher() {
+  return (object: any, propertyName: string, index?: number): void => {
     const eventDispatcher = new EventDispatcherClass();
     Container.registerHandler({ object, propertyName, index, value: () => eventDispatcher });
   };

src/jobs/emailSequence.ts

@@ -2,12 +2,12 @@ import { Container } from 'typedi';
 import MailerService from '../services/mailer';
 
 export default class EmailSequenceJob {
-  public async handler(job, done): Promise<any> {
+  public async handler(job, done): Promise<void> {
     console.log('✌️ Email Sequence Job triggered!');
     try {
-      const { email, name } = job.data;
+      const { email, name }: { [key: string]: string } = job.data;
       const mailerServiceInstance = Container.get(MailerService);
-      await mailerServiceInstance.StartEmailSequence(email, name);
+      await mailerServiceInstance.StartEmailSequence('WelcomeSequence', { email, name});
       done();
     } catch (e) {
       console.log('🔥 Error with Email Sequence Job');

src/loaders/agenda.ts

@@ -4,7 +4,6 @@ import { Collection } from 'mongoose';
 
 export default ({ mongoConnection }) => {
   const agenda = new Agenda() as any;
-
   /**
    * This voodoo magic is proper from agenda.js so I'm not gonna explain too much here.
    * https://github.com/agenda/agenda#mongomongoclientinstance

src/loaders/dependencyInjector.ts

@@ -2,7 +2,7 @@ import { Container } from 'typedi';
 
 import agendaFactory from './agenda';
 
-export default async ({ mongoConnection, models }: { mongoConnection; models: { name: string; model: any }[] }) => {
+export default ({ mongoConnection, models }: { mongoConnection, models: Array<{ name: string, model: any }> }) => {
   try {
     models.forEach(m => {
       Container.set(m.name, m.model);

src/loaders/express.ts

@@ -3,7 +3,7 @@ import * as bodyParser from 'body-parser';
 import * as cors from 'cors';
 import routes from '../api';
 import config from '../config';
-export default async ({ app }: { app: express.Application }) => {
+export default ({ app }: { app: express.Application }) => {
   /**
    * Health Check endpoints
    * @TODO Explain why they are here
@@ -37,8 +37,8 @@ export default async ({ app }: { app: express.Application }) => {
 
   /// catch 404 and forward to error handler
   app.use((req, res, next) => {
-    const err = new Error('Not Found') as any;
-    err.status = 404;
+    const err = new Error('Not Found');
+    err['status'] = 404;
     next(err);
   });
 

src/loaders/mongoose.ts

@@ -1,7 +1,8 @@
-import * as mongoose from 'mongoose';
-import config from '../config';
+import * as mongoose from 'mongoose'
+import { Db } from 'mongodb';
+import config from '../config'
 
-export default async (): Promise<any> => {
+export default async (): Promise<Db> => {
   const connection = await mongoose.connect(config.databaseURL, { useNewUrlParser: true, useCreateIndex: true });
   return connection.connection.db;
 };

src/services/mailer.ts

@@ -3,15 +3,15 @@ import { IUser } from '../interfaces/IUser';
 
 @Service()
 export default class MailerService {
-  public async SendWelcomeEmail(user: Partial<IUser>): Promise<any> {
+  public SendWelcomeEmail(user: Partial<IUser>) {
     /**
      * @TODO Call Mailchimp/Sendgrid or whatever
      */
     return { delivered: 1, status: 'ok' };
   }
-  public async StartEmailSequence(sequence: string, user: Partial<IUser>): Promise<any> {
-    if (!user.email) {
-      throw new Error('No email provided');
+  public StartEmailSequence(sequence: string, user: Partial<IUser>) {
+    if(!user.email) {
+      throw new Error('No email provided')
     }
     // @TODO Add example of an email sequence implementation
     // Something like