@loomcore/api 0.1.60 → 0.1.63

package/dist/databases/postgres/postgres.database.js

@@ -68,23 +68,23 @@ export class PostgresDatabase {
     }
     async getUserAuthorizations(userId, orgId) {
         const now = new Date();
-        let query = `
-            SELECT DISTINCT
-                ur."userId" as "userId",
-                r."name" as "role",
-                f."name" as "feature",
-                a."config",
-                a."_id",
-                a."_orgId"
-            FROM "user_roles" ur
-            INNER JOIN "roles" r ON ur."roleId" = r."_id"
-            INNER JOIN "authorizations" a ON r."_id" = a."roleId"
-            INNER JOIN "features" f ON a."featureId" = f."_id"
-            WHERE ur."userId" = $1
-                AND ur."_deleted" IS NULL
-                AND a."_deleted" IS NULL
-                AND (a."startDate" IS NULL OR a."startDate" <= $2)
-                AND (a."endDate" IS NULL OR a."endDate" >= $2)
+        let query = `
+            SELECT DISTINCT
+                ur."userId" as "userId",
+                r."name" as "role",
+                f."name" as "feature",
+                a."config",
+                a."_id",
+                a."_orgId"
+            FROM "user_roles" ur
+            INNER JOIN "roles" r ON ur."roleId" = r."_id"
+            INNER JOIN "authorizations" a ON r."_id" = a."roleId"
+            INNER JOIN "features" f ON a."featureId" = f."_id"
+            WHERE ur."userId" = $1
+                AND ur."_deleted" IS NULL
+                AND a."_deleted" IS NULL
+                AND (a."startDate" IS NULL OR a."startDate" <= $2)
+                AND (a."endDate" IS NULL OR a."endDate" >= $2)
         `;
         const values = [userId, now];
         if (orgId) {

package/dist/databases/postgres/utils/build-select-clause.js

@@ -1,11 +1,11 @@
 import { Join } from '../../operations/join.operation.js';
 async function getTableColumns(client, tableName) {
-    const result = await client.query(`
-            SELECT column_name
-            FROM information_schema.columns
-            WHERE table_schema = current_schema()
-              AND table_name = $1
-            ORDER BY ordinal_position
+    const result = await client.query(`
+            SELECT column_name
+            FROM information_schema.columns
+            WHERE table_schema = current_schema()
+              AND table_name = $1
+            ORDER BY ordinal_position
         `, [tableName]);
     return result.rows.map(row => row.column_name);
 }

package/dist/databases/postgres/utils/does-table-exist.util.js

