From 9f315ca657981c26370906e9118be01545371f3d Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Sat, 26 Sep 2020 16:46:05 +0200 Subject: [PATCH] fix: method hasType in service errors. --- server/src/api/controllers/Expenses.ts | 7 ++++++- server/src/exceptions/ServiceErrors.ts | 2 +- server/src/interfaces/Register.ts | 8 +++++++- .../services/Authentication/AuthenticationMailMessages.ts | 1 - server/src/services/Authentication/index.ts | 2 +- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/server/src/api/controllers/Expenses.ts b/server/src/api/controllers/Expenses.ts index fd4480282..5d2ca1b3e 100644 --- a/server/src/api/controllers/Expenses.ts +++ b/server/src/api/controllers/Expenses.ts @@ -228,7 +228,12 @@ export default class ExpensesController extends BaseController { } } - + /** + * Retrieve expneses list. + * @param {Request} req + * @param {Response} res + * @param {NextFunction} next + */ async getExpensesList(req: Request, res: Response, next: NextFunction) { const { tenantId } = req; const filter = { diff --git a/server/src/exceptions/ServiceErrors.ts b/server/src/exceptions/ServiceErrors.ts index 0cae991fb..cb15ff196 100644 --- a/server/src/exceptions/ServiceErrors.ts +++ b/server/src/exceptions/ServiceErrors.ts @@ -10,6 +10,6 @@ export default class ServiceErrors { hasType(errorType: string) { return this.errors - .filter((error: ServiceError) => error.errorType === errorType); + .some((error: ServiceError) => error.errorType === errorType); } } \ No newline at end of file diff --git a/server/src/interfaces/Register.ts b/server/src/interfaces/Register.ts index cbe5637c0..9f589a535 100644 --- a/server/src/interfaces/Register.ts +++ b/server/src/interfaces/Register.ts @@ -1,10 +1,16 @@ - export interface IRegisterDTO { firstName: string, lastName: string, email: string, password: string, organizationName: string, +}; + +export interface IPasswordReset { + id: number, + email: string, + token: string, + createdAt: Date, }; \ No newline at end of file diff --git a/server/src/services/Authentication/AuthenticationMailMessages.ts b/server/src/services/Authentication/AuthenticationMailMessages.ts index 5703f12f3..39890c39d 100644 --- a/server/src/services/Authentication/AuthenticationMailMessages.ts +++ b/server/src/services/Authentication/AuthenticationMailMessages.ts @@ -42,7 +42,6 @@ export default class AuthenticationMailMesssages { /** * Sends reset password message. - * * @param {ISystemUser} user - The system user. * @param {string} token - Reset password token. * @return {Promise} diff --git a/server/src/services/Authentication/index.ts b/server/src/services/Authentication/index.ts index 1f15dc98d..dba1cd6f7 100644 --- a/server/src/services/Authentication/index.ts +++ b/server/src/services/Authentication/index.ts @@ -126,7 +126,7 @@ export default class AuthenticationService { this.logger.info('[register] Someone trying to register.'); await this.validateEmailAndPhoneUniqiness(registerDTO); - this.logger.info('[register] Creating a new tenant organization.') + this.logger.info('[register] Creating a new tenant organization.'); const tenant = await this.newTenantOrganization(); this.logger.info('[register] Trying hashing the password.')