@skroz/profile-api 1.0.11 → 1.0.13

package/dist/dto/SendTokenInput.d.ts

@@ -0,0 +1,10 @@
+declare class SendTokenInput {
+    email: string;
+}
+export declare const sendTokenValidators: {
+    email: import("@os-team/graphql-validators").Validator[];
+};
+export declare const sendTokenTransformers: {
+    email: import("@os-team/graphql-transformers").Transformer[];
+};
+export default SendTokenInput;

package/dist/dto/SendTokenInput.js

@@ -0,0 +1,31 @@
+"use strict";
+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 __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.sendTokenTransformers = exports.sendTokenValidators = 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");
+let SendTokenInput = class SendTokenInput {
+};
+__decorate([
+    (0, type_graphql_1.Field)(),
+    __metadata("design:type", String)
+], SendTokenInput.prototype, "email", void 0);
+SendTokenInput = __decorate([
+    (0, type_graphql_1.InputType)()
+], SendTokenInput);
+exports.sendTokenValidators = {
+    email: [graphql_validators_1.isNotEmpty, graphql_validators_1.isEmail],
+};
+exports.sendTokenTransformers = {
+    email: [graphql_transformers_1.trim, graphql_transformers_1.toLowerCase],
+};
+exports.default = SendTokenInput;

package/dist/dto/SendTokenPayload.d.ts

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

package/dist/dto/SendTokenPayload.js

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

package/dist/dto/index.d.ts

@@ -8,4 +8,5 @@ export { default as SendTokenPayload } from './SendTokenPayload';
 export { default as UpdatePasswordInput, updatePasswordTransformers, updatePasswordValidators } from './UpdatePasswordInput';
 export { default as UpdateEmailInput, updateEmailTransformers, updateEmailValidators } from './UpdateEmailInput';
 export { default as UpdateProfileInput, updateProfileTransformers, updateProfileValidators } from './UpdateProfileInput';
+export { default as SendTokenInput, sendTokenTransformers, sendTokenValidators } from './SendTokenInput';
 export { default as RecoverPasswordInput, recoverPasswordTransformers, recoverPasswordValidators } from './RecoverPasswordInput';

package/dist/dto/index.js

@@ -3,7 +3,7 @@ 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.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.loginValidators = exports.loginTransformers = exports.LoginInput = exports.registerValidators = exports.registerTransformers = exports.RegisterInput = 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; } });
@@ -39,6 +39,10 @@ var UpdateProfileInput_1 = require("./UpdateProfileInput");
 Object.defineProperty(exports, "UpdateProfileInput", { enumerable: true, get: function () { return __importDefault(UpdateProfileInput_1).default; } });
 Object.defineProperty(exports, "updateProfileTransformers", { enumerable: true, get: function () { return UpdateProfileInput_1.updateProfileTransformers; } });
 Object.defineProperty(exports, "updateProfileValidators", { enumerable: true, get: function () { return UpdateProfileInput_1.updateProfileValidators; } });
+var SendTokenInput_1 = require("./SendTokenInput");
+Object.defineProperty(exports, "SendTokenInput", { enumerable: true, get: function () { return __importDefault(SendTokenInput_1).default; } });
+Object.defineProperty(exports, "sendTokenTransformers", { enumerable: true, get: function () { return SendTokenInput_1.sendTokenTransformers; } });
+Object.defineProperty(exports, "sendTokenValidators", { enumerable: true, get: function () { return SendTokenInput_1.sendTokenValidators; } });
 var RecoverPasswordInput_1 = require("./RecoverPasswordInput");
 Object.defineProperty(exports, "RecoverPasswordInput", { enumerable: true, get: function () { return __importDefault(RecoverPasswordInput_1).default; } });
 Object.defineProperty(exports, "recoverPasswordTransformers", { enumerable: true, get: function () { return RecoverPasswordInput_1.recoverPasswordTransformers; } });

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,19 +123,19 @@ 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');
+                    throw new Error(t('validation:user.notFound'));
+                const res = yield service.sendLink(user, 'confirmation');
                 if (logTelegramBot) {
-                    yield logTelegramBot.sendError(`${user.email || user.urlSlug} запросил(а) восстановление пароля`);
+                    yield logTelegramBot.sendError(`Отправлен код верификации ${input.email}`);
                 }
                 return {
-                    recoveryLinkIsSent: res.ok,
+                    codeIsSent: res.ok,
                     limitExpiresAt: res.limitExpiresAt,
                 };
             });
@@ -143,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,
@@ -206,15 +206,15 @@ function createAuthResolver(deps) {
         __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, graphql_transformers_1.TransformArgs)(dto_1.sendTokenTransformers, { arg: 'input' }),
