@loomcore/api 0.1.21 → 0.1.23

package/dist/databases/postgres/commands/postgres-update.command.js

@@ -17,10 +17,10 @@ export async function update(client, queryObject, entity, operations, pluralReso
             const originalIndex = parseInt(num, 10);
             return `$${originalIndex + updateValues.length}`;
         });
-        const updateQuery = `
-            UPDATE "${pluralResourceName}"
-            SET ${setClause}
-            ${whereClauseWithAdjustedParams}
+        const updateQuery = `
+            UPDATE "${pluralResourceName}"
+            SET ${setClause}
+            ${whereClauseWithAdjustedParams}
         `;
         const allUpdateValues = [...updateValues, ...whereValues];
         const result = await client.query(updateQuery, allUpdateValues);
@@ -29,9 +29,9 @@ export async function update(client, queryObject, entity, operations, pluralReso
         }
         const joinClauses = buildJoinClauses(operations);
         const orderByClause = buildOrderByClause(queryObject);
-        const selectQuery = `
-            SELECT * FROM "${pluralResourceName}" ${joinClauses}
-            ${whereClause} ${orderByClause}
+        const selectQuery = `
+            SELECT * FROM "${pluralResourceName}" ${joinClauses}
+            ${whereClause} ${orderByClause}
         `.trim();
         const selectResult = await client.query(selectQuery, whereValues);
         return selectResult.rows;

package/dist/databases/postgres/migrations/001-create-migrations-table.migration.js

