@skroz/profile-api 1.0.12 → 1.0.14

package/dist/dto/{RegisterInput.d.ts → AuthInput.d.ts}

@@ -1,16 +1,20 @@
 import PasswordInput from './PasswordInput';
-export default class RegisterInput extends PasswordInput {
+export default class AuthInput extends PasswordInput {
     email: string;
     isUserAgreementAgree?: boolean;
     isPrivacyPolicyAgree?: boolean;
 }
+export declare const loginValidators: {
+    email: import("@os-team/graphql-validators").Validator[];
+    password: import("@os-team/graphql-validators").Validator[];
+};
 export declare const registerValidators: {
     password: import("@os-team/graphql-validators").Validator[];
     email: import("@os-team/graphql-validators").Validator[];
     isUserAgreementAgree: import("@os-team/graphql-validators").Validator[];
     isPrivacyPolicyAgree: import("@os-team/graphql-validators").Validator[];
 };
-export declare const registerTransformers: {
+export declare const authTransformers: {
     password: import("@os-team/graphql-transformers").Transformer[];
     email: import("@os-team/graphql-transformers").Transformer[];
 };

package/dist/dto/{RegisterInput.js → AuthInput.js}

@@ -45,29 +45,33 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registerTransformers = exports.registerValidators = void 0;
+exports.authTransformers = exports.registerValidators = exports.loginValidators = void 0;
 const type_graphql_1 = require("type-graphql");
 const graphql_validators_1 = require("@os-team/graphql-validators");
 const graphql_transformers_1 = require("@os-team/graphql-transformers");
 const PasswordInput_1 = __importStar(require("./PasswordInput"));
 const isTrue_1 = __importDefault(require("../validators/isTrue"));
-let RegisterInput = class RegisterInput extends PasswordInput_1.default {
+let AuthInput = class AuthInput extends PasswordInput_1.default {
 };
 __decorate([
     (0, type_graphql_1.Field)(),
     __metadata("design:type", String)
-], RegisterInput.prototype, "email", void 0);
+], AuthInput.prototype, "email", void 0);
 __decorate([
     (0, type_graphql_1.Field)(() => Boolean, { nullable: true }),
     __metadata("design:type", Boolean)
-], RegisterInput.prototype, "isUserAgreementAgree", void 0);
+], AuthInput.prototype, "isUserAgreementAgree", void 0);
 __decorate([
     (0, type_graphql_1.Field)(() => Boolean, { nullable: true }),
     __metadata("design:type", Boolean)
-], RegisterInput.prototype, "isPrivacyPolicyAgree", void 0);
-RegisterInput = __decorate([
+], AuthInput.prototype, "isPrivacyPolicyAgree", void 0);
+AuthInput = __decorate([
     (0, type_graphql_1.InputType)()
-], RegisterInput);
-exports.default = RegisterInput;
+], AuthInput);
+exports.default = AuthInput;
+exports.loginValidators = {
+    email: [graphql_validators_1.isEmail],
+    password: [graphql_validators_1.isNotEmpty],
+};
 exports.registerValidators = Object.assign({ email: [graphql_validators_1.isEmail], isUserAgreementAgree: [isTrue_1.default], isPrivacyPolicyAgree: [isTrue_1.default] }, PasswordInput_1.passwordValidators);
-exports.registerTransformers = Object.assign({ email: [graphql_transformers_1.trim, graphql_transformers_1.toLowerCase] }, PasswordInput_1.passwordTransformers);
+exports.authTransformers = Object.assign({ email: [graphql_transformers_1.trim, graphql_transformers_1.toLowerCase] }, PasswordInput_1.passwordTransformers);

package/dist/dto/SendTokenPayload.d.ts

@@ -1,4 +1,4 @@
 export default class SendTokenPayload {
     codeIsSent: boolean;
-    limitExpiresAt?: number;
+    limitExpiresAt: number;
 }

package/dist/dto/SendTokenPayload.js

