pangea-server 1.0.36 → 1.0.38

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

@@ -2,7 +2,7 @@ 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(authHeader: AuthHeader, tx: Tx, accessToken: AccessToken, userCtor: UserCtor): Promise<{
+export declare function login<U extends User>(authHeader: AuthHeader, tx: Tx, accessToken: AccessToken, userCtor: BaseModelCtor<U>, extraWhere?: Where<U>): Promise<{
     accessToken: string;
     user: User;
 }>;

package/dist/authentication/authentication.helpers.js

@@ -5,7 +5,7 @@ exports.getUsersFromToken = exports.getUserFromToken = exports.validateAccessTok
 const helpers_1 = require("../helpers");
 // database
 const database_1 = require("../database");
-async function login(authHeader, tx, accessToken, userCtor) {
+async function login(authHeader, tx, accessToken, userCtor, extraWhere = {}) {
     if (!authHeader?.startsWith('Basic '))
         helpers_1.AppError.ThrowInvalidCredentials();
     const base64 = authHeader.slice(6);
@@ -14,7 +14,8 @@ async function login(authHeader, tx, accessToken, userCtor) {
     if (!username || !password)
         helpers_1.AppError.ThrowInvalidCredentials();
     const db = new database_1.Db(tx);
-    const user = await db.findOneOrNull(userCtor, { username }, { scopes: ['withExcludedAttributes'] });
+    const where = { ...extraWhere, username };
+    const user = await db.findOneOrNull(userCtor, where, { scopes: ['withExcludedAttributes'] });
     if (!user)
         helpers_1.AppError.ThrowInvalidCredentials();
     const isPasswordValid = await (0, helpers_1.comparePasswords)(password, user.password);

package/dist/authentication/base-auth.class.d.ts

@@ -5,6 +5,6 @@ export declare abstract class BaseAuth<AM extends AuthMap> {
     free(): void;
     notSetYet(): void;
     notAllowed(): void;
-    isUserAuth<T extends UserType<AM>>(type: T): NonNullable<AuthUsers<AM>[T]>;
-    isAnyUserAuth<const T extends readonly UserType<AM>[]>(types: T): { [I in keyof T]: InstanceType<AM[T[I]]> | null; };
+    getUserAuth<T extends UserType<AM>>(type: T): NonNullable<AuthUsers<AM>[T]>;
+    getUsersAuth<const T extends readonly UserType<AM>[]>(types: T): { [I in keyof T]: InstanceType<AM[T[I]]> | null; };
 }

package/dist/authentication/base-auth.class.js

@@ -16,13 +16,13 @@ class BaseAuth {
     notAllowed() {
         helpers_1.AppError.ThrowUnauthorized();
     }
-    isUserAuth(type) {
+    getUserAuth(type) {
         const user = this.__authUsers[type];
         if (!user)
             helpers_1.AppError.ThrowUnauthorized();
         return user;
     }
-    isAnyUserAuth(types) {
+    getUsersAuth(types) {
         const users = types.map((type) => this.__authUsers[type]);
         if (users.every((user) => !user))
             helpers_1.AppError.ThrowUnauthorized();

package/package.json

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