@@ -8,13 +8,13 @@ export class CreateMigrationTableMigration {
     async execute() {
         const _id = randomUUID().toString();
         try {
-            await this.client.query(`
-                CREATE TABLE "migrations" (
-                    "_id" VARCHAR(255) PRIMARY KEY,
-                    "index" INTEGER NOT NULL,
-                    "hasRun" BOOLEAN NOT NULL,
-                    "reverted" BOOLEAN NOT NULL
-                )
+            await this.client.query(`
+                CREATE TABLE "migrations" (
+                    "_id" VARCHAR(255) PRIMARY KEY,
+                    "index" INTEGER NOT NULL,
+                    "hasRun" BOOLEAN NOT NULL,
+                    "reverted" BOOLEAN NOT NULL
+                )
             `);
         }
         catch (error) {
@@ -23,9 +23,9 @@ export class CreateMigrationTableMigration {
             }
         }
         try {
-            const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -38,8 +38,8 @@ export class CreateMigrationTableMigration {
     }
     async revert() {
         try {
-            const result = await this.client.query(`
-            DROP TABLE "migrations";
+            const result = await this.client.query(`
+            DROP TABLE "migrations";
         `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error dropping migrations table: No row returned`) };

package/dist/databases/postgres/migrations/002-create-organizations-table.migration.js

@@ -12,22 +12,22 @@ export class CreateOrganizationsTableMigration {
     async execute() {
         const _id = randomUUID().toString();
         try {
-            await this.client.query(`
-            CREATE TABLE "organizations" (
-                "_id" VARCHAR(255) PRIMARY KEY,
-                "name" VARCHAR(255) NOT NULL,
-                "code" VARCHAR(255) NOT NULL,
-                "description" TEXT,
-                "status" INTEGER NOT NULL,
-                "isMetaOrg" BOOLEAN NOT NULL,
-                "authToken" TEXT,
-                "_created" TIMESTAMP NOT NULL,
-                "_createdBy" VARCHAR(255) NOT NULL,
-                "_updated" TIMESTAMP NOT NULL,
-                "_updatedBy" VARCHAR(255) NOT NULL,
-                "_deleted" TIMESTAMP,
-                "_deletedBy" VARCHAR(255)
-                )
+            await this.client.query(`
+            CREATE TABLE "organizations" (
+                "_id" VARCHAR(255) PRIMARY KEY,
+                "name" VARCHAR(255) NOT NULL,
+                "code" VARCHAR(255) NOT NULL,
+                "description" TEXT,
+                "status" INTEGER NOT NULL,
+                "isMetaOrg" BOOLEAN NOT NULL,
+                "authToken" TEXT,
+                "_created" TIMESTAMP NOT NULL,
+                "_createdBy" VARCHAR(255) NOT NULL,
+                "_updated" TIMESTAMP NOT NULL,
+                "_updatedBy" VARCHAR(255) NOT NULL,
+                "_deleted" TIMESTAMP,
+                "_deletedBy" VARCHAR(255)
+                )
             `);
         }
         catch (error) {
@@ -39,9 +39,9 @@ export class CreateOrganizationsTableMigration {
             }
         }
         try {
-            const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -54,8 +54,8 @@ export class CreateOrganizationsTableMigration {
     }
     async revert() {
         try {
-            const result = await this.client.query(`
-                DROP TABLE "organizations";
+            const result = await this.client.query(`
+                DROP TABLE "organizations";
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error dropping organizations table: No row returned`) };
@@ -65,12 +65,12 @@ export class CreateOrganizationsTableMigration {
             return { success: false, error: new Error(`Error dropping organizations table: ${error.message}`) };
         }
         try {
-            const result = await this.client.query(`
-                Update "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
+            const result = await this.client.query(`
+                Update "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
                 return {
-                    success: false, error: new Error(`Error updating migration record for index ${this.index}: Migration record not found.
+                    success: false, error: new Error(`Error updating migration record for index ${this.index}: Migration record not found.
                     Migration index: ${this.index}`)
                 };
             }

package/dist/databases/postgres/migrations/003-create-users-table.migration.js

@@ -8,25 +8,25 @@ export class CreateUsersTableMigration {
     async execute(_orgId) {
         const _id = randomUUID().toString();
         try {
-            await this.client.query(`
-                CREATE TABLE "users" (
-                    "_id" VARCHAR(255) PRIMARY KEY,
-                    "_orgId" VARCHAR(255),
-                    "email" VARCHAR(255) NOT NULL,
-                    "firstName" VARCHAR(255),
-                    "lastName" VARCHAR(255),
-                    "displayName" VARCHAR(255),
-                    "password" VARCHAR(255) NOT NULL,
-                    "roles" TEXT[],
-                    "_lastLoggedIn" TIMESTAMP,
-                    "_lastPasswordChange" TIMESTAMP,
-                    "_created" TIMESTAMP NOT NULL,
-                    "_createdBy" VARCHAR(255) NOT NULL,
-                    "_updated" TIMESTAMP NOT NULL,
-                    "_updatedBy" VARCHAR(255) NOT NULL,
-                    "_deleted" TIMESTAMP,
-                    "_deletedBy" VARCHAR(255)
-                )
+            await this.client.query(`
+                CREATE TABLE "users" (
+                    "_id" VARCHAR(255) PRIMARY KEY,
+                    "_orgId" VARCHAR(255),
+                    "email" VARCHAR(255) NOT NULL,
+                    "firstName" VARCHAR(255),
+                    "lastName" VARCHAR(255),
+                    "displayName" VARCHAR(255),
+                    "password" VARCHAR(255) NOT NULL,
+                    "roles" TEXT[],
+                    "_lastLoggedIn" TIMESTAMP,
+                    "_lastPasswordChange" TIMESTAMP,
+                    "_created" TIMESTAMP NOT NULL,
+                    "_createdBy" VARCHAR(255) NOT NULL,
+                    "_updated" TIMESTAMP NOT NULL,
+                    "_updatedBy" VARCHAR(255) NOT NULL,
+                    "_deleted" TIMESTAMP,
+                    "_deletedBy" VARCHAR(255)
+                )
             `);
         }
         catch (error) {
@@ -38,9 +38,9 @@ export class CreateUsersTableMigration {
             }
         }
         try {
-            const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -53,8 +53,8 @@ export class CreateUsersTableMigration {
     }
     async revert() {
         try {
-            const result = await this.client.query(`
-                DROP TABLE "users";
+            const result = await this.client.query(`
+                DROP TABLE "users";
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error dropping users table: No row returned`) };
@@ -64,8 +64,8 @@ export class CreateUsersTableMigration {
             return { success: false, error: new Error(`Error dropping users table: ${error.message}`) };
         }
         try {
-            const result = await this.client.query(`
-                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
+            const result = await this.client.query(`
+                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error updating migration record for index ${this.index}: No row returned`) };

package/dist/databases/postgres/migrations/004-create-refresh-tokens-table.migration.js

@@ -8,17 +8,17 @@ export class CreateRefreshTokenTableMigration {
     async execute(_orgId) {
         const _id = randomUUID().toString();
         try {
-            await this.client.query(`
-                CREATE TABLE "refreshTokens" (
-                    "_id" VARCHAR(255) PRIMARY KEY,
-                    "_orgId" VARCHAR(255),
-                    "token" VARCHAR(255) NOT NULL,
-                    "deviceId" VARCHAR(255) NOT NULL,
-                    "userId" VARCHAR(255) NOT NULL,
-                    "expiresOn" BIGINT NOT NULL,
-                    "created" TIMESTAMP NOT NULL,
-                    "createdBy" VARCHAR(255) NOT NULL
-                )
+            await this.client.query(`
+                CREATE TABLE "refreshTokens" (
+                    "_id" VARCHAR(255) PRIMARY KEY,
+                    "_orgId" VARCHAR(255),
+                    "token" VARCHAR(255) NOT NULL,
+                    "deviceId" VARCHAR(255) NOT NULL,
+                    "userId" VARCHAR(255) NOT NULL,
+                    "expiresOn" BIGINT NOT NULL,
+                    "created" TIMESTAMP NOT NULL,
+                    "createdBy" VARCHAR(255) NOT NULL
+                )
             `);
         }
         catch (error) {
@@ -30,9 +30,9 @@ export class CreateRefreshTokenTableMigration {
             }
         }
         try {
-            const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -45,8 +45,8 @@ export class CreateRefreshTokenTableMigration {
     }
     async revert() {
         try {
-            const result = await this.client.query(`
-                DROP TABLE "refreshTokens";
+            const result = await this.client.query(`
+                DROP TABLE "refreshTokens";
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error dropping refresh token table: No row returned`) };
@@ -56,8 +56,8 @@ export class CreateRefreshTokenTableMigration {
             return { success: false, error: new Error(`Error dropping refresh token table: ${error.message}`) };
         }
         try {
-            const result = await this.client.query(`
-                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
+            const result = await this.client.query(`
+                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error updating migration record for index ${this.index}: No row returned`) };

package/dist/databases/postgres/migrations/005-create-meta-org.migration.js

@@ -12,8 +12,8 @@ export class CreateMetaOrgMigration {
     async execute() {
         const _id = randomUUID().toString();
         try {
-            const result = await this.client.query(`
-                INSERT INTO "organizations" ("_id", "name", "code", "status", "isMetaOrg", "_created", "_createdBy", "_updated", "_updatedBy")
+            const result = await this.client.query(`
+                INSERT INTO "organizations" ("_id", "name", "code", "status", "isMetaOrg", "_created", "_createdBy", "_updated", "_updatedBy")
                 VALUES ('${_id}', '${this.orgName}', '${this.orgCode}', 1, true, NOW(), 'system', NOW(), 'system');`);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error creating meta org: No row returned`) };
@@ -23,9 +23,9 @@ export class CreateMetaOrgMigration {
             return { success: false, error: new Error(`Error creating meta org: ${error.message}`) };
         }
         try {
-            const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -47,8 +47,8 @@ export class CreateMetaOrgMigration {
             return { success: false, error: new Error(`Error reverting meta org: ${error.message}`) };
         }
         try {
-            const result = await this.client.query(`
-                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
+            const result = await this.client.query(`
+                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error updating migration record for index ${this.index}: No row returned`) };

package/dist/databases/postgres/migrations/006-create-admin-user.migration.js

@@ -34,9 +34,9 @@ export class CreateAdminUserMigration {
             return { success: false, error: new Error(`Error creating admin user: ${error.message}`) };
         }
         try {
-            const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };

package/dist/databases/postgres/migrations/setup-for-auth.migration.js

@@ -7,10 +7,10 @@ import { getSystemUserContext } from "@loomcore/common/models";
 export async function setupDatabaseForAuth(client, adminUsername, adminPassword) {
     let runMigrations = [];
     if (await doesTableExist(client, 'migrations')) {
-        const migrations = await client.query(`
-            SELECT "_id", "index"
-            FROM migrations
-            WHERE "hasRun" = TRUE AND "reverted" = FALSE
+        const migrations = await client.query(`
+            SELECT "_id", "index"
+            FROM migrations
+            WHERE "hasRun" = TRUE AND "reverted" = FALSE
         `);
         runMigrations = migrations.rows.map((row) => {
             return row.index;

package/dist/databases/postgres/migrations/setup-for-multitenant.migration.js

@@ -10,10 +10,10 @@ export async function setupDatabaseForMultitenant(client, orgName, orgCode) {
     let runMigrations = [];
     let metaOrgId = randomUUID().toString();
     if (await doesTableExist(client, 'migrations')) {
-        const migrations = await client.query(`
-            SELECT "_id", "index"
-            FROM migrations
-            WHERE "hasRun" = TRUE AND "reverted" = FALSE
+        const migrations = await client.query(`
+            SELECT "_id", "index"
+            FROM migrations
+            WHERE "hasRun" = TRUE AND "reverted" = FALSE
         `);
         runMigrations = migrations.rows.map((row) => {
             return row.index;

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/services/auth.service.d.ts

@@ -21,7 +21,7 @@ export declare class AuthService extends MultiTenantApiService<IUser> {
     } | null>;
     getUserByEmail(email: string): Promise<IUser | null>;
     createUser(userContext: IUserContext, user: Partial<IUser>): Promise<IUser | null>;
-    requestTokenUsingRefreshToken(userContext: IUserContext, refreshToken: string, deviceId: string): Promise<ITokenResponse | null>;
+    requestTokenUsingRefreshToken(refreshToken: string, deviceId: string): Promise<ITokenResponse | null>;
     changeLoggedInUsersPassword(userContext: IUserContext, body: any): Promise<UpdateResult>;
     changePassword(userContext: IUserContext, queryObject: any, password: string): Promise<UpdateResult>;
     createNewTokens(userContext: IUserContext, activeRefreshToken: IRefreshToken): Promise<{
@@ -29,8 +29,8 @@ export declare class AuthService extends MultiTenantApiService<IUser> {
         refreshToken: string;
         expiresOn: number;
     }>;
-    getActiveRefreshToken(userContext: IUserContext, refreshToken: string, deviceId: string): Promise<IRefreshToken | null>;
-    createNewRefreshToken(userId: string, deviceId: string, existingExpiresOn?: number | null, orgId?: string): Promise<IRefreshToken | null>;
+    getActiveRefreshToken(refreshToken: string, deviceId: string): Promise<IRefreshToken | null>;
+    createNewRefreshToken(userId: string, deviceId: string, orgId?: string): Promise<IRefreshToken | null>;
     sendResetPasswordEmail(emailAddress: string): Promise<void>;
     resetPassword(email: string, passwordResetToken: string, password: string): Promise<UpdateResult>;
     deleteRefreshTokensForDevice(deviceId: string): Promise<import("../databases/models/delete-result.js").DeleteResult>;

package/dist/services/auth.service.js

@@ -44,7 +44,7 @@ export class AuthService extends MultiTenantApiService {
     async logUserIn(userContext, deviceId) {
         const payload = userContext;
         const accessToken = this.generateJwt(payload);
-        const refreshTokenObject = await this.createNewRefreshToken(userContext.user._id, deviceId, null, userContext._orgId);
+        const refreshTokenObject = await this.createNewRefreshToken(userContext.user._id, deviceId, userContext._orgId);
         const accessTokenExpiresOn = this.getExpiresOnFromSeconds(config.auth.jwtExpirationInSeconds);
         let loginResponse = null;
         if (refreshTokenObject) {
@@ -88,10 +88,16 @@ export class AuthService extends MultiTenantApiService {
         const createdUser = await this.create(userContext, user);
         return createdUser;
     }
-    async requestTokenUsingRefreshToken(userContext, refreshToken, deviceId) {
+    async requestTokenUsingRefreshToken(refreshToken, deviceId) {
         let tokens = null;
-        const activeRefreshToken = await this.getActiveRefreshToken(userContext, refreshToken, deviceId);
+        const activeRefreshToken = await this.getActiveRefreshToken(refreshToken, deviceId);
         if (activeRefreshToken) {
+            const systemUserContext = getSystemUserContext();
+            const user = await this.getById(systemUserContext, activeRefreshToken.userId);
+            const userContext = {
+                _orgId: user._orgId,
+                user: user
+            };
             tokens = await this.createNewTokens(userContext, activeRefreshToken);
         }
         return tokens;
@@ -121,8 +127,8 @@ export class AuthService extends MultiTenantApiService {
         };
         return tokenResponse;
     }
-    async getActiveRefreshToken(userContext, refreshToken, deviceId) {
-        const refreshTokenResult = await this.refreshTokenService.findOne(userContext, { filters: { token: { eq: refreshToken }, deviceId: { eq: deviceId } } });
+    async getActiveRefreshToken(refreshToken, deviceId) {
+        const refreshTokenResult = await this.refreshTokenService.findOne(EmptyUserContext, { filters: { token: { eq: refreshToken }, deviceId: { eq: deviceId } } });
         let activeRefreshToken = null;
         if (refreshTokenResult) {
             const now = Date.now();
@@ -133,8 +139,8 @@ export class AuthService extends MultiTenantApiService {
         }
         return activeRefreshToken;
     }
-    async createNewRefreshToken(userId, deviceId, existingExpiresOn = null, orgId) {
-        const expiresOn = existingExpiresOn ? existingExpiresOn : this.getExpiresOnFromDays(config.auth.refreshTokenExpirationInDays);
+    async createNewRefreshToken(userId, deviceId, orgId) {
+        const expiresOn = this.getExpiresOnFromDays(config.auth.refreshTokenExpirationInDays);
         const newRefreshToken = {
             _orgId: orgId,
             token: this.generateRefreshToken(),

package/dist/services/multi-tenant-api.service.js

@@ -11,7 +11,7 @@ export class MultiTenantApiService extends GenericApiService {
         }
     }
     prepareQuery(userContext, queryOptions, operations) {
-        if (!config?.app?.isMultiTenant) {
+        if (!config?.app?.isMultiTenant || userContext?.user?._id === 'system') {
             return super.prepareQuery(userContext, queryOptions, operations);
         }
         if (!userContext || !userContext._orgId) {