@loomcore/api 0.2.42 → 0.2.45

package/dist/utils/auth/index.js

@@ -1,26 +1,26 @@
-export * from "./assert-admin.util.js";
-export * from "./assert-admin-or-feature.util.js";
-export * from "./assert-owner-or-admin.util.js";
-export * from "./assert-user-or-admin.util.js";
-export * from "./attempt-login.util.js";
-export * from "./auth-user-specs.util.js";
-export * from "./assert-user-has-feature.util.js";
-export * from "./change-password.util.js";
-export * from "./create-new-refresh-token.util.js";
-export * from "./create-new-tokens.util.js";
-export * from "./generate-device-id.util.js";
-export * from "./generate-refresh-token.util.js";
-export * from "./get-active-refresh-token.util.js";
-export * from "./get-and-set-device-id-cookie.util.js";
-export * from "./get-auth-config.util.js";
-export * from "./get-device-id-from-cookie.util.js";
-export * from "./get-expires-on-from-days.util.js";
-export * from "./get-expires-on-from-minutes.util.js";
-export * from "./get-expires-on-from-seconds.util.js";
-export * from "./is-admin.util.js";
-export * from "./log-user-in.util.js";
-export * from "./request-token-using-refresh-token.util.js";
-export * from "./reset-password.util.js";
-export * from "./send-reset-password-email.util.js";
-export * from "./update-last-logged-in.util.js";
-export * from "./authorize-method.util.js";
+export * from './assert-admin.util.js';
+export * from './assert-admin-or-feature.util.js';
+export * from './assert-owner-or-admin.util.js';
+export * from './assert-user-or-admin.util.js';
+export * from './attempt-login.util.js';
+export * from './auth-user-specs.util.js';
+export * from './assert-user-has-feature.util.js';
+export * from './change-password.util.js';
+export * from './create-new-refresh-token.util.js';
+export * from './create-new-tokens.util.js';
+export * from './generate-device-id.util.js';
+export * from './generate-refresh-token.util.js';
+export * from './get-active-refresh-token.util.js';
+export * from './get-and-set-device-id-cookie.util.js';
+export * from './get-auth-config.util.js';
+export * from './get-device-id-from-cookie.util.js';
+export * from './get-expires-on-from-days.util.js';
+export * from './get-expires-on-from-minutes.util.js';
+export * from './get-expires-on-from-seconds.util.js';
+export * from './is-admin.util.js';
+export * from './log-user-in.util.js';
+export * from './request-token-using-refresh-token.util.js';
+export * from './reset-password.util.js';
+export * from './send-reset-password-email.util.js';
+export * from './update-last-logged-in.util.js';
+export * from './authorize-method.util.js';

package/dist/utils/auth/is-admin.util.d.ts

@@ -1,2 +1,2 @@
-import type { IUserContext } from "@loomcore/common/models";
+import type { IUserContext } from '@loomcore/common/models';
 export declare function isAdmin(userContext: IUserContext): boolean;

package/dist/utils/auth/is-admin.util.js

@@ -1,3 +1,3 @@
 export function isAdmin(userContext) {
-    return userContext.features.some((feature) => feature === "admin" || feature === "system");
+    return userContext.features.some((feature) => feature === 'admin' || feature === 'system');
 }

package/dist/utils/auth/log-user-in.util.d.ts

@@ -1,4 +1,4 @@
-import type { ITokenResponse, IUserContext } from "@loomcore/common/models";
-import type { IDatabase } from "../../databases/models/index.js";
-import type { UserService } from "../../services/user.service.js";
+import type { ITokenResponse, IUserContext } from '@loomcore/common/models';
+import type { IDatabase } from '../../databases/models/index.js';
+import type { UserService } from '../../services/user.service.js';
 export declare function logUserIn(database: IDatabase, userContext: IUserContext, deviceId: string, userService?: UserService): Promise<ITokenResponse>;

package/dist/utils/auth/log-user-in.util.js