+        (0, graphql_validators_1.ValidateArgs)(dto_1.sendTokenValidators, { arg: 'input', tKey: 'sendToken' }),
         (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:paramtypes", [dto_1.SendTokenInput, Object]),
         __metadata("design:returntype", Promise)
-    ], AuthResolver.prototype, "forgotPassword", null);
+    ], AuthResolver.prototype, "sendToken", null);
     __decorate([
         (0, graphql_transformers_1.TransformArgs)(dto_1.recoverPasswordTransformers, { arg: 'input' }),
         (0, graphql_validators_1.ValidateArgs)(dto_1.recoverPasswordValidators, { arg: 'input', tKey: 'recover' }),

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.11",
+  "version": "1.0.13",
   "license": "MIT",
   "repository": "git@gitlab.com:skroz/libs/utils.git",
   "main": "dist/index.js",
@@ -43,5 +43,5 @@
     "type-graphql": "^1.1.1",
     "typeorm": "^0.2.45"
   },
-  "gitHead": "7e51d709eca09ef48505153cb200ca3767859169"
+  "gitHead": "64646f9451ea3748bf27f71a3112536a33f08493"
 }

package/src/dto/SendTokenInput.ts

@@ -0,0 +1,18 @@
+import { Field, InputType } from 'type-graphql';
+import { isEmail, isNotEmpty } from '@os-team/graphql-validators';
+import { toLowerCase, trim } from '@os-team/graphql-transformers';
+
+@InputType()
+class SendTokenInput {
+    @Field()
+    public email!: string;
+}
+
+export const sendTokenValidators = {
+    email: [isNotEmpty, isEmail],
+};
+export const sendTokenTransformers = {
+    email: [trim, toLowerCase],
+};
+
+export default SendTokenInput;

package/src/dto/SendTokenPayload.ts

@@ -3,7 +3,7 @@ import { Field, ObjectType } from 'type-graphql';
 @ObjectType()
 export default class SendTokenPayload {
     @Field()
-    recoveryLinkIsSent!: boolean;
+    public codeIsSent!: boolean;
 
     @Field(() => Number, { nullable: true })
     limitExpiresAt?: number;

package/src/dto/index.ts

@@ -8,4 +8,5 @@ export { default as SendTokenPayload } from './SendTokenPayload';
 export { default as UpdatePasswordInput, updatePasswordTransformers, updatePasswordValidators } from './UpdatePasswordInput';
 export { default as UpdateEmailInput, updateEmailTransformers, updateEmailValidators } from './UpdateEmailInput';
 export { default as UpdateProfileInput, updateProfileTransformers, updateProfileValidators } from './UpdateProfileInput';
+export { default as SendTokenInput, sendTokenTransformers, sendTokenValidators } from './SendTokenInput';
 export { default as RecoverPasswordInput, recoverPasswordTransformers, recoverPasswordValidators } from './RecoverPasswordInput';

package/src/resolvers/AuthResolver.ts

@@ -4,8 +4,7 @@ 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 {
@@ -24,6 +23,9 @@ import {
   recoverPasswordValidators,
   SendTokenPayload,
   confirmEmailValidators,
+  SendTokenInput,
+  sendTokenTransformers,
+  sendTokenValidators,
 } from '../dto';
 
 export interface AuthResolverDependencies<
@@ -150,7 +152,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'));
@@ -158,7 +160,7 @@ export function createAuthResolver<
       user.isEmailConfirmed = true;
       await user.save();
       await service.removeTokenFromRedis(
-        CONFIRMATION_REDIS_PREFIX,
+        AUTH_TOKEN_REDIS_PREFIX,
         user,
         input.token
       );
@@ -180,28 +182,26 @@ export function createAuthResolver<
       return user;
     }
 
-    @TransformArgs(forgotPasswordTransformers, { arg: 'input' })
-    @ValidateArgs(forgotPasswordValidators, { arg: 'input', tKey: 'forgot' })
+
+    @TransformArgs(sendTokenTransformers, { arg: 'input' })
+    @ValidateArgs(sendTokenValidators, { arg: 'input', tKey: 'sendToken' })
     @Mutation(() => SendTokenPayload)
-    async forgotPassword(
-      @Arg('input') input: ForgotPasswordInput,
-      @Ctx() ctx: TContext
-    ) {
+    async sendToken(@Arg('input') input: SendTokenInput, @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'));
+      if (!user) throw new Error(t('validation:user.notFound'));
 
-      const res = await service.sendLink(user, 'recovery');
+      const res = await service.sendLink(user, 'confirmation');
 
       if (logTelegramBot) {
         await logTelegramBot.sendError(
-          `${user.email || user.urlSlug} запросил(а) восстановление пароля`
+          `Отправлен код верификации ${input.email}`
         );
       }
 
       return {
-        recoveryLinkIsSent: res.ok,
+        codeIsSent: res.ok,
         limitExpiresAt: res.limitExpiresAt,
       };
     }
@@ -215,7 +215,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'));
@@ -224,7 +224,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;