@skroz/profile-api 1.0.11 → 1.0.12

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

@@ -135,7 +135,26 @@ function createAuthResolver(deps) {
                     yield logTelegramBot.sendError(`${user.email || user.urlSlug} запросил(а) восстановление пароля`);
                 }
                 return {
-                    recoveryLinkIsSent: res.ok,
+                    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'));
+                }
+                const res = yield service.sendLink(user, 'confirmation');
+                if (logTelegramBot) {
+                    yield logTelegramBot.sendError(`Отправлен код подтверждения ${input.email}`);
+                }
+                return {
+                    codeIsSent: res.ok,
                     limitExpiresAt: res.limitExpiresAt,
                 };
             });
@@ -215,6 +234,16 @@ function createAuthResolver(deps) {
         __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' }),
+        (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.SendTokenInput, Object]),
+        __metadata("design:returntype", Promise)
+    ], 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skroz/profile-api",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "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": "49e4b60af88db3e07b62591aed5d8086bd1f4c34"
 }

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

@@ -24,6 +24,9 @@ import {
   recoverPasswordValidators,
   SendTokenPayload,
   confirmEmailValidators,
+  SendTokenInput,
+  sendTokenTransformers,
+  sendTokenValidators,
 } from '../dto';
 
 export interface AuthResolverDependencies<
@@ -201,7 +204,34 @@ export function createAuthResolver<
       }
 
       return {
-        recoveryLinkIsSent: res.ok,
+        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 service = getAuthService();
+
+      if (await service.db.isEmailTaken(input.email, user.id)) {
+        throw new Error(t('validation:auth.emailExists'));
+      }
+
+      const res = await service.sendLink(user, 'confirmation');
+
+      if (logTelegramBot) {
+        await logTelegramBot.sendError(
+          `Отправлен код подтверждения ${input.email}`
+        );
+      }
+
+      return {
+        codeIsSent: res.ok,
         limitExpiresAt: res.limitExpiresAt,
       };
     }