@skroz/profile-api 1.0.8 → 1.0.9

package/dist/adapters/TypeOrmProfileAdapter.d.ts

@@ -1,7 +1,8 @@
 import { AuthUser, ProfileDbAdapter } from '../types';
 export declare class TypeOrmProfileAdapter implements ProfileDbAdapter {
-    private repository;
-    constructor(userEntity: any);
+    private getRepository;
+    constructor(getRepository: () => any);
+    private get repo();
     findUserByEmail(email: string): Promise<AuthUser | null>;
     findUserById(id: number): Promise<AuthUser | null>;
     findUserByTelegramId(telegramId: string): Promise<AuthUser | null>;

package/dist/adapters/TypeOrmProfileAdapter.js

@@ -12,32 +12,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeOrmProfileAdapter = void 0;
 const typeorm_1 = require("typeorm");
 class TypeOrmProfileAdapter {
-    constructor(userEntity) {
-        this.repository = (0, typeorm_1.getConnection)().getRepository(userEntity);
+    constructor(getRepository) {
+        this.getRepository = getRepository;
+    }
+    get repo() {
+        return this.getRepository();
     }
     findUserByEmail(email) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repository.findOne({ where: { email: email.toLowerCase() } });
+            return this.repo.findOne({ where: { email: email.toLowerCase() } });
         });
     }
     findUserById(id) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repository.findOne(id);
+            return this.repo.findOne(id);
         });
     }
     findUserByTelegramId(telegramId) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repository.findOne({ where: { telegramId } });
+            return this.repo.findOne({ where: { telegramId } });
         });
     }
     createUser(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            const user = this.repository.create({
+            const user = this.repo.create({
                 email: data.email.toLowerCase(),
                 password: data.passwordHash,
                 isEmailConfirmed: false,
             });
-            return (yield this.repository.save(user));
+            return (yield this.repo.save(user));
         });
     }
     isEmailTaken(email, excludeUserId) {
@@ -46,7 +49,7 @@ class TypeOrmProfileAdapter {
             if (excludeUserId) {
                 where.id = (0, typeorm_1.Not)(excludeUserId);
             }
-            const count = yield this.repository.count({ where });
+            const count = yield this.repo.count({ where });
             return count > 0;
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skroz/profile-api",
-  "version": "1.0.8",
+  "version": "1.0.9",
   "license": "MIT",
   "repository": "git@gitlab.com:skroz/libs/utils.git",
   "main": "dist/index.js",
@@ -27,9 +27,7 @@
     "argon2": "0.30.2",
     "class-validator": "0.13.2",
     "nanoid": "3.3.4",
-    "pug": "3.0.2",
-    "type-graphql": "2.0.0-beta.1",
-    "typeorm": "0.2.45"
+    "pug": "3.0.2"
   },
   "devDependencies": {
     "@types/node": "18.0.6",
@@ -39,7 +37,9 @@
     "typescript": "^5.0.0"
   },
   "peerDependencies": {
-    "reflect-metadata": "0.1.13"
+    "reflect-metadata": "0.1.13",
+    "type-graphql": "^1.1.1",
+    "typeorm": "^0.2.45"
   },
-  "gitHead": "0c03e4bb82b77e9309550c90871cec3971972e6b"
+  "gitHead": "3208ed23610d456e63fddd636448fe4585adf401"
 }

package/src/adapters/TypeOrmProfileAdapter.ts

@@ -1,32 +1,32 @@
-import { Repository, getConnection, Not } from 'typeorm';
+import { Repository, Not } from 'typeorm';
 import { AuthUser, ProfileDbAdapter } from '../types';
 
 export class TypeOrmProfileAdapter implements ProfileDbAdapter {
-    private repository: Repository<any>;
+    constructor(private getRepository: () => any) { }
 
-    constructor(userEntity: any) {
-        this.repository = getConnection().getRepository(userEntity);
+    private get repo(): Repository<any> {
+        return this.getRepository();
     }
 
     async findUserByEmail(email: string): Promise<AuthUser | null> {
-        return this.repository.findOne({ where: { email: email.toLowerCase() } }) as Promise<AuthUser | null>;
+        return this.repo.findOne({ where: { email: email.toLowerCase() } }) as Promise<AuthUser | null>;
     }
 
     async findUserById(id: number): Promise<AuthUser | null> {
-        return this.repository.findOne(id) as Promise<AuthUser | null>;
+        return this.repo.findOne(id) as Promise<AuthUser | null>;
     }
 
     async findUserByTelegramId(telegramId: string): Promise<AuthUser | null> {
-        return this.repository.findOne({ where: { telegramId } }) as Promise<AuthUser | null>;
+        return this.repo.findOne({ where: { telegramId } }) as Promise<AuthUser | null>;
     }
 
     async createUser(data: { email: string; passwordHash: string }): Promise<AuthUser> {
-        const user = this.repository.create({
+        const user = this.repo.create({
             email: data.email.toLowerCase(),
             password: data.passwordHash,
             isEmailConfirmed: false,
         });
-        return (await this.repository.save(user)) as AuthUser;
+        return (await this.repo.save(user)) as AuthUser;
     }
 
     async isEmailTaken(email: string, excludeUserId?: number): Promise<boolean> {
@@ -34,7 +34,7 @@ export class TypeOrmProfileAdapter implements ProfileDbAdapter {
         if (excludeUserId) {
             where.id = Not(excludeUserId);
         }
-        const count = await this.repository.count({ where });
+        const count = await this.repo.count({ where });
         return count > 0;
     }
 }