@@ -1,8 +1,8 @@
-import { generateJwt } from "../jwt.utils.js";
-import { createNewRefreshToken } from "./create-new-refresh-token.util.js";
-import { getAuthConfig } from "./get-auth-config.util.js";
-import { getExpiresOnFromSeconds } from "./get-expires-on-from-seconds.util.js";
-import { updateLastLoggedIn } from "./update-last-logged-in.util.js";
+import { generateJwt } from '../jwt.utils.js';
+import { createNewRefreshToken } from './create-new-refresh-token.util.js';
+import { getAuthConfig } from './get-auth-config.util.js';
+import { getExpiresOnFromSeconds } from './get-expires-on-from-seconds.util.js';
+import { updateLastLoggedIn } from './update-last-logged-in.util.js';
 export async function logUserIn(database, userContext, deviceId, userService) {
     const authConfig = getAuthConfig();
     const accessToken = generateJwt(userContext);

package/dist/utils/auth/request-token-using-refresh-token.util.d.ts

@@ -1,5 +1,5 @@
-import { type ITokenResponse } from "@loomcore/common/models";
-import type { IDatabase } from "../../databases/models/index.js";
-import { AuthorizationsService } from "../../services/authorizations.service.js";
-import { UserService } from "../../services/user.service.js";
+import { type ITokenResponse } from '@loomcore/common/models';
+import type { IDatabase } from '../../databases/models/index.js';
+import { AuthorizationsService } from '../../services/authorizations.service.js';
+import { UserService } from '../../services/user.service.js';
 export declare function requestTokenUsingRefreshToken(database: IDatabase, refreshToken: string, deviceId: string, userService?: UserService, authorizationsService?: AuthorizationsService): Promise<ITokenResponse | null>;

package/dist/utils/auth/request-token-using-refresh-token.util.js

@@ -1,9 +1,9 @@
-import { getSystemUserContext, } from "@loomcore/common/models";
-import { AuthorizationsService } from "../../services/authorizations.service.js";
-import { UserService } from "../../services/user.service.js";
-import { createNewTokens } from "./create-new-tokens.util.js";
-import { getActiveRefreshToken } from "./get-active-refresh-token.util.js";
-import { BadRequestError } from "../../errors/index.js";
+import { getSystemUserContext, } from '@loomcore/common/models';
+import { AuthorizationsService } from '../../services/authorizations.service.js';
+import { UserService } from '../../services/user.service.js';
+import { createNewTokens } from './create-new-tokens.util.js';
+import { getActiveRefreshToken } from './get-active-refresh-token.util.js';
+import { BadRequestError } from '../../errors/index.js';
 export async function requestTokenUsingRefreshToken(database, refreshToken, deviceId, userService = new UserService(database), authorizationsService = new AuthorizationsService(database)) {
     const systemUserContext = getSystemUserContext();
     const activeRefreshToken = await getActiveRefreshToken(database, systemUserContext, refreshToken, deviceId);
@@ -15,7 +15,7 @@ export async function requestTokenUsingRefreshToken(database, refreshToken, devi
     };
     const user = await userService.findOne(systemUserContext, userQueryOptions);
     if (!user) {
-        throw new BadRequestError("User not found");
+        throw new BadRequestError('User not found');
     }
     const features = await authorizationsService.getUserContextFeatures(user);
     const userContext = {

package/dist/utils/auth/reset-password.util.d.ts

@@ -1,5 +1,5 @@
-import { type IModelSpec, type IOrganization } from "@loomcore/common/models";
-import type { IDatabase } from "../../databases/models/index.js";
-import type { UpdateResult } from "../../databases/models/update-result.js";
-import { UserService } from "../../services/user.service.js";
+import { type IModelSpec, type IOrganization } from '@loomcore/common/models';
+import type { IDatabase } from '../../databases/models/index.js';
+import type { UpdateResult } from '../../databases/models/update-result.js';
+import { UserService } from '../../services/user.service.js';
 export declare function resetPassword(database: IDatabase, email: string, passwordResetToken: string, password: string, organization: IOrganization | null, userService?: UserService, userSpec?: IModelSpec): Promise<UpdateResult>;

package/dist/utils/auth/reset-password.util.js

@@ -1,12 +1,12 @@
-import { EmptyUserContext, passwordValidator, UserSpec, } from "@loomcore/common/models";
-import { entityUtils } from "@loomcore/common/utils";
-import { BadRequestError, ServerError } from "../../errors/index.js";
-import { PasswordResetTokenService } from "../../services/password-reset-token.service.js";
-import { UserService } from "../../services/user.service.js";
-import { changePassword } from "./change-password.util.js";
+import { EmptyUserContext, passwordValidator, UserSpec, } from '@loomcore/common/models';
+import { entityUtils } from '@loomcore/common/utils';
+import { BadRequestError, ServerError } from '../../errors/index.js';
+import { PasswordResetTokenService } from '../../services/password-reset-token.service.js';
+import { UserService } from '../../services/user.service.js';
+import { changePassword } from './change-password.util.js';
 export async function resetPassword(database, email, passwordResetToken, password, organization, userService = new UserService(database), userSpec = UserSpec) {
     const validationErrors = entityUtils.validate(userSpec, { password: password }, true, passwordValidator);
-    entityUtils.handleValidationResult(validationErrors, "AuthService.resetPassword");
+    entityUtils.handleValidationResult(validationErrors, 'AuthService.resetPassword');
     const lowerCaseEmail = email.toLowerCase();
     const passwordResetTokenService = new PasswordResetTokenService(database);
     const userContext = {
@@ -24,7 +24,7 @@ export async function resetPassword(database, email, passwordResetToken, passwor
     }
     if (retrievedPasswordResetToken.token !== passwordResetToken ||
         retrievedPasswordResetToken.expiresOn < Date.now()) {
-        throw new BadRequestError("Invalid password reset token");
+        throw new BadRequestError('Invalid password reset token');
     }
     const user = await userService.findOne(userContext, {
         filters: { email: { eq: lowerCaseEmail } },

package/dist/utils/auth/send-reset-password-email.util.d.ts

@@ -1,3 +1,3 @@
-import { type IUserContext } from "@loomcore/common/models";
-import type { IDatabase } from "../../databases/models/index.js";
+import { type IUserContext } from '@loomcore/common/models';
+import type { IDatabase } from '../../databases/models/index.js';
 export declare function sendResetPasswordEmail(userContext: IUserContext, database: IDatabase, emailAddress: string, clientBaseUrl: string): Promise<void>;

package/dist/utils/auth/send-reset-password-email.util.js

@@ -1,8 +1,8 @@
-import { ServerError } from "../../errors/index.js";
-import { EmailService } from "../../services/email.service.js";
-import { PasswordResetTokenService } from "../../services/password-reset-token.service.js";
-import { getAuthConfig } from "./get-auth-config.util.js";
-import { getExpiresOnFromMinutes } from "./get-expires-on-from-minutes.util.js";
+import { ServerError } from '../../errors/index.js';
+import { EmailService } from '../../services/email.service.js';
+import { PasswordResetTokenService } from '../../services/password-reset-token.service.js';
+import { getAuthConfig } from './get-auth-config.util.js';
+import { getExpiresOnFromMinutes } from './get-expires-on-from-minutes.util.js';
 export async function sendResetPasswordEmail(userContext, database, emailAddress, clientBaseUrl) {
     const authConfig = getAuthConfig();
     const passwordResetTokenService = new PasswordResetTokenService(database);

package/dist/utils/auth/update-last-logged-in.util.d.ts

@@ -1,4 +1,4 @@
-import type { AppIdType } from "@loomcore/common/types";
-import type { IDatabase } from "../../databases/models/index.js";
-import { UserService } from "../../services/user.service.js";
+import type { AppIdType } from '@loomcore/common/types';
+import type { IDatabase } from '../../databases/models/index.js';
+import { UserService } from '../../services/user.service.js';
 export declare function updateLastLoggedIn(database: IDatabase, userId: AppIdType, userService?: UserService): Promise<void>;

package/dist/utils/auth/update-last-logged-in.util.js

@@ -1,6 +1,6 @@
-import { getSystemUserContext } from "@loomcore/common/models";
-import moment from "moment";
-import { UserService } from "../../services/user.service.js";
+import { getSystemUserContext } from '@loomcore/common/models';
+import moment from 'moment';
+import { UserService } from '../../services/user.service.js';
 export async function updateLastLoggedIn(database, userId, userService = new UserService(database)) {
     try {
         const updates = {

package/dist/utils/create-public-spec.utils.d.ts

@@ -1,2 +1,2 @@
-import { IModelSpec } from "@loomcore/common/models";
+import { IModelSpec } from '@loomcore/common/models';
 export declare function createPublicSpec(spec: IModelSpec): IModelSpec;

package/dist/utils/create-public-spec.utils.js

@@ -1,5 +1,5 @@
-import { entityUtils } from "@loomcore/common/utils";
-import { config } from "../config/index.js";
+import { entityUtils } from '@loomcore/common/utils';
+import { config } from '../config/index.js';
 export function createPublicSpec(spec) {
     if (config.debug?.showAuditFields) {
         return spec;

package/dist/utils/express.utils.d.ts

@@ -1,8 +1,8 @@
 import { Application } from 'express';
-import { MongoClient } from "mongodb";
-import type { Client, Pool } from "pg";
-import { Server } from "http";
-import { IBaseApiConfig } from "../models/index.js";
+import { MongoClient } from 'mongodb';
+import type { Client, Pool } from 'pg';
+import { Server } from 'http';
+import { IBaseApiConfig } from '../models/index.js';
 import { IDatabase } from '../databases/models/index.js';
 type RouteSetupFunction = (app: Application, database: IDatabase, config: IBaseApiConfig) => void;
 declare function setupExpressApp(database: IDatabase, config: IBaseApiConfig, setupRoutes: RouteSetupFunction): Application;

package/dist/utils/express.utils.js

@@ -1,10 +1,10 @@
 import express from 'express';
-import cookieParser from "cookie-parser";
-import bodyParser from "body-parser";
-import cors from "cors";
+import cookieParser from 'cookie-parser';
+import bodyParser from 'body-parser';
+import cors from 'cors';
 import qs from 'qs';
-import { NotFoundError } from "../errors/not-found.error.js";
-import { errorHandler } from "../middleware/error-handler.js";
+import { NotFoundError } from '../errors/not-found.error.js';
+import { errorHandler } from '../middleware/error-handler.js';
 import { ensureUserContext } from '../middleware/ensure-user-context.js';
 function setupExpressApp(database, config, setupRoutes) {
     const app = express();

package/dist/utils/index.d.ts

@@ -1,10 +1,10 @@
-export * from "./address.utils.js";
-export * from "./api.utils.js";
-export * from "./auth/index.js";
-export * from "./conversion.utils.js";
-export * from "./create-public-spec.utils.js";
-export * from "./express.utils.js";
-export * from "./jwt.utils.js";
-export * from "./logger.utils.js";
-export * from "./password.utils.js";
-export * from "./string.utils.js";
+export * from './address.utils.js';
+export * from './api.utils.js';
+export * from './auth/index.js';
+export * from './conversion.utils.js';
+export * from './create-public-spec.utils.js';
+export * from './express.utils.js';
+export * from './jwt.utils.js';
+export * from './logger.utils.js';
+export * from './password.utils.js';
+export * from './string.utils.js';

package/dist/utils/index.js

@@ -1,10 +1,10 @@
-export * from "./address.utils.js";
-export * from "./api.utils.js";
-export * from "./auth/index.js";
-export * from "./conversion.utils.js";
-export * from "./create-public-spec.utils.js";
-export * from "./express.utils.js";
-export * from "./jwt.utils.js";
-export * from "./logger.utils.js";
-export * from "./password.utils.js";
-export * from "./string.utils.js";
+export * from './address.utils.js';
+export * from './api.utils.js';
+export * from './auth/index.js';
+export * from './conversion.utils.js';
+export * from './create-public-spec.utils.js';
+export * from './express.utils.js';
+export * from './jwt.utils.js';
+export * from './logger.utils.js';
+export * from './password.utils.js';
+export * from './string.utils.js';

package/dist/utils/jwt.utils.d.ts

@@ -1,2 +1,2 @@
-import type { IUserContext } from "@loomcore/common/models";
+import type { IUserContext } from '@loomcore/common/models';
 export declare function generateJwt(userContext: IUserContext): string;

package/dist/utils/jwt.utils.js

@@ -1,9 +1,9 @@
-import jwt from "jsonwebtoken";
-import { getAuthConfig } from "./auth/get-auth-config.util.js";
+import jwt from 'jsonwebtoken';
+import { getAuthConfig } from './auth/get-auth-config.util.js';
 export function generateJwt(userContext) {
     const authConfig = getAuthConfig();
     const jwtExpiryConfig = authConfig.jwtExpirationInSeconds;
-    const jwtExpirationInSeconds = typeof jwtExpiryConfig === "string"
+    const jwtExpirationInSeconds = typeof jwtExpiryConfig === 'string'
         ? Number.parseInt(jwtExpiryConfig, 10)
         : jwtExpiryConfig;
     return jwt.sign(userContext, authConfig.clientSecret, {

package/dist/utils/logger.utils.d.ts

@@ -1,4 +1,4 @@
-import { LogLevel } from "../models/index.js";
+import { LogLevel } from '../models/index.js';
 export declare const getCurrentLogLevel: () => LogLevel;
 export declare const logger: {
     debug: (...args: unknown[]) => void;

package/dist/utils/logger.utils.js

@@ -1,4 +1,4 @@
-import { config } from "../config/index.js";
+import { config } from '../config/index.js';
 const LOG_LEVEL_PRIORITIES = {
     debug: 0,
     info: 1,
@@ -7,13 +7,13 @@ const LOG_LEVEL_PRIORITIES = {
 };
 export const getCurrentLogLevel = () => {
     const envLogLevel = config.debug?.logLevel?.toLowerCase();
-    if (envLogLevel === "debug" ||
-        envLogLevel === "info" ||
-        envLogLevel === "warn" ||
-        envLogLevel === "error") {
+    if (envLogLevel === 'debug' ||
+        envLogLevel === 'info' ||
+        envLogLevel === 'warn' ||
+        envLogLevel === 'error') {
         return envLogLevel;
     }
-    return "info";
+    return 'info';
 };
 const shouldLog = (messageLevel) => {
     const currentLevel = getCurrentLogLevel();
@@ -21,22 +21,22 @@ const shouldLog = (messageLevel) => {
 };
 export const logger = {
     debug: (...args) => {
-        if (shouldLog("debug")) {
+        if (shouldLog('debug')) {
             console.debug(...args);
         }
     },
     info: (...args) => {
-        if (shouldLog("info")) {
+        if (shouldLog('info')) {
             console.info(...args);
         }
     },
     warn: (...args) => {
-        if (shouldLog("warn")) {
+        if (shouldLog('warn')) {
             console.warn(...args);
         }
     },
     error: (...args) => {
-        if (shouldLog("error")) {
+        if (shouldLog('error')) {
             console.error(...args);
         }
     },

package/dist/utils/password.utils.js

@@ -1,21 +1,21 @@
-import { randomBytes, scrypt } from "node:crypto";
-import { promisify } from "util";
+import { randomBytes, scrypt } from 'node:crypto';
+import { promisify } from 'util';
 const scryptAsync = promisify(scrypt);
 async function hashPassword(password) {
-    const salt = randomBytes(8).toString("hex");
+    const salt = randomBytes(8).toString('hex');
     const buf = (await scryptAsync(password, salt, 64));
-    return `${buf.toString("hex")}.${salt}`;
+    return `${buf.toString('hex')}.${salt}`;
 }
 async function comparePasswords(storedPassword, suppliedPassword) {
-    if (!storedPassword?.includes(".")) {
+    if (!storedPassword?.includes('.')) {
         return false;
     }
-    const [hashedPassword, salt] = storedPassword.split(".");
+    const [hashedPassword, salt] = storedPassword.split('.');
     if (!salt) {
         return false;
     }
     const buf = (await scryptAsync(suppliedPassword, salt, 64));
-    return buf.toString("hex") === hashedPassword;
+    return buf.toString('hex') === hashedPassword;
 }
 export const passwordUtils = {
     hashPassword,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.42",
+  "version": "0.2.45",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {
@@ -46,6 +46,7 @@
     "./config": "./dist/config/index.js",
     "./controllers": "./dist/controllers/index.js",
     "./databases": "./dist/databases/index.js",
+    "./decorators": "./dist/decorators/index.js",
     "./errors": "./dist/errors/index.js",
     "./middleware": "./dist/middleware/index.js",
     "./models": "./dist/models/index.js",