From f076daa76a32074cba162459e38fa8c130ad42d0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 30 Jan 2018 15:16:24 +0100 Subject: Add tests for emails --- server/controllers/api/users.ts | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) (limited to 'server/controllers/api/users.ts') diff --git a/server/controllers/api/users.ts b/server/controllers/api/users.ts index 05639fbec..6e5d09695 100644 --- a/server/controllers/api/users.ts +++ b/server/controllers/api/users.ts @@ -6,21 +6,35 @@ import { UserCreate, UserRight, UserRole, UserUpdate, UserUpdateMe, UserVideoRat import { unlinkPromise } from '../../helpers/core-utils' import { retryTransactionWrapper } from '../../helpers/database-utils' import { logger } from '../../helpers/logger' -import { createReqFiles, generateRandomString, getFormattedObjects } from '../../helpers/utils' +import { createReqFiles, getFormattedObjects } from '../../helpers/utils' import { AVATAR_MIMETYPE_EXT, AVATARS_SIZE, CONFIG, sequelizeTypescript } from '../../initializers' import { updateActorAvatarInstance } from '../../lib/activitypub' import { sendUpdateUser } from '../../lib/activitypub/send' import { Emailer } from '../../lib/emailer' -import { EmailPayload } from '../../lib/job-queue/handlers/email' import { Redis } from '../../lib/redis' import { createUserAccountAndChannel } from '../../lib/user' import { - asyncMiddleware, authenticate, ensureUserHasRight, ensureUserRegistrationAllowed, paginationValidator, setDefaultSort, - setDefaultPagination, token, usersAddValidator, usersGetValidator, usersRegisterValidator, usersRemoveValidator, usersSortValidator, - usersUpdateMeValidator, usersUpdateValidator, usersVideoRatingValidator + asyncMiddleware, + authenticate, + ensureUserHasRight, + ensureUserRegistrationAllowed, + paginationValidator, + setDefaultPagination, + setDefaultSort, + token, + usersAddValidator, + usersGetValidator, + usersRegisterValidator, + usersRemoveValidator, + usersSortValidator, + usersUpdateMeValidator, + usersUpdateValidator, + usersVideoRatingValidator } from '../../middlewares' import { - usersAskResetPasswordValidator, usersResetPasswordValidator, usersUpdateMyAvatarValidator, + usersAskResetPasswordValidator, + usersResetPasswordValidator, + usersUpdateMyAvatarValidator, videosSortValidator } from '../../middlewares/validators' import { AccountVideoRateModel } from '../../models/account/account-video-rate' -- cgit v1.2.3