@skroz/profile-api 1.0.13 → 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

@@ -166,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([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skroz/profile-api",
-  "version": "1.0.13",
+  "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": "64646f9451ea3748bf27f71a3112536a33f08493"
+  "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

@@ -8,16 +8,11 @@ import {
 } from '../services/ProfileAuthService';
 import { ProfileContext } from '../types';
 import {
-  RegisterInput,
-  registerTransformers,
+  AuthInput,
   registerValidators,
-  LoginInput,
-  loginTransformers,
   loginValidators,
+  authTransformers,
   ConfirmEmailInput,
-  ForgotPasswordInput,
-  forgotPasswordTransformers,
-  forgotPasswordValidators,
   RecoverPasswordInput,
   recoverPasswordTransformers,
   recoverPasswordValidators,
@@ -62,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)) {
@@ -93,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);
@@ -182,7 +177,6 @@ export function createAuthResolver<
       return user;
     }
 
-
     @TransformArgs(sendTokenTransformers, { arg: 'input' })
     @ValidateArgs(sendTokenValidators, { arg: 'input', tKey: 'sendToken' })
     @Mutation(() => SendTokenPayload)

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,
-};