@skroz/profile-api 1.0.9 → 1.0.11

package/dist/resolvers/AuthResolver.js

@@ -59,7 +59,7 @@ function createAuthResolver(deps) {
                     ip: ctx.req.ip,
                     userAgent: userAgent.slice(0, 500),
                 });
-                return { ok: true };
+                return user;
             });
         }
         login(input, ctx) {
@@ -120,7 +120,7 @@ function createAuthResolver(deps) {
                 if (logTelegramBot) {
                     yield logTelegramBot.sendError(`${user.email || user.urlSlug} подтвердил(а) email`);
                 }
-                return { ok: true };
+                return user;
             });
         }
         forgotPassword(input, ctx) {
@@ -168,7 +168,7 @@ function createAuthResolver(deps) {
     __decorate([
         (0, graphql_transformers_1.TransformArgs)(dto_1.registerTransformers, { arg: 'input' }),
         (0, graphql_validators_1.ValidateArgs)(dto_1.registerValidators, { arg: 'input', tKey: 'register' }),
-        (0, type_graphql_1.Mutation)(() => graphql_utils_1.StatusPayload),
+        (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),
@@ -198,7 +198,7 @@ function createAuthResolver(deps) {
             arg: 'input',
             tKey: 'confirmEmail',
         }),
-        (0, type_graphql_1.Mutation)(() => graphql_utils_1.StatusPayload),
+        (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),

package/dist/resolvers/ProfileResolver.js

@@ -47,7 +47,7 @@ function createProfileResolver(deps) {
                 user.email = input.email;
                 user.isEmailConfirmed = false;
                 yield user.save();
-                return { ok: true };
+                return user;
             });
         }
         updatePassword(input, ctx) {
@@ -62,7 +62,7 @@ function createProfileResolver(deps) {
                 user.password = yield service.hashPassword(input.password);
                 user.isTempPassword = false;
                 yield user.save();
-                return { ok: true };
+                return user;
             });
         }
         updateProfile(input, ctx) {
@@ -100,7 +100,7 @@ function createProfileResolver(deps) {
         (0, type_graphql_1.Authorized)(),
         (0, graphql_transformers_1.TransformArgs)(dto_1.updateEmailTransformers, { arg: 'input' }),
         (0, graphql_validators_1.ValidateArgs)(dto_1.updateEmailValidators, { arg: 'input', tKey: 'updateEmail' }),
-        (0, type_graphql_1.Mutation)(() => graphql_utils_1.StatusPayload),
+        (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),
@@ -114,7 +114,7 @@ function createProfileResolver(deps) {
             arg: 'input',
             tKey: 'updatePassword',
         }),
-        (0, type_graphql_1.Mutation)(() => graphql_utils_1.StatusPayload),
+        (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),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skroz/profile-api",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "license": "MIT",
   "repository": "git@gitlab.com:skroz/libs/utils.git",
   "main": "dist/index.js",
@@ -34,6 +34,8 @@
     "@types/pug": "2.0.6",
     "ioredis": "5.2.1",
     "rimraf": "3.0.2",
+    "type-graphql": "^1.1.1",
+    "typeorm": "^0.2.45",
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
@@ -41,5 +43,5 @@
     "type-graphql": "^1.1.1",
     "typeorm": "^0.2.45"
   },
-  "gitHead": "3208ed23610d456e63fddd636448fe4585adf401"
+  "gitHead": "7e51d709eca09ef48505153cb200ca3767859169"
 }

package/src/resolvers/AuthResolver.ts

