@skroz/profile-api 1.0.12 → 1.0.13

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,
@@ -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.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": "49e4b60af88db3e07b62591aed5d8086bd1f4c34"
+  "gitHead": "64646f9451ea3748bf27f71a3112536a33f08493"
 }

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 {
@@ -153,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'));
@@ -161,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
       );
@@ -183,50 +182,21 @@ 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 +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'));
@@ -254,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;