pangea-server 1.0.38 → 1.0.39

package/dist/authentication/authentication.helpers.d.ts

@@ -2,16 +2,16 @@ import { AccessToken } from './access-token.class';
 import { User } from '../database';
 import type { UserCtor, AuthMap } from './authentication.types';
 type AuthHeader = string | undefined;
-export declare function login<U extends User>(authHeader: AuthHeader, tx: Tx, accessToken: AccessToken, userCtor: BaseModelCtor<U>, extraWhere?: Where<U>): Promise<{
+export declare function login<U extends User>(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: BaseModelCtor<U>, extraWhere?: Where<U>): Promise<{
     accessToken: string;
     user: User;
 }>;
-export declare function validateAccessToken(authHeader: AuthHeader, tx: Tx, accessToken: AccessToken, userCtor: UserCtor): Promise<{
+export declare function validateAccessToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<{
     accessToken: string;
     user: User;
 }>;
-export declare function getUserFromToken(authHeader: AuthHeader, tx: Tx, accessToken: AccessToken, userCtor: UserCtor): Promise<User | null> | null;
-export declare function getUsersFromToken(authHeader: AuthHeader, tx: Tx, accessToken: AccessToken, authMap: AuthMap): Promise<{
+export declare function getUserFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, userCtor: UserCtor): Promise<User | null> | null;
+export declare function getUsersFromToken(authHeader: AuthHeader, db: Db, accessToken: AccessToken, authMap: AuthMap): Promise<{
     [k: string]: User | null;
 }>;
 export {};

package/dist/authentication/authentication.helpers.js

@@ -3,9 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsersFromToken = exports.getUserFromToken = exports.validateAccessToken = exports.login = void 0;
 // helpers
 const helpers_1 = require("../helpers");
-// database
-const database_1 = require("../database");
-async function login(authHeader, tx, accessToken, userCtor, extraWhere = {}) {
+async function login(authHeader, db, accessToken, userCtor, extraWhere = {}) {
     if (!authHeader?.startsWith('Basic '))
         helpers_1.AppError.ThrowInvalidCredentials();
     const base64 = authHeader.slice(6);
@@ -13,7 +11,6 @@ async function login(authHeader, tx, accessToken, userCtor, extraWhere = {}) {
     const [username, password] = decoded.split(':');
     if (!username || !password)
         helpers_1.AppError.ThrowInvalidCredentials();
-    const db = new database_1.Db(tx);
     const where = { ...extraWhere, username };
     const user = await db.findOneOrNull(userCtor, where, { scopes: ['withExcludedAttributes'] });
     if (!user)
@@ -24,14 +21,14 @@ async function login(authHeader, tx, accessToken, userCtor, extraWhere = {}) {
     return accessToken.getTokenData(userCtor, user);
 }
 exports.login = login;
-async function validateAccessToken(authHeader, tx, accessToken, userCtor) {
-    const user = await getUserFromToken(authHeader, tx, accessToken, userCtor);
+async function validateAccessToken(authHeader, db, accessToken, userCtor) {
+    const user = await getUserFromToken(authHeader, db, accessToken, userCtor);
     if (!user)
         helpers_1.AppError.ThrowUnauthorized();
     return accessToken.getTokenData(userCtor, user);
 }
 exports.validateAccessToken = validateAccessToken;
-function getUserFromToken(authHeader, tx, accessToken, userCtor) {
+function getUserFromToken(authHeader, db, accessToken, userCtor) {
     try {
         const token = getBearerToken(authHeader);
         const payload = accessToken.verifyToken(token);
@@ -39,7 +36,6 @@ function getUserFromToken(authHeader, tx, accessToken, userCtor) {
         const id = payload[key];
         if (!id)
             return null;
-        const db = new database_1.Db(tx);
         return db.findOneOrNull(userCtor, id);
     }
     catch {
@@ -47,7 +43,7 @@ function getUserFromToken(authHeader, tx, accessToken, userCtor) {
     }
 }
 exports.getUserFromToken = getUserFromToken;
-async function getUsersFromToken(authHeader, tx, accessToken, authMap) {
+async function getUsersFromToken(authHeader, db, accessToken, authMap) {
     try {
         const token = getBearerToken(authHeader);
         const payload = accessToken.verifyToken(token);
@@ -56,7 +52,6 @@ async function getUsersFromToken(authHeader, tx, accessToken, authMap) {
             const id = payload[key];
             if (!id)
                 return [type, null];
-            const db = new database_1.Db(tx);
             const user = await db.findOneOrNull(userCtor, id);
             return [type, user];
         }));

package/dist/database/base-service.class.d.ts

@@ -7,9 +7,8 @@ type SetArrayConfig<T extends BaseModel, M extends BaseModel> = {
     relationName: string;
 };
 export declare abstract class BaseService {
-    protected tx: Tx;
     protected db: Db;
-    constructor(tx: Tx);
+    constructor(db: Db);
     protected __setArray<T extends BaseModel, M extends BaseModel>(config: SetArrayConfig<T, M>): Promise<void>;
 }
 export {};

package/dist/database/base-service.class.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseService = void 0;
-const db_class_1 = require("./db.class");
 class BaseService {
-    constructor(tx) {
-        this.tx = tx;
-        this.db = new db_class_1.Db(tx);
+    constructor(db) {
+        this.db = db;
     }
     async __setArray(config) {
         const { instances, getManyFn, keyName, relationName } = config;

package/dist/database/database.types.d.ts

@@ -1,5 +1,6 @@
 import * as seq from 'sequelize-typescript';
 import { BaseModel } from './models';
+import { Db as _Db } from './db.class';
 import type { OptionalFields, OptionalIfNullish } from 'pangea-helpers';
 import type { InferCreationAttributes, CreationOptional, NonAttribute, AbstractDataTypeConstructor, AbstractDataType, Transaction, WhereOptions } from 'sequelize';
 import type { ModelCtor } from 'sequelize-typescript';
@@ -12,10 +13,11 @@ declare global {
         __brand: 'excluded';
     };
     type ColVirtual<T> = NonAttribute<T>;
-    type Tx = Transaction;
     type Where<BM extends BaseModel> = WhereOptions<BM> & Record<symbol, any>;
     type InsertParams<BM extends BaseModel> = OptionalIfNullish<OptionalIfOptional<StripRelations<OptionalFields<IncludeExcluded<Omit<InferCreationAttributes<BM>, '__brand'>>, Exclude<keyof InferCreationAttributes<BM>, '__brand'> & 'id'>>>>;
     type UpdateParams<BM extends BaseModel> = Partial<InsertParams<BM>>;
+    type Tx = Transaction;
+    type Db = _Db;
 }
 export type Models = Record<ModelName, BaseModelCtor>;
 export type Seeds<M extends Models> = {

package/dist/helpers/job.helpers.d.ts

@@ -1,4 +1,5 @@
-type RunFn = (tx: Tx) => Promise<void>;
+import { Db } from '../database';
+type RunFn = (db: Db) => Promise<void>;
 export declare abstract class Job {
     static Run(runFn: RunFn): () => Promise<void>;
 }

package/dist/helpers/job.helpers.js

@@ -7,7 +7,8 @@ class Job {
         return async () => {
             const tx = await (0, database_1.getDbClient)().transaction();
             try {
-                await runFn(tx);
+                const db = new database_1.Db(tx);
+                await runFn(db);
                 await tx.commit();
             }
             catch (err) {

package/dist/router/call-controller.js

@@ -16,10 +16,11 @@ function callController(controller, validate, authConfig) {
         const ctx = { headers: req.headers, file: req.file, files: req.files, ...inputs };
         const tx = await (0, database_1.getDbClient)().transaction();
         try {
+            const db = new database_1.Db(tx);
             const { authMap, authCtor, accessToken } = authConfig;
-            const authUsers = await (0, authentication_1.getUsersFromToken)(req.headers.authorization, tx, accessToken, authMap);
+            const authUsers = await (0, authentication_1.getUsersFromToken)(req.headers.authorization, db, accessToken, authMap);
             const auth = new authCtor(authUsers);
-            const result = await controller(ctx, tx, auth);
+            const result = await controller(ctx, db, auth);
             await tx.commit();
             let data = result;
             let totalCount;

package/dist/router/router.types.d.ts

@@ -2,7 +2,7 @@ import { BaseAuth, AccessToken } from '../authentication';
 import type { AuthMap, AuthUsers, AuthCtor } from '../authentication/authentication.types';
 import type { RouteValidator } from '../validator/validator.types';
 export type Middleware = (req: Req, res: Res, next: Next) => void;
-export type Controller<V extends RouteValidator, AM extends AuthMap, BA extends BaseAuth<AM>> = (ctx: Ctx<V>, tx: Tx, auth: BA) => unknown;
+export type Controller<V extends RouteValidator, AM extends AuthMap, BA extends BaseAuth<AM>> = (ctx: Ctx<V>, db: Db, auth: BA) => unknown;
 export type SetRouteArgs<V extends RouteValidator, AM extends AuthMap, BA extends BaseAuth<AM>> = [
     ...Middleware[],
     Controller<V, AM, BA>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "files": [
     "dist"
   ],