@@ -3,249 +3,249 @@ import { StatusPayload } from '@os-team/graphql-utils';
 import { TransformArgs } from '@os-team/graphql-transformers';
 import { ValidateArgs } from '@os-team/graphql-validators';
 import {
-    ProfileAuthService,
-    CONFIRMATION_REDIS_PREFIX,
-    RECOVERY_REDIS_PREFIX,
+  ProfileAuthService,
+  CONFIRMATION_REDIS_PREFIX,
+  RECOVERY_REDIS_PREFIX,
 } from '../services/ProfileAuthService';
 import { ProfileContext } from '../types';
 import {
-    RegisterInput,
-    registerTransformers,
-    registerValidators,
-    LoginInput,
-    loginTransformers,
-    loginValidators,
-    ConfirmEmailInput,
-    ForgotPasswordInput,
-    forgotPasswordTransformers,
-    forgotPasswordValidators,
-    RecoverPasswordInput,
-    recoverPasswordTransformers,
-    recoverPasswordValidators,
-    SendTokenPayload,
-    confirmEmailValidators,
+  RegisterInput,
+  registerTransformers,
+  registerValidators,
+  LoginInput,
+  loginTransformers,
+  loginValidators,
+  ConfirmEmailInput,
+  ForgotPasswordInput,
+  forgotPasswordTransformers,
+  forgotPasswordValidators,
+  RecoverPasswordInput,
+  recoverPasswordTransformers,
+  recoverPasswordValidators,
+  SendTokenPayload,
+  confirmEmailValidators,
 } from '../dto';
 
 export interface AuthResolverDependencies<
-    TContext extends ProfileContext = ProfileContext
+  TContext extends ProfileContext = ProfileContext
 > {
-    authService: ProfileAuthService | (() => ProfileAuthService);
-    userType: any;
-    onUserCreated?: (user: any, ctx: TContext) => Promise<void>;
-    onLogin?: (user: any, ctx: TContext) => Promise<void>;
-    onLogout?: (user: any, ctx: TContext) => Promise<void>;
-    onEmailConfirmed?: (user: any, ctx: TContext) => Promise<void>;
-    onPasswordRecovered?: (user: any, ctx: TContext) => Promise<void>;
-    logTelegramBot?: { sendError: (msg: string) => Promise<any> };
+  authService: ProfileAuthService | (() => ProfileAuthService);
+  userType: any;
+  onUserCreated?: (user: any, ctx: TContext) => Promise<void>;
+  onLogin?: (user: any, ctx: TContext) => Promise<void>;
+  onLogout?: (user: any, ctx: TContext) => Promise<void>;
+  onEmailConfirmed?: (user: any, ctx: TContext) => Promise<void>;
+  onPasswordRecovered?: (user: any, ctx: TContext) => Promise<void>;
+  logTelegramBot?: { sendError: (msg: string) => Promise<any> };
 }
 
 export function createAuthResolver<