@@ -17,7 +17,7 @@ __decorate([
     __metadata("design:type", Boolean)
 ], SendTokenPayload.prototype, "codeIsSent", void 0);
 __decorate([
-    (0, type_graphql_1.Field)(() => Number, { nullable: true }),
+    (0, type_graphql_1.Field)(() => Number),
     __metadata("design:type", Number)
 ], SendTokenPayload.prototype, "limitExpiresAt", void 0);
 SendTokenPayload = __decorate([

package/dist/dto/index.d.ts

@@ -1,6 +1,5 @@
 export { default as PasswordInput, passwordTransformers, passwordValidators } from './PasswordInput';
-export { default as RegisterInput, registerTransformers, registerValidators } from './RegisterInput';
-export { default as LoginInput, loginTransformers, loginValidators } from './LoginInput';
+export { default as AuthInput, registerValidators, loginValidators, authTransformers, } from './AuthInput';
 export { default as ForgotPasswordInput, forgotPasswordTransformers, forgotPasswordValidators } from './ForgotPasswordInput';
 export { default as ConfirmEmailInput, confirmEmailValidators } from './ConfirmEmailInput';
 export { default as StatusPayload } from './StatusPayload';

package/dist/dto/index.js

@@ -3,19 +3,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.recoverPasswordValidators = exports.recoverPasswordTransformers = exports.RecoverPasswordInput = exports.sendTokenValidators = exports.sendTokenTransformers = exports.SendTokenInput = exports.updateProfileValidators = exports.updateProfileTransformers = exports.UpdateProfileInput = exports.updateEmailValidators = exports.updateEmailTransformers = exports.UpdateEmailInput = exports.updatePasswordValidators = exports.updatePasswordTransformers = exports.UpdatePasswordInput = exports.SendTokenPayload = exports.StatusPayload = exports.confirmEmailValidators = exports.ConfirmEmailInput = exports.forgotPasswordValidators = exports.forgotPasswordTransformers = exports.ForgotPasswordInput = exports.loginValidators = exports.loginTransformers = exports.LoginInput = exports.registerValidators = exports.registerTransformers = exports.RegisterInput = exports.passwordValidators = exports.passwordTransformers = exports.PasswordInput = void 0;
+exports.recoverPasswordValidators = exports.recoverPasswordTransformers = exports.RecoverPasswordInput = exports.sendTokenValidators = exports.sendTokenTransformers = exports.SendTokenInput = exports.updateProfileValidators = exports.updateProfileTransformers = exports.UpdateProfileInput = exports.updateEmailValidators = exports.updateEmailTransformers = exports.UpdateEmailInput = exports.updatePasswordValidators = exports.updatePasswordTransformers = exports.UpdatePasswordInput = exports.SendTokenPayload = exports.StatusPayload = exports.confirmEmailValidators = exports.ConfirmEmailInput = exports.forgotPasswordValidators = exports.forgotPasswordTransformers = exports.ForgotPasswordInput = exports.authTransformers = exports.loginValidators = exports.registerValidators = exports.AuthInput = exports.passwordValidators = exports.passwordTransformers = exports.PasswordInput = void 0;
 var PasswordInput_1 = require("./PasswordInput");
 Object.defineProperty(exports, "PasswordInput", { enumerable: true, get: function () { return __importDefault(PasswordInput_1).default; } });
 Object.defineProperty(exports, "passwordTransformers", { enumerable: true, get: function () { return PasswordInput_1.passwordTransformers; } });
 Object.defineProperty(exports, "passwordValidators", { enumerable: true, get: function () { return PasswordInput_1.passwordValidators; } });
-var RegisterInput_1 = require("./RegisterInput");
-Object.defineProperty(exports, "RegisterInput", { enumerable: true, get: function () { return __importDefault(RegisterInput_1).default; } });
-Object.defineProperty(exports, "registerTransformers", { enumerable: true, get: function () { return RegisterInput_1.registerTransformers; } });
-Object.defineProperty(exports, "registerValidators", { enumerable: true, get: function () { return RegisterInput_1.registerValidators; } });
-var LoginInput_1 = require("./LoginInput");
-Object.defineProperty(exports, "LoginInput", { enumerable: true, get: function () { return __importDefault(LoginInput_1).default; } });
-Object.defineProperty(exports, "loginTransformers", { enumerable: true, get: function () { return LoginInput_1.loginTransformers; } });
-Object.defineProperty(exports, "loginValidators", { enumerable: true, get: function () { return LoginInput_1.loginValidators; } });
+var AuthInput_1 = require("./AuthInput");
+Object.defineProperty(exports, "AuthInput", { enumerable: true, get: function () { return __importDefault(AuthInput_1).default; } });
+Object.defineProperty(exports, "registerValidators", { enumerable: true, get: function () { return AuthInput_1.registerValidators; } });
+Object.defineProperty(exports, "loginValidators", { enumerable: true, get: function () { return AuthInput_1.loginValidators; } });
+Object.defineProperty(exports, "authTransformers", { enumerable: true, get: function () { return AuthInput_1.authTransformers; } });
 var ForgotPasswordInput_1 = require("./ForgotPasswordInput");
 Object.defineProperty(exports, "ForgotPasswordInput", { enumerable: true, get: function () { return __importDefault(ForgotPasswordInput_1).default; } });
 Object.defineProperty(exports, "forgotPasswordTransformers", { enumerable: true, get: function () { return ForgotPasswordInput_1.forgotPasswordTransformers; } });

package/dist/resolvers/AuthResolver.js

@@ -103,12 +103,12 @@ function createAuthResolver(deps) {
         confirmEmail(input, ctx) {
             return __awaiter(this, void 0, void 0, function* () {
                 const service = getAuthService();
-                const user = yield service.getUserByToken(ProfileAuthService_1.CONFIRMATION_REDIS_PREFIX, input.token);
+                const user = yield service.getUserByToken(ProfileAuthService_1.AUTH_TOKEN_REDIS_PREFIX, input.token);
                 if (!user)
                     throw new Error(ctx.t('validation:error.wrongCode'));
                 user.isEmailConfirmed = true;
                 yield user.save();
-                yield service.removeTokenFromRedis(ProfileAuthService_1.CONFIRMATION_REDIS_PREFIX, user, input.token);
+                yield service.removeTokenFromRedis(ProfileAuthService_1.AUTH_TOKEN_REDIS_PREFIX, user, input.token);
                 const userAgent = decodeURI(ctx.req.get('user-agent') || '');
                 yield ctx.req.session.create({
                     userId: user.id,
@@ -123,35 +123,16 @@ function createAuthResolver(deps) {
                 return user;
             });
         }
-        forgotPassword(input, ctx) {
+        sendToken(input, ctx) {
             return __awaiter(this, void 0, void 0, function* () {
                 const { t } = ctx;
                 const service = getAuthService();
                 const user = yield service.db.findUserByEmail(input.email);
                 if (!user)
-                    throw new Error(t('validation:forgot.errors.notRegistered'));
-                const res = yield service.sendLink(user, 'recovery');
-                if (logTelegramBot) {
-                    yield logTelegramBot.sendError(`${user.email || user.urlSlug} запросил(а) восстановление пароля`);
-                }
-                return {
-                    codeIsSent: res.ok,
-                    limitExpiresAt: res.limitExpiresAt,
-                };
-            });
-        }
-        sendToken(input, ctx) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const { user, t } = ctx;
-                if (!user)
-                    throw new Error(t('validation:error.unauthorized'));
-                const service = getAuthService();
-                if (yield service.db.isEmailTaken(input.email, user.id)) {
-                    throw new Error(t('validation:auth.emailExists'));
-                }
+                    throw new Error(t('validation:user.notFound'));
                 const res = yield service.sendLink(user, 'confirmation');
                 if (logTelegramBot) {
-                    yield logTelegramBot.sendError(`Отправлен код подтверждения ${input.email}`);
+                    yield logTelegramBot.sendError(`Отправлен код верификации ${input.email}`);
                 }
                 return {
                     codeIsSent: res.ok,
@@ -162,13 +143,13 @@ function createAuthResolver(deps) {
         recoverPassword(input, ctx) {
             return __awaiter(this, void 0, void 0, function* () {
                 const service = getAuthService();
-                const user = yield service.getUserByToken(ProfileAuthService_1.RECOVERY_REDIS_PREFIX, input.token);
+                const user = yield service.getUserByToken(ProfileAuthService_1.AUTH_TOKEN_REDIS_PREFIX, input.token);
                 if (!user)
                     throw new Error(ctx.t('validation:error.wrongCode'));
                 user.password = yield service.hashPassword(input.password);
                 user.isTempPassword = false;
                 yield user.save();
-                yield service.removeTokenFromRedis(ProfileAuthService_1.RECOVERY_REDIS_PREFIX, user, input.token);
+                yield service.removeTokenFromRedis(ProfileAuthService_1.AUTH_TOKEN_REDIS_PREFIX, user, input.token);
                 const userAgent = decodeURI(ctx.req.get('user-agent') || '');
                 yield ctx.req.session.create({
                     userId: user.id,
@@ -185,23 +166,23 @@ function createAuthResolver(deps) {
         }
     };
     __decorate([
-        (0, graphql_transformers_1.TransformArgs)(dto_1.registerTransformers, { arg: 'input' }),
+        (0, graphql_transformers_1.TransformArgs)(dto_1.authTransformers, { arg: 'input' }),
         (0, graphql_validators_1.ValidateArgs)(dto_1.registerValidators, { arg: 'input', tKey: 'register' }),
         (0, type_graphql_1.Mutation)(() => userType),
         __param(0, (0, type_graphql_1.Arg)('input')),
         __param(1, (0, type_graphql_1.Ctx)()),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [dto_1.RegisterInput, Object]),
+        __metadata("design:paramtypes", [dto_1.AuthInput, Object]),
         __metadata("design:returntype", Promise)
     ], AuthResolver.prototype, "register", null);
     __decorate([
-        (0, graphql_transformers_1.TransformArgs)(dto_1.loginTransformers, { arg: 'input' }),
+        (0, graphql_transformers_1.TransformArgs)(dto_1.authTransformers, { arg: 'input' }),
         (0, graphql_validators_1.ValidateArgs)(dto_1.loginValidators, { arg: 'input', tKey: 'register' }),
         (0, type_graphql_1.Mutation)(() => graphql_utils_1.StatusPayload),
         __param(0, (0, type_graphql_1.Arg)('input')),
         __param(1, (0, type_graphql_1.Ctx)()),
         __metadata("design:type", Function),
-        __metadata("design:paramtypes", [dto_1.LoginInput, Object]),
+        __metadata("design:paramtypes", [dto_1.AuthInput, Object]),
         __metadata("design:returntype", Promise)
     ], AuthResolver.prototype, "login", null);
     __decorate([
@@ -224,16 +205,6 @@ function createAuthResolver(deps) {
         __metadata("design:paramtypes", [dto_1.ConfirmEmailInput, Object]),
         __metadata("design:returntype", Promise)
     ], AuthResolver.prototype, "confirmEmail", null);
-    __decorate([
-        (0, graphql_transformers_1.TransformArgs)(dto_1.forgotPasswordTransformers, { arg: 'input' }),
-        (0, graphql_validators_1.ValidateArgs)(dto_1.forgotPasswordValidators, { arg: 'input', tKey: 'forgot' }),
-        (0, type_graphql_1.Mutation)(() => dto_1.SendTokenPayload),
-        __param(0, (0, type_graphql_1.Arg)('input')),
-        __param(1, (0, type_graphql_1.Ctx)()),
-        __metadata("design:type", Function),
-        __metadata("design:paramtypes", [dto_1.ForgotPasswordInput, Object]),
-        __metadata("design:returntype", Promise)
-    ], AuthResolver.prototype, "forgotPassword", null);
     __decorate([
         (0, graphql_transformers_1.TransformArgs)(dto_1.sendTokenTransformers, { arg: 'input' }),
         (0, graphql_validators_1.ValidateArgs)(dto_1.sendTokenValidators, { arg: 'input', tKey: 'sendToken' }),

package/dist/services/ProfileAuthService.d.ts

@@ -1,8 +1,7 @@
 import { Redis } from 'ioredis';
 import { AuthUser, ProfileAuthConfig, ProfileDbAdapter } from '../types';
 import { ProfileEmailService } from './ProfileEmailService';
-export declare const CONFIRMATION_REDIS_PREFIX = "conf";
-export declare const RECOVERY_REDIS_PREFIX = "rec";
+export declare const AUTH_TOKEN_REDIS_PREFIX = "auth";
 export declare const TOKEN_REDIS_POSTFIX = "token";
 export declare const LAST_SENT_AT_REDIS_POSTFIX = "lastSentAt";
 export declare class ProfileAuthService {

package/dist/services/ProfileAuthService.js

@@ -12,10 +12,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProfileAuthService = exports.LAST_SENT_AT_REDIS_POSTFIX = exports.TOKEN_REDIS_POSTFIX = exports.RECOVERY_REDIS_PREFIX = exports.CONFIRMATION_REDIS_PREFIX = void 0;
+exports.ProfileAuthService = exports.LAST_SENT_AT_REDIS_POSTFIX = exports.TOKEN_REDIS_POSTFIX = exports.AUTH_TOKEN_REDIS_PREFIX = void 0;
 const argon2_1 = __importDefault(require("argon2"));
-exports.CONFIRMATION_REDIS_PREFIX = 'conf';
-exports.RECOVERY_REDIS_PREFIX = 'rec';
+exports.AUTH_TOKEN_REDIS_PREFIX = 'auth';
 exports.TOKEN_REDIS_POSTFIX = 'token';
 exports.LAST_SENT_AT_REDIS_POSTFIX = 'lastSentAt';
 class ProfileAuthService {
@@ -51,9 +50,7 @@ class ProfileAuthService {
     }
     sendLink(user, type) {
         return __awaiter(this, void 0, void 0, function* () {
-            const prefix = type === 'confirmation'
-                ? exports.CONFIRMATION_REDIS_PREFIX
-                : exports.RECOVERY_REDIS_PREFIX;
+            const prefix = exports.AUTH_TOKEN_REDIS_PREFIX;
             const ttlMinutes = type === 'confirmation'
                 ? this.config.confirmationTokenLifetimeMinutes
                 : this.config.recoveryTokenLifetimeMinutes;
@@ -80,7 +77,7 @@ class ProfileAuthService {
             if (!userIdStr)
                 return null;
             const userId = Number(userIdStr);
-            if (isNaN(userId))
+            if (Number.isNaN(userId))
                 return null;
             return this.db.findUserById(userId);
         });

package/dist/services/ProfileEmailService.js

@@ -64,13 +64,8 @@ class ProfileEmailService {
         return __awaiter(this, void 0, void 0, function* () {
             if (!user.email)
                 return false;
-            const isConfirm = type === 'confirmation';
-            const emailLocales = isConfirm
-                ? this.locales.email.confirmEmail
-                : this.locales.email.forgotPassword;
-            const template = isConfirm
-                ? types_1.ProfileEmailTemplate.CONFIRM_EMAIL
-                : types_1.ProfileEmailTemplate.FORGOT_PASSWORD;
+            const emailLocales = this.locales.email.verificationCode;
+            const template = types_1.ProfileEmailTemplate.CONFIRM_EMAIL;
             return this.send(user.email, emailLocales.subject, template, {
                 header: emailLocales.header,
                 text: emailLocales.text,

package/dist/types/index.d.ts

@@ -82,6 +82,12 @@ export interface ProfileLocales {
             text: string;
             linkTitle: string;
         };
+        verificationCode: {
+            subject: string;
+            header: string;
+            text: string;
+            linkTitle: string;
+        };
         tempPassword: {
             subject: string;
             header: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skroz/profile-api",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "license": "MIT",
   "repository": "git@gitlab.com:skroz/libs/utils.git",
   "main": "dist/index.js",
@@ -11,7 +11,7 @@
     "!**/*.test.ts"
   ],
   "scripts": {
-    "clean": "rimraf dist",
+    "clean": "rm -rf dist",
     "build": "yarn clean && tsc --outDir dist && cp -R src/email-templates dist/email-templates",
     "ncu": "ncu -u"
   },
@@ -43,5 +43,5 @@
     "type-graphql": "^1.1.1",
     "typeorm": "^0.2.45"
   },
-  "gitHead": "49e4b60af88db3e07b62591aed5d8086bd1f4c34"
+  "gitHead": "f2cd3aab624bb4b31ac099f978526c14689a34a9"
 }

package/src/dto/{RegisterInput.ts → AuthInput.ts}

@@ -1,21 +1,29 @@
 import { Field, InputType } from 'type-graphql';
-import { isEmail } from '@os-team/graphql-validators';
+import { isEmail, isNotEmpty } from '@os-team/graphql-validators';
 import { toLowerCase, trim } from '@os-team/graphql-transformers';
-import PasswordInput, { passwordTransformers, passwordValidators } from './PasswordInput';
+import PasswordInput, {
+    passwordTransformers,
+    passwordValidators,
+} from './PasswordInput';
 import isTrue from '../validators/isTrue';
 
 @InputType()
-export default class RegisterInput extends PasswordInput {
+export default class AuthInput extends PasswordInput {
     @Field()
-    email!: string;
+    public email!: string;
 
     @Field(() => Boolean, { nullable: true })
-    isUserAgreementAgree?: boolean;
+    public isUserAgreementAgree?: boolean;
 
     @Field(() => Boolean, { nullable: true })
-    isPrivacyPolicyAgree?: boolean;
+    public isPrivacyPolicyAgree?: boolean;
 }
 
+export const loginValidators = {
+    email: [isEmail],
+    password: [isNotEmpty],
+};
+
 export const registerValidators = {
     email: [isEmail],
     isUserAgreementAgree: [isTrue],
@@ -23,7 +31,7 @@ export const registerValidators = {
     ...passwordValidators,
 };
 
-export const registerTransformers = {
+export const authTransformers = {
     email: [trim, toLowerCase],
     ...passwordTransformers,
 };

package/src/dto/SendTokenPayload.ts

@@ -5,6 +5,6 @@ export default class SendTokenPayload {
     @Field()
     public codeIsSent!: boolean;
 
-    @Field(() => Number, { nullable: true })
-    limitExpiresAt?: number;
+    @Field(() => Number)
+    public limitExpiresAt!: number;
 }

package/src/dto/index.ts

@@ -1,6 +1,10 @@
 export { default as PasswordInput, passwordTransformers, passwordValidators } from './PasswordInput';
-export { default as RegisterInput, registerTransformers, registerValidators } from './RegisterInput';
-export { default as LoginInput, loginTransformers, loginValidators } from './LoginInput';
+export {
+    default as AuthInput,
+    registerValidators,
+    loginValidators,
+    authTransformers,
+} from './AuthInput';
 export { default as ForgotPasswordInput, forgotPasswordTransformers, forgotPasswordValidators } from './ForgotPasswordInput';
 export { default as ConfirmEmailInput, confirmEmailValidators } from './ConfirmEmailInput';
 export { default as StatusPayload } from './StatusPayload';

package/src/resolvers/AuthResolver.ts

@@ -4,21 +4,15 @@ import { TransformArgs } from '@os-team/graphql-transformers';
 import { ValidateArgs } from '@os-team/graphql-validators';
 import {
   ProfileAuthService,
-  CONFIRMATION_REDIS_PREFIX,
-  RECOVERY_REDIS_PREFIX,
+  AUTH_TOKEN_REDIS_PREFIX,
 } from '../services/ProfileAuthService';
 import { ProfileContext } from '../types';
 import {
-  RegisterInput,
-  registerTransformers,
+  AuthInput,
   registerValidators,
-  LoginInput,
-  loginTransformers,
   loginValidators,
+  authTransformers,
   ConfirmEmailInput,
-  ForgotPasswordInput,
-  forgotPasswordTransformers,
-  forgotPasswordValidators,
   RecoverPasswordInput,
   recoverPasswordTransformers,
   recoverPasswordValidators,
@@ -63,10 +57,10 @@ export function createAuthResolver<
 
   @Resolver(() => userType)
   class AuthResolver {
-    @TransformArgs(registerTransformers, { arg: 'input' })
+    @TransformArgs(authTransformers, { arg: 'input' })
     @ValidateArgs(registerValidators, { arg: 'input', tKey: 'register' })
     @Mutation(() => userType)
-    async register(@Arg('input') input: RegisterInput, @Ctx() ctx: TContext) {
+    async register(@Arg('input') input: AuthInput, @Ctx() ctx: TContext) {
       const { t } = ctx;
       const service = getAuthService();
       if (await service.db.isEmailTaken(input.email)) {
@@ -94,10 +88,10 @@ export function createAuthResolver<
       return user;
     }
 
-    @TransformArgs(loginTransformers, { arg: 'input' })
+    @TransformArgs(authTransformers, { arg: 'input' })
     @ValidateArgs(loginValidators, { arg: 'input', tKey: 'register' })
     @Mutation(() => StatusPayload)
-    async login(@Arg('input') input: LoginInput, @Ctx() ctx: TContext) {
+    async login(@Arg('input') input: AuthInput, @Ctx() ctx: TContext) {
       const { t } = ctx;
       const service = getAuthService();
       const user = await service.db.findUserByEmail(input.email);
@@ -153,7 +147,7 @@ export function createAuthResolver<
     ) {
       const service = getAuthService();
       const user = await service.getUserByToken(
-        CONFIRMATION_REDIS_PREFIX,
+        AUTH_TOKEN_REDIS_PREFIX,
         input.token
       );
       if (!user) throw new Error(ctx.t('validation:error.wrongCode'));
@@ -161,7 +155,7 @@ export function createAuthResolver<
       user.isEmailConfirmed = true;
       await user.save();
       await service.removeTokenFromRedis(
-        CONFIRMATION_REDIS_PREFIX,
+        AUTH_TOKEN_REDIS_PREFIX,
         user,
         input.token
       );
@@ -183,50 +177,20 @@ export function createAuthResolver<
       return user;
     }
 
-    @TransformArgs(forgotPasswordTransformers, { arg: 'input' })
-    @ValidateArgs(forgotPasswordValidators, { arg: 'input', tKey: 'forgot' })
-    @Mutation(() => SendTokenPayload)
-    async forgotPassword(
-      @Arg('input') input: ForgotPasswordInput,
-      @Ctx() ctx: TContext
-    ) {
-      const { t } = ctx;
-      const service = getAuthService();
-      const user = await service.db.findUserByEmail(input.email);
-      if (!user) throw new Error(t('validation:forgot.errors.notRegistered'));
-
-      const res = await service.sendLink(user, 'recovery');
-
-      if (logTelegramBot) {
-        await logTelegramBot.sendError(
-          `${user.email || user.urlSlug} запросил(а) восстановление пароля`
-        );
-      }
-
-      return {
-        codeIsSent: res.ok,
-        limitExpiresAt: res.limitExpiresAt,
-      };
-    }
-
     @TransformArgs(sendTokenTransformers, { arg: 'input' })
     @ValidateArgs(sendTokenValidators, { arg: 'input', tKey: 'sendToken' })
     @Mutation(() => SendTokenPayload)
     async sendToken(@Arg('input') input: SendTokenInput, @Ctx() ctx: TContext) {
-      const { user, t } = ctx;
-      if (!user) throw new Error(t('validation:error.unauthorized'));
-
+      const { t } = ctx;
       const service = getAuthService();
-
-      if (await service.db.isEmailTaken(input.email, user.id)) {
-        throw new Error(t('validation:auth.emailExists'));
-      }
+      const user = await service.db.findUserByEmail(input.email);
+      if (!user) throw new Error(t('validation:user.notFound'));
 
       const res = await service.sendLink(user, 'confirmation');
 
       if (logTelegramBot) {
         await logTelegramBot.sendError(
-          `Отправлен код подтверждения ${input.email}`
+          `Отправлен код верификации ${input.email}`
         );
       }
 
@@ -245,7 +209,7 @@ export function createAuthResolver<
     ) {
       const service = getAuthService();
       const user = await service.getUserByToken(
-        RECOVERY_REDIS_PREFIX,
+        AUTH_TOKEN_REDIS_PREFIX,
         input.token
       );
       if (!user) throw new Error(ctx.t('validation:error.wrongCode'));
@@ -254,7 +218,7 @@ export function createAuthResolver<
       user.isTempPassword = false;
       await user.save();
       await service.removeTokenFromRedis(
-        RECOVERY_REDIS_PREFIX,
+        AUTH_TOKEN_REDIS_PREFIX,
         user,
         input.token
       );

package/src/services/ProfileAuthService.ts

@@ -3,8 +3,7 @@ import { Redis } from 'ioredis';
 import { AuthUser, ProfileAuthConfig, ProfileDbAdapter } from '../types';
 import { ProfileEmailService } from './ProfileEmailService';
 
-export const CONFIRMATION_REDIS_PREFIX = 'conf';
-export const RECOVERY_REDIS_PREFIX = 'rec';
+export const AUTH_TOKEN_REDIS_PREFIX = 'auth';
 export const TOKEN_REDIS_POSTFIX = 'token';
 export const LAST_SENT_AT_REDIS_POSTFIX = 'lastSentAt';
 
@@ -68,10 +67,7 @@ export class ProfileAuthService {
   }
 
   async sendLink(user: AuthUser, type: 'confirmation' | 'recovery') {
-    const prefix =
-      type === 'confirmation'
-        ? CONFIRMATION_REDIS_PREFIX
-        : RECOVERY_REDIS_PREFIX;
+    const prefix = AUTH_TOKEN_REDIS_PREFIX;
     const ttlMinutes =
       type === 'confirmation'
         ? this.config.confirmationTokenLifetimeMinutes
@@ -107,7 +103,7 @@ export class ProfileAuthService {
     if (!userIdStr) return null;
 
     const userId = Number(userIdStr);
-    if (isNaN(userId)) return null;
+    if (Number.isNaN(userId)) return null;
 
     return this.db.findUserById(userId);
   }

package/src/services/ProfileEmailService.ts

@@ -87,14 +87,8 @@ export class ProfileEmailService {
     ) {
         if (!user.email) return false;
 
-        const isConfirm = type === 'confirmation';
-        const emailLocales = isConfirm
-            ? this.locales.email.confirmEmail
-            : this.locales.email.forgotPassword;
-
-        const template = isConfirm
-            ? ProfileEmailTemplate.CONFIRM_EMAIL
-            : ProfileEmailTemplate.FORGOT_PASSWORD;
+        const emailLocales = this.locales.email.verificationCode;
+        const template = ProfileEmailTemplate.CONFIRM_EMAIL;
 
         return this.send(
             user.email,

package/src/types/index.ts

@@ -84,6 +84,12 @@ export interface ProfileLocales {
             text: string;
             linkTitle: string;
         };
+        verificationCode: {
+            subject: string;
+            header: string;
+            text: string;
+            linkTitle: string;
+        };
         tempPassword: {
             subject: string;
             header: string;

package/dist/dto/LoginInput.d.ts

@@ -1,12 +0,0 @@
-import PasswordInput from './PasswordInput';
-export default class LoginInput extends PasswordInput {
-    email: string;
-}
-export declare const loginValidators: {
-    email: import("@os-team/graphql-validators").Validator[];
-    password: import("@os-team/graphql-validators").Validator[];
-};
-export declare const loginTransformers: {
-    password: import("@os-team/graphql-transformers").Transformer[];
-    email: import("@os-team/graphql-transformers").Transformer[];
-};

package/dist/dto/LoginInput.js

@@ -1,64 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.loginTransformers = exports.loginValidators = void 0;
-const type_graphql_1 = require("type-graphql");
-const graphql_validators_1 = require("@os-team/graphql-validators");
-const graphql_transformers_1 = require("@os-team/graphql-transformers");
-const PasswordInput_1 = __importStar(require("./PasswordInput"));
-let LoginInput = class LoginInput extends PasswordInput_1.default {
-};
-__decorate([
-    (0, type_graphql_1.Field)(),
-    __metadata("design:type", String)
-], LoginInput.prototype, "email", void 0);
-LoginInput = __decorate([
-    (0, type_graphql_1.InputType)()
-], LoginInput);
-exports.default = LoginInput;
-exports.loginValidators = {
-    email: [graphql_validators_1.isEmail],
-    password: [graphql_validators_1.isNotEmpty],
-};
-exports.loginTransformers = Object.assign({ email: [graphql_transformers_1.trim, graphql_transformers_1.toLowerCase] }, PasswordInput_1.passwordTransformers);

package/src/dto/LoginInput.ts

@@ -1,20 +0,0 @@
-import { Field, InputType } from 'type-graphql';
-import { isEmail, isNotEmpty } from '@os-team/graphql-validators';
-import { toLowerCase, trim } from '@os-team/graphql-transformers';
-import PasswordInput, { passwordTransformers } from './PasswordInput';
-
-@InputType()
-export default class LoginInput extends PasswordInput {
-    @Field()
-    email!: string;
-}
-
-export const loginValidators = {
-    email: [isEmail],
-    password: [isNotEmpty],
-};
-
-export const loginTransformers = {
-    email: [trim, toLowerCase],
-    ...passwordTransformers,
-};