@@ -1,8 +1,8 @@
 export async function doesTableExist(client, tableName) {
-    const result = await client.query(`
-        SELECT EXISTS (
-            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
-        )
+    const result = await client.query(`
+        SELECT EXISTS (
+            SELECT 1 FROM information_schema.tables WHERE table_schema = current_schema() AND table_name = $1
+        )
     `, [tableName]);
     return result.rows[0].exists;
 }

package/dist/models/base-api-config.interface.d.ts

@@ -1,16 +1,17 @@
 import { DbType } from "../databases/db-type.type.js";
 import { IAuthConfig } from "./auth-config.interface.js";
+import { IEmailConfig } from "./email-config.interface.js";
+import { IMultiTenantConfig } from "./multi-tenant-config.interface.js";
 export interface IBaseApiConfig {
     app: {
-        dbType?: DbType;
+        dbType: DbType;
         isMultiTenant: boolean;
-        metaOrgCode?: string;
-        metaOrgName?: string;
+        isAuthEnabled: boolean;
         name: string;
         primaryTimezone?: string;
     };
     auth?: IAuthConfig;
-    database?: {
+    database: {
         host: string;
         name: string;
         password: string;
@@ -20,13 +21,9 @@ export interface IBaseApiConfig {
     debug?: {
         showErrors?: boolean;
     };
-    email?: {
-        emailApiKey: string;
-        emailApiSecret: string;
-        fromAddress: string;
-        systemEmailAddress: string;
-    };
+    email?: IEmailConfig;
     env: string;
+    multiTenant?: IMultiTenantConfig;
     network: {
         corsAllowedOrigins: string[];
         externalPort?: number;

package/dist/models/email-client.interface.d.ts

@@ -0,0 +1,3 @@
+export interface IEmailClient {
+    sendHtmlEmail(toEmailAddress: string, subject: string, body: string): Promise<void>;
+}

package/dist/models/email-client.interface.js

@@ -0,0 +1 @@
+export {};

package/dist/models/email-config.interface.d.ts

@@ -0,0 +1,4 @@
+export interface IEmailConfig {
+    fromAddress: string;
+    systemEmailAddress: string;
+}

package/dist/models/email-config.interface.js

@@ -0,0 +1 @@
+export {};

package/dist/models/index.d.ts

@@ -1,2 +1,3 @@
 export * from './base-api-config.interface.js';
 export * from './refresh-token.model.js';
+export * from './email-client.interface.js';

package/dist/models/index.js

@@ -1,2 +1,3 @@
 export * from './base-api-config.interface.js';
 export * from './refresh-token.model.js';
+export * from './email-client.interface.js';

package/dist/models/multi-tenant-config.interface.d.ts

@@ -0,0 +1,4 @@
+export interface IMultiTenantConfig {
+    metaOrgCode: string;
+    metaOrgName: string;
+}

package/dist/models/multi-tenant-config.interface.js

@@ -0,0 +1 @@
+export {};

package/dist/services/auth.service.d.ts

@@ -5,13 +5,14 @@ import { MultiTenantApiService } from './multi-tenant-api.service.js';
 import { UpdateResult } from '../databases/models/update-result.js';
 import { IRefreshToken } from '../models/refresh-token.model.js';
 import { IDatabase } from '../databases/models/index.js';
+import { IEmailClient } from '../models/email-client.interface.js';
 export declare class AuthService extends MultiTenantApiService<IUser> {
     private refreshTokenService;
     private passwordResetTokenService;
     private emailService;
     private organizationService;
     private authConfig;
-    constructor(database: IDatabase);
+    constructor(database: IDatabase, emailClient: IEmailClient);
     attemptLogin(req: Request, res: Response, email: string, password: string): Promise<ILoginResponse | null>;
     logUserIn(userContext: IUserContext, deviceId: string): Promise<{
         tokens: {

package/dist/services/auth.service.js

@@ -18,11 +18,11 @@ export class AuthService extends MultiTenantApiService {
     emailService;
     organizationService;
     authConfig;
-    constructor(database) {
+    constructor(database, emailClient) {
         super(database, 'users', 'user', UserSpec);
         this.refreshTokenService = new GenericApiService(database, 'refreshTokens', 'refreshToken', refreshTokenModelSpec);
         this.passwordResetTokenService = new PasswordResetTokenService(database);
-        this.emailService = new EmailService();
+        this.emailService = new EmailService(emailClient);
         this.organizationService = new OrganizationService(database);
         if (!config.auth) {
             throw new ServerError('Auth configuration is not set');

package/dist/services/email.service.d.ts

@@ -1,6 +1,7 @@
-import * as Mailjet from 'node-mailjet';
+import { IEmailClient } from '../models/email-client.interface.js';
 export declare class EmailService {
-    private mailjet;
-    constructor();
-    sendHtmlEmail(emailAddress: string, subject: string, body: string): Promise<Mailjet.LibraryResponse<import("node-mailjet/declarations/request/Request.js").RequestData>>;
+    private emailConfig;
+    private emailClient;
+    constructor(emailClient: IEmailClient);
+    sendHtmlEmail(emailAddress: string, subject: string, body: string): Promise<void>;
 }

package/dist/services/email.service.js

@@ -1,29 +1,24 @@
-import * as Mailjet from 'node-mailjet';
 import { ServerError } from '../errors/index.js';
 import { config } from '../config/index.js';
 export class EmailService {
-    mailjet = null;
-    constructor() {
-        if (config && config.email?.emailApiKey && config.email?.emailApiSecret) {
-            this.mailjet = new Mailjet.default({
-                apiKey: config.email.emailApiKey,
-                apiSecret: config.email.emailApiSecret
-            });
+    emailConfig;
+    emailClient;
+    constructor(emailClient) {
+        if (config.email) {
+            this.emailConfig = config.email;
         }
+        else {
+            throw new ServerError('Email configuration is not available. Email API credentials are not set in the config.');
+        }
+        this.emailClient = emailClient;
     }
     async sendHtmlEmail(emailAddress, subject, body) {
-        if (!config || !config.email?.fromAddress) {
-            throw new ServerError('Email configuration is not available. From address is not set in the config.');
-        }
-        if (!this.mailjet) {
-            throw new ServerError('Email service is not configured. Email API credentials are not set in the config.');
-        }
         const messageData = {
             Messages: [
                 {
                     From: {
-                        Email: config.email?.fromAddress,
-                        Name: config.app.name || 'Application'
+                        Email: this.emailConfig.fromAddress,
+                        Name: config.app.name
                     },
                     To: [
                         {
@@ -36,11 +31,8 @@ export class EmailService {
             ]
         };
         try {
-            const result = await this.mailjet
-                .post('send', { version: 'v3.1' })
-                .request(messageData);
+            await this.emailClient.sendHtmlEmail(emailAddress, subject, body);
             console.log(`Email sent to ${emailAddress} with subject ${subject}`);
-            return result;
         }
         catch (error) {
             console.error('Error sending email:', error);

package/package.json

@@ -1,88 +1,88 @@
-{
-  "name": "@loomcore/api",
-  "version": "0.1.60",
-  "private": false,
-  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "tsc": "tsc --project tsconfig.prod.json",
-    "build": "npm-run-all -s clean tsc",
-    "add": "git add .",
-    "commit": "git commit -m \"Updates\"",
-    "patch": "npm version patch",
-    "push": "git push",
-    "publishMe": "npm publish --access public",
-    "pub": "npm-run-all -s add commit patch build push publishMe",
-    "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/common",
-    "install-updated-libs": "npm i @loomcore/common",
-    "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
-    "typecheck": "tsc",
-    "test": "npm-run-all -s test:postgres test:mongodb",
-    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run",
-    "test:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run",
-    "test:ci": "npm-run-all -s test:ci:postgres test:ci:mongodb",
-    "test:ci:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --reporter=json --outputFile=test-results-postgres.json",
-    "test:ci:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --reporter=json --outputFile=test-results-mongodb.json",
-    "test:watch": "cross-env NODE_ENV=test vitest",
-    "coverage": "npm-run-all -s coverage:postgres coverage:mongodb",
-    "coverage:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --coverage",
-    "coverage:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --coverage"
-  },
-  "author": "Tim Hardy",
-  "license": "Apache 2.0",
-  "main": "dist/index.js",
-  "type": "module",
-  "types": "dist/index.d.ts",
-  "files": [
-    "dist/**/*"
-  ],
-  "exports": {
-    "./__tests__": "./dist/__tests__/index.js",
-    "./config": "./dist/config/index.js",
-    "./controllers": "./dist/controllers/index.js",
-    "./databases": "./dist/databases/index.js",
-    "./errors": "./dist/errors/index.js",
-    "./middleware": "./dist/middleware/index.js",
-    "./models": "./dist/models/index.js",
-    "./services": "./dist/services/index.js",
-    "./utils": "./dist/utils/index.js"
-  },
-  "dependencies": {
-    "jsonwebtoken": "^9.0.2",
-    "node-mailjet": "^6.0.8",
-    "qs": "^6.14.1"
-  },
-  "peerDependencies": {
-    "@loomcore/common": "^0.0.43",
-    "@sinclair/typebox": "0.34.33",
-    "cookie-parser": "^1.4.6",
-    "cors": "^2.8.5",
-    "express": "^5.1.0",
-    "lodash": "^4.17.21",
-    "moment": "^2.30.1",
-    "mongodb": "^6.16.0",
-    "pg": "^8.15.6",
-    "rxjs": "^7.8.0",
-    "umzug": "^3.8.2"
-  },
-  "devDependencies": {
-    "@types/cookie-parser": "^1.4.7",
-    "@types/cors": "^2.8.18",
-    "@types/express": "^5.0.1",
-    "@types/jsonwebtoken": "^9.0.9",
-    "@types/lodash": "^4.17.13",
-    "@types/pg": "^8.15.6",
-    "@types/qs": "^6.14.0",
-    "@types/supertest": "^6.0.3",
-    "@vitest/coverage-v8": "^3.0.9",
-    "cross-env": "^7.0.3",
-    "mongodb-memory-server": "^9.3.0",
-    "npm-run-all": "^4.1.5",
-    "pg-mem": "^3.0.5",
-    "rxjs": "^7.8.0",
-    "supertest": "^7.1.0",
-    "typescript": "^5.8.3",
-    "vite": "^6.2.5",
-    "vitest": "^3.0.9"
-  }
-}
+{
+  "name": "@loomcore/api",
+  "version": "0.1.63",
+  "private": false,
+  "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
+  "scripts": {
+    "clean": "rm -rf dist",
+    "tsc": "tsc --project tsconfig.prod.json",
+    "build": "npm-run-all -s clean tsc",
+    "add": "git add .",
+    "commit": "git commit -m \"Updates\"",
+    "patch": "npm version patch",
+    "push": "git push",
+    "publishMe": "npm publish --access public",
+    "pub": "npm-run-all -s add commit patch build push publishMe",
+    "update-lib-versions": "npx --yes npm-check-updates -u -f @loomcore/common",
+    "install-updated-libs": "npm i @loomcore/common",
+    "update-libs": "npm-run-all -s update-lib-versions install-updated-libs",
+    "typecheck": "tsc",
+    "test": "npm-run-all -s test:postgres test:mongodb",
+    "test:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run",
+    "test:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run",
+    "test:ci": "npm-run-all -s test:ci:postgres test:ci:mongodb",
+    "test:ci:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --reporter=json --outputFile=test-results-postgres.json",
+    "test:ci:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --reporter=json --outputFile=test-results-mongodb.json",
+    "test:watch": "cross-env NODE_ENV=test vitest",
+    "coverage": "npm-run-all -s coverage:postgres coverage:mongodb",
+    "coverage:postgres": "cross-env NODE_ENV=test TEST_DATABASE=postgres vitest run --coverage",
+    "coverage:mongodb": "cross-env NODE_ENV=test TEST_DATABASE=mongodb vitest run --coverage"
+  },
+  "author": "Tim Hardy",
+  "license": "Apache 2.0",
+  "main": "dist/index.js",
+  "type": "module",
+  "types": "dist/index.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "exports": {
+    "./__tests__": "./dist/__tests__/index.js",
+    "./config": "./dist/config/index.js",
+    "./controllers": "./dist/controllers/index.js",
+    "./databases": "./dist/databases/index.js",
+    "./errors": "./dist/errors/index.js",
+    "./middleware": "./dist/middleware/index.js",
+    "./models": "./dist/models/index.js",
+    "./services": "./dist/services/index.js",
+    "./utils": "./dist/utils/index.js"
+  },
+  "dependencies": {
+    "jsonwebtoken": "^9.0.2",
+    "node-mailjet": "^6.0.8",
+    "qs": "^6.14.1"
+  },
+  "peerDependencies": {
+    "@loomcore/common": "^0.0.43",
+    "@sinclair/typebox": "0.34.33",
+    "cookie-parser": "^1.4.6",
+    "cors": "^2.8.5",
+    "express": "^5.1.0",
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
+    "mongodb": "^6.16.0",
+    "pg": "^8.15.6",
+    "rxjs": "^7.8.0",
+    "umzug": "^3.8.2"
+  },
+  "devDependencies": {
+    "@types/cookie-parser": "^1.4.7",
+    "@types/cors": "^2.8.18",
+    "@types/express": "^5.0.1",
+    "@types/jsonwebtoken": "^9.0.9",
+    "@types/lodash": "^4.17.13",
+    "@types/pg": "^8.15.6",
+    "@types/qs": "^6.14.0",
+    "@types/supertest": "^6.0.3",
+    "@vitest/coverage-v8": "^3.0.9",
+    "cross-env": "^7.0.3",
+    "mongodb-memory-server": "^9.3.0",
+    "npm-run-all": "^4.1.5",
+    "pg-mem": "^3.0.5",
+    "rxjs": "^7.8.0",
+    "supertest": "^7.1.0",
+    "typescript": "^5.8.3",
+    "vite": "^6.2.5",
+    "vitest": "^3.0.9"
+  }
+}