-    TContext extends ProfileContext = ProfileContext
+  TContext extends ProfileContext = ProfileContext
 >(deps: AuthResolverDependencies<TContext>): any {
-    const {
-        authService,
-        onUserCreated,
-        onLogin,
-        onLogout,
-        onEmailConfirmed,
-        onPasswordRecovered,
-        logTelegramBot,
-        userType,
-    } = deps;
-
-    const getAuthService = (): ProfileAuthService => {
-        if (typeof authService === 'function') return authService();
-        return authService;
-    };
-
-    @Resolver(() => userType)
-    class AuthResolver {
-        @TransformArgs(registerTransformers, { arg: 'input' })
-        @ValidateArgs(registerValidators, { arg: 'input', tKey: 'register' })
-        @Mutation(() => StatusPayload)
-        async register(@Arg('input') input: RegisterInput, @Ctx() ctx: TContext) {
-            const { t } = ctx;
-            const service = getAuthService();
-            if (await service.db.isEmailTaken(input.email)) {
-                throw new Error(t('validation:auth.emailExists'));
-            }
-
-            const passwordHash = await service.hashPassword(input.password);
-            const user = await service.db.createUser({
-                email: input.email,
-                passwordHash,
-            });
-
-            if (onUserCreated) await onUserCreated(user, ctx);
-            if (logTelegramBot)
-                await logTelegramBot.sendError(`Новый пользователь ${input.email}`);
-
-            // Создаем сессию
-            const userAgent = decodeURI(ctx.req.get('user-agent') || '');
-            await ctx.req.session.create({
-                userId: user.id,
-                ip: ctx.req.ip,
-                userAgent: userAgent.slice(0, 500),
-            });
-
-            return { ok: true };
-        }
-
-        @TransformArgs(loginTransformers, { arg: 'input' })
-        @ValidateArgs(loginValidators, { arg: 'input', tKey: 'register' })
-        @Mutation(() => StatusPayload)
-        async login(@Arg('input') input: LoginInput, @Ctx() ctx: TContext) {
-            const { t } = ctx;
-            const service = getAuthService();
-            const user = await service.db.findUserByEmail(input.email);
-            if (!user) throw new Error(t('validation:user.notFound'));
-
-            if (user.isBanned) throw new Error(t('validation:user.banned'));
-
-            const isPasswordOk = await service.verifyPassword(
-                user.password!,
-                input.password
-            );
-            if (!isPasswordOk) throw new Error(t('validation:login.wrongPassword'));
-
-            const userAgent = decodeURI(ctx.req.get('user-agent') || '');
-            await ctx.req.session.create({
-                userId: user.id,
-                ip: ctx.req.ip,
-                userAgent: userAgent.slice(0, 500),
-            });
-
-            if (onLogin) await onLogin(user, ctx);
-            if (logTelegramBot) {
-                await logTelegramBot.sendError(
-                    `${user.email || user.urlSlug} вошел(ла) на сайт`
-                );
-            }
-
-            return { ok: true };
-        }
-
-        @Authorized()
-        @Mutation(() => StatusPayload)
-        async logout(@Ctx() ctx: TContext) {
-            const { user } = ctx;
-            if (onLogout) await onLogout(user, ctx);
-            if (logTelegramBot) {
-                await logTelegramBot.sendError(
-                    `${user && (user.email || user.urlSlug)} разлогинился(лась)`
-                );
-            }
-            await ctx.req.session.destroy();
-            return { ok: true };
-        }
-
-        @ValidateArgs(confirmEmailValidators, {
-            arg: 'input',
-            tKey: 'confirmEmail',
-        })
-        @Mutation(() => StatusPayload)
-        async confirmEmail(
-            @Arg('input') input: ConfirmEmailInput,
-            @Ctx() ctx: TContext
-        ) {
-            const service = getAuthService();
-            const user = await service.getUserByToken(
-                CONFIRMATION_REDIS_PREFIX,
-                input.token
-            );
-            if (!user) throw new Error(ctx.t('validation:error.wrongCode'));
-
-            user.isEmailConfirmed = true;
-            await user.save();
-            await service.removeTokenFromRedis(
-                CONFIRMATION_REDIS_PREFIX,
-                user,
-                input.token
-            );
-
-            const userAgent = decodeURI(ctx.req.get('user-agent') || '');
-            await ctx.req.session.create({
-                userId: user.id,
-                ip: ctx.req.ip,
-                userAgent: userAgent.slice(0, 500),
-            });
-
-            if (onEmailConfirmed) await onEmailConfirmed(user, ctx);
-            if (logTelegramBot) {
-                await logTelegramBot.sendError(
-                    `${user.email || user.urlSlug} подтвердил(а) email`
-                );
-            }
-
-            return { ok: true };
-        }
-
-        @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 {
-                recoveryLinkIsSent: res.ok,
-                limitExpiresAt: res.limitExpiresAt,
-            };
-        }
-
-        @TransformArgs(recoverPasswordTransformers, { arg: 'input' })
-        @ValidateArgs(recoverPasswordValidators, { arg: 'input', tKey: 'recover' })
-        @Mutation(() => StatusPayload)
-        async recoverPassword(
-            @Arg('input') input: RecoverPasswordInput,
-            @Ctx() ctx: TContext
-        ) {
-            const service = getAuthService();
-            const user = await service.getUserByToken(
-                RECOVERY_REDIS_PREFIX,
-                input.token
-            );
-            if (!user) throw new Error(ctx.t('validation:error.wrongCode'));
-
-            user.password = await service.hashPassword(input.password);
-            user.isTempPassword = false;
-            await user.save();
-            await service.removeTokenFromRedis(
-                RECOVERY_REDIS_PREFIX,
-                user,
-                input.token
-            );
-
-            const userAgent = decodeURI(ctx.req.get('user-agent') || '');
-            await ctx.req.session.create({
-                userId: user.id,
-                ip: ctx.req.ip,
-                userAgent: userAgent.slice(0, 500),
-            });
-
-            if (onPasswordRecovered) await onPasswordRecovered(user, ctx);
-            if (logTelegramBot) {
-                await logTelegramBot.sendError(
-                    `${user.email || user.urlSlug} восстановил(а) пароль`
-                );
-            }
-
-            return { ok: true };
-        }
+  const {
+    authService,
+    onUserCreated,
+    onLogin,
+    onLogout,
+    onEmailConfirmed,
+    onPasswordRecovered,
+    logTelegramBot,
+    userType,
+  } = deps;
+
+  const getAuthService = (): ProfileAuthService => {
+    if (typeof authService === 'function') return authService();
+    return authService;
+  };
+
+  @Resolver(() => userType)
+  class AuthResolver {
+    @TransformArgs(registerTransformers, { arg: 'input' })
+    @ValidateArgs(registerValidators, { arg: 'input', tKey: 'register' })
+    @Mutation(() => userType)
+    async register(@Arg('input') input: RegisterInput, @Ctx() ctx: TContext) {
+      const { t } = ctx;
+      const service = getAuthService();
+      if (await service.db.isEmailTaken(input.email)) {
+        throw new Error(t('validation:auth.emailExists'));
+      }
+
+      const passwordHash = await service.hashPassword(input.password);
+      const user = await service.db.createUser({
+        email: input.email,
+        passwordHash,
+      });
+
+      if (onUserCreated) await onUserCreated(user, ctx);
+      if (logTelegramBot)
+        await logTelegramBot.sendError(`Новый пользователь ${input.email}`);
+
+      // Создаем сессию
+      const userAgent = decodeURI(ctx.req.get('user-agent') || '');
+      await ctx.req.session.create({
+        userId: user.id,
+        ip: ctx.req.ip,
+        userAgent: userAgent.slice(0, 500),
+      });
+
+      return user;
     }
 
-    return AuthResolver;
+    @TransformArgs(loginTransformers, { arg: 'input' })
+    @ValidateArgs(loginValidators, { arg: 'input', tKey: 'register' })
+    @Mutation(() => StatusPayload)
+    async login(@Arg('input') input: LoginInput, @Ctx() ctx: TContext) {
+      const { t } = ctx;
+      const service = getAuthService();
+      const user = await service.db.findUserByEmail(input.email);
+      if (!user) throw new Error(t('validation:user.notFound'));
+
+      if (user.isBanned) throw new Error(t('validation:user.banned'));
+
+      const isPasswordOk = await service.verifyPassword(
+        user.password!,
+        input.password
+      );
+      if (!isPasswordOk) throw new Error(t('validation:login.wrongPassword'));
+
+      const userAgent = decodeURI(ctx.req.get('user-agent') || '');
+      await ctx.req.session.create({
+        userId: user.id,
+        ip: ctx.req.ip,
+        userAgent: userAgent.slice(0, 500),
+      });
+
+      if (onLogin) await onLogin(user, ctx);
+      if (logTelegramBot) {
+        await logTelegramBot.sendError(
+          `${user.email || user.urlSlug} вошел(ла) на сайт`
+        );
+      }
+
+      return { ok: true };
+    }
+
+    @Authorized()
+    @Mutation(() => StatusPayload)
+    async logout(@Ctx() ctx: TContext) {
+      const { user } = ctx;
+      if (onLogout) await onLogout(user, ctx);
+      if (logTelegramBot) {
+        await logTelegramBot.sendError(
+          `${user && (user.email || user.urlSlug)} разлогинился(лась)`
+        );
+      }
+      await ctx.req.session.destroy();
+      return { ok: true };
+    }
+
+    @ValidateArgs(confirmEmailValidators, {
+      arg: 'input',
+      tKey: 'confirmEmail',
+    })
+    @Mutation(() => userType)
+    async confirmEmail(
+      @Arg('input') input: ConfirmEmailInput,
+      @Ctx() ctx: TContext
+    ) {
+      const service = getAuthService();
+      const user = await service.getUserByToken(
+        CONFIRMATION_REDIS_PREFIX,
+        input.token
+      );
+      if (!user) throw new Error(ctx.t('validation:error.wrongCode'));
+
+      user.isEmailConfirmed = true;
+      await user.save();
+      await service.removeTokenFromRedis(
+        CONFIRMATION_REDIS_PREFIX,
+        user,
+        input.token
+      );
+
+      const userAgent = decodeURI(ctx.req.get('user-agent') || '');
+      await ctx.req.session.create({
+        userId: user.id,
+        ip: ctx.req.ip,
+        userAgent: userAgent.slice(0, 500),
+      });
+
+      if (onEmailConfirmed) await onEmailConfirmed(user, ctx);
+      if (logTelegramBot) {
+        await logTelegramBot.sendError(
+          `${user.email || user.urlSlug} подтвердил(а) email`
+        );
+      }
+
+      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 {
+        recoveryLinkIsSent: res.ok,
+        limitExpiresAt: res.limitExpiresAt,
+      };
+    }
+
+    @TransformArgs(recoverPasswordTransformers, { arg: 'input' })
+    @ValidateArgs(recoverPasswordValidators, { arg: 'input', tKey: 'recover' })
+    @Mutation(() => StatusPayload)
+    async recoverPassword(
+      @Arg('input') input: RecoverPasswordInput,
+      @Ctx() ctx: TContext
+    ) {
+      const service = getAuthService();
+      const user = await service.getUserByToken(
+        RECOVERY_REDIS_PREFIX,
+        input.token
+      );
+      if (!user) throw new Error(ctx.t('validation:error.wrongCode'));
+
+      user.password = await service.hashPassword(input.password);
+      user.isTempPassword = false;
+      await user.save();
+      await service.removeTokenFromRedis(
+        RECOVERY_REDIS_PREFIX,
+        user,
+        input.token
+      );
+
+      const userAgent = decodeURI(ctx.req.get('user-agent') || '');
+      await ctx.req.session.create({
+        userId: user.id,
+        ip: ctx.req.ip,
+        userAgent: userAgent.slice(0, 500),
+      });
+
+      if (onPasswordRecovered) await onPasswordRecovered(user, ctx);
+      if (logTelegramBot) {
+        await logTelegramBot.sendError(
+          `${user.email || user.urlSlug} восстановил(а) пароль`
+        );
+      }
+
+      return { ok: true };
+    }
+  }
+
+  return AuthResolver;
 }

package/src/resolvers/ProfileResolver.ts

@@ -43,7 +43,7 @@ export function createProfileResolver<
     @Authorized()
     @TransformArgs(updateEmailTransformers, { arg: 'input' })
     @ValidateArgs(updateEmailValidators, { arg: 'input', tKey: 'updateEmail' })
-    @Mutation(() => StatusPayload)
+    @Mutation(() => userType)
     async updateEmail(
       @Arg('input') input: UpdateEmailInput,
       @Ctx() ctx: TContext
@@ -60,7 +60,7 @@ export function createProfileResolver<
       user.isEmailConfirmed = false;
       await user.save();
 
-      return { ok: true };
+      return user;
     }
 
     @Authorized()
@@ -69,7 +69,7 @@ export function createProfileResolver<
       arg: 'input',
       tKey: 'updatePassword',
     })
-    @Mutation(() => StatusPayload)
+    @Mutation(() => userType)
     async updatePassword(
       @Arg('input') input: UpdatePasswordInput,
       @Ctx() ctx: TContext
@@ -89,7 +89,7 @@ export function createProfileResolver<
       user.isTempPassword = false;
       await user.save();
 
-      return { ok: true };
+      return user;
     }
 
     @Authorized()