@uniorganization/uni-lib 4.3.4 → 5.0.1

package/dist/entities/division-lob.types.d.ts

@@ -0,0 +1,23 @@
+export interface DivisionReference {
+    id: string;
+    name: string;
+}
+export interface LobReference {
+    id: string;
+    name: string;
+    division: DivisionReference;
+}
+export interface DivisionLobScope {
+    division: DivisionReference | null;
+    lob: LobReference | null;
+}
+export declare function toLobReference(assignment: {
+    lob?: {
+        id: string;
+        name: string;
+        division?: {
+            id: string;
+            name: string;
+        } | null;
+    } | null;
+}): LobReference | null;

package/dist/entities/division-lob.types.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toLobReference = toLobReference;
+function toLobReference(assignment) {
+    const lob = assignment.lob;
+    const division = lob === null || lob === void 0 ? void 0 : lob.division;
+    if (!lob || !division)
+        return null;
+    return {
+        id: String(lob.id),
+        name: lob.name,
+        division: { id: String(division.id), name: division.name },
+    };
+}

package/dist/entities/index.d.ts

@@ -9,6 +9,7 @@ export * from './config.entity';
 export * from './depreciation-categories.entity';
 export * from './depreciation-details.entity';
 export * from './division.entity';
+export * from './division-lob.types';
 export * from './detail-type.entity';
 export * from './lob.entity';
 export * from './users-lobs.entity';

package/dist/entities/index.js

@@ -25,6 +25,7 @@ __exportStar(require("./config.entity"), exports);
 __exportStar(require("./depreciation-categories.entity"), exports);
 __exportStar(require("./depreciation-details.entity"), exports);
 __exportStar(require("./division.entity"), exports);
+__exportStar(require("./division-lob.types"), exports);
 __exportStar(require("./detail-type.entity"), exports);
 __exportStar(require("./lob.entity"), exports);
 __exportStar(require("./users-lobs.entity"), exports);

package/dist/entities/usr.entity.d.ts

@@ -16,8 +16,6 @@ export declare class Users {
     is_active: number;
     password_expired: number;
     ntgid: string;
-    lob: string;
-    division: string;
     profile: string;
     viewEvaluations: boolean;
     ern: string;
@@ -27,5 +25,5 @@ export declare class Users {
     rawRoster: RawRoster;
     usersLobs: UsersLobs[];
     fullName: string;
-    applyDerivedScope(): void;
+    applyCalculatedProperties(): void;
 }

package/dist/entities/usr.entity.js

@@ -16,17 +16,8 @@ const user_roles_entity_1 = require("./user-roles.entity");
 const raw_roster_entity_1 = require("./raw_roster.entity");
 const users_lobs_entity_1 = require("./users-lobs.entity");
 let Users = class Users {
-    applyDerivedScope() {
-        var _a, _b, _c, _d, _e;
+    applyCalculatedProperties() {
         this.fullName = `${this.first_name} ${this.last_name}`;
-        const assignments = [...((_a = this.usersLobs) !== null && _a !== void 0 ? _a : [])]
-            .filter((assignment) => { var _a; return Boolean((_a = assignment.lob) === null || _a === void 0 ? void 0 : _a.name); })
-            .sort((left, right) => { var _a, _b, _c, _d; return ((_b = (_a = left.lob) === null || _a === void 0 ? void 0 : _a.name) !== null && _b !== void 0 ? _b : '').localeCompare((_d = (_c = right.lob) === null || _c === void 0 ? void 0 : _c.name) !== null && _d !== void 0 ? _d : ''); });
-        this.lob = assignments
-            .map((assignment) => { var _a; return (_a = assignment.lob) === null || _a === void 0 ? void 0 : _a.name; })
-            .filter((name) => Boolean(name))
-            .join(',');
-        this.division = (_e = (_d = (_c = (_b = assignments[0]) === null || _b === void 0 ? void 0 : _b.lob) === null || _c === void 0 ? void 0 : _c.division) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : '';
     }
 };
 exports.Users = Users;
@@ -121,7 +112,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", void 0)
-], Users.prototype, "applyDerivedScope", null);
+], Users.prototype, "applyCalculatedProperties", null);
 exports.Users = Users = __decorate([
     (0, typeorm_1.Entity)('USERS')
 ], Users);

package/dist/entities/vw-escalation-age.d.ts

@@ -2,8 +2,6 @@ export declare class VwEscalationAge {
     clientId: number;
     riskLevel: string;
     category: string;
-    division: string;
-    lob: string;
     divisionId: string | null;
     lobId: string | null;
     escalationStatus: string;

package/dist/entities/vw-escalation-age.js

@@ -26,14 +26,6 @@ __decorate([
     (0, typeorm_1.ViewColumn)(),
     __metadata("design:type", String)
 ], VwEscalationAge.prototype, "category", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", String)
-], VwEscalationAge.prototype, "division", void 0);
-__decorate([
-    (0, typeorm_1.ViewColumn)(),
-    __metadata("design:type", String)
-], VwEscalationAge.prototype, "lob", void 0);
 __decorate([
     (0, typeorm_1.ViewColumn)({ name: 'division_id' }),
     __metadata("design:type", String)

package/dist/modules/common/jwt.strategy.js

@@ -35,7 +35,7 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
     }
     validate(payload) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const signedUser = payload === null || payload === void 0 ? void 0 : payload.user;
             const effectiveClientId = Number(signedUser === null || signedUser === void 0 ? void 0 : signedUser.clientId);
             const originalClientId = (_a = signedUser === null || signedUser === void 0 ? void 0 : signedUser.originalClientId) !== null && _a !== void 0 ? _a : null;
@@ -80,8 +80,7 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
                 first_name: identity.firstName,
                 username: identity.username,
                 last_name: identity.lastName,
-                division: identity.division,
-                lob: identity.lob,
+                lobIds: (_d = identity.lobIds) !== null && _d !== void 0 ? _d : [],
                 fullName: identity.fullName,
                 ntgid: identity.ntgid,
                 profile: identity.profile,

package/dist/modules/tenant/tenant-authorization.keys.js

@@ -18,7 +18,7 @@ function tokenIdentifier(value) {
     return value;
 }
 function tenantAuthorizationKey(clientId, userId) {
-    return `client:${positiveInteger(clientId, 'clientId')}:authz:user:${positiveInteger(userId, 'userId')}`;
+    return `client:${positiveInteger(clientId, 'clientId')}:authz:v2:user:${positiveInteger(userId, 'userId')}`;
 }
 function revokedAccessTokenKey(jti) {
     return `security:access-token:revoked:${tokenIdentifier(jti)}`;

package/dist/modules/tenant/tenant-authorization.service.js

@@ -124,7 +124,7 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
     }
     loadFromDatabase(userId, clientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             const [user, client, assignments, accessRows] = yield Promise.all([
                 this.userRepository.findOne({
                     where: { id: userId },
@@ -136,7 +136,7 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
                 this.userRoleRepository
                     .createQueryBuilder('assignment')
                     .innerJoinAndSelect('assignment.role', 'role', 'role.client_id = assignment.client_id')
-                    .innerJoinAndSelect('role.module', 'module', 'module.is_active = true')
+                    .innerJoinAndSelect('role.module', 'module', 'module.is_active = true AND (module.client_id = assignment.client_id OR module.client_id IS NULL)')
                     .leftJoinAndSelect('role.privileges', 'definition', 'definition.client_id = assignment.client_id')
                     .leftJoinAndSelect('definition.privilege', 'privilege', 'privilege.client_id = assignment.client_id AND privilege."IS_ACTIVE" <> 0')
                     .where('assignment."USER_ID" = :userId', { userId })
@@ -158,6 +158,10 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
          JOIN stm."ACCESS_ROLES" role
            ON role.id = membership.role_id
           AND role.is_active
+          AND (
+            role.scope = 'GLOBAL'
+            OR role.client_id = membership.client_id
+          )
          LEFT JOIN stm."ACCESS_ROLE_PERMISSIONS" definition
            ON definition.role_id = role.id
          LEFT JOIN stm."ACCESS_PERMISSIONS" permission
@@ -168,7 +172,6 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
             ]);
             if (user) {
                 user.usersLobs = ((_a = user.usersLobs) !== null && _a !== void 0 ? _a : []).filter((assignment) => Number(assignment.clientId) === clientId);
-                user.applyDerivedScope();
             }
             if (!user ||
                 !Number(user.is_active) ||
@@ -236,8 +239,9 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
                 firstName: user.first_name,
                 username: user.username,
                 lastName: user.last_name,
-                division: user.division,
-                lob: user.lob,
+                lobIds: ((_d = user.usersLobs) !== null && _d !== void 0 ? _d : [])
+                    .map((assignment) => String(assignment.lobId))
+                    .sort(),
                 fullName: user.fullName,
                 ntgid: user.ntgid,
                 profile: user.profile,

package/dist/modules/tenant/tenant-authorization.types.d.ts

@@ -30,8 +30,7 @@ export interface TenantAuthorizationIdentity {
     firstName?: string;
     username?: string;
     lastName?: string;
-    division?: string;
-    lob?: string;
+    lobIds?: string[];
     fullName?: string;
     ntgid?: string;
     profile?: string;

package/dist/modules/tenant/tenant.types.d.ts

@@ -35,8 +35,7 @@ export interface AuthenticatedTenantUser {
     first_name?: string;
     username?: string;
     last_name?: string;
-    division?: string;
-    lob?: string;
+    lobIds?: string[];
     fullName?: string;
     ntgid?: string;
     profile?: string;

package/dist/utils/division-lob-catalog.d.ts

@@ -0,0 +1,9 @@
+import { DataSource, EntityManager } from 'typeorm';
+import { DivisionLobScope } from '../entities/division-lob.types';
+type QueryExecutor = Pick<DataSource | EntityManager, 'query'>;
+export declare function validateDivisionLobIds(executor: QueryExecutor, clientId: number, divisionIdValue: unknown, lobIdValue: unknown): Promise<{
+    divisionId: string;
+    lobId: string;
+}>;
+export declare function loadDivisionLobScope(executor: QueryExecutor, clientId: number, divisionIdValue: unknown, lobIdValue: unknown): Promise<DivisionLobScope>;
+export {};

package/dist/utils/division-lob-catalog.js

@@ -0,0 +1,60 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateDivisionLobIds = validateDivisionLobIds;
+exports.loadDivisionLobScope = loadDivisionLobScope;
+const common_1 = require("@nestjs/common");
+function bigintId(value, field) {
+    const normalized = String(value !== null && value !== void 0 ? value : '');
+    if (!/^[1-9]\d*$/.test(normalized)) {
+        throw new common_1.BadRequestException(`${field} must be a positive bigint identifier`);
+    }
+    return normalized;
+}
+function validateDivisionLobIds(executor, clientId, divisionIdValue, lobIdValue) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const divisionId = bigintId(divisionIdValue, 'divisionId');
+        const lobId = bigintId(lobIdValue, 'lobId');
+        const rows = yield executor.query(`SELECT lob.id
+     FROM stm.lob lob
+     JOIN stm.division division
+       ON division.id = lob.division_id
+      AND division.client_id = lob.client_id
+     WHERE lob.id = $1 AND division.id = $2 AND lob.client_id = $3
+       AND lob.deleted_at IS NULL AND division.deleted_at IS NULL`, [lobId, divisionId, clientId]);
+        if (!rows.length) {
+            throw new common_1.BadRequestException('Division and LOB are not active for this client');
+        }
+        return { divisionId, lobId };
+    });
+}
+function loadDivisionLobScope(executor, clientId, divisionIdValue, lobIdValue) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (divisionIdValue == null && lobIdValue == null) {
+            return { division: null, lob: null };
+        }
+        const divisionId = bigintId(divisionIdValue, 'divisionId');
+        const lobId = bigintId(lobIdValue, 'lobId');
+        const rows = yield executor.query(`SELECT division.id::text AS "divisionId", division.name AS "divisionName",
+            lob.id::text AS "lobId", lob.name AS "lobName"
+     FROM stm.division division
+     JOIN stm.lob lob ON lob.division_id = division.id AND lob.client_id = division.client_id
+     WHERE division.id = $1 AND lob.id = $2 AND division.client_id = $3`, [divisionId, lobId, clientId]);
+        if (!rows.length)
+            return { division: null, lob: null };
+        const row = rows[0];
+        const division = { id: String(row.divisionId), name: row.divisionName };
+        return {
+            division,
+            lob: { id: String(row.lobId), name: row.lobName, division },
+        };
+    });
+}

package/dist/utils/index.d.ts

@@ -2,3 +2,4 @@ export * from './object.utils';
 export * from './string.utils';
 export * from './parse.util';
 export * from './ticket-service-center-match-progress.util';
+export * from './division-lob-catalog';

package/dist/utils/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./object.utils"), exports);
 __exportStar(require("./string.utils"), exports);
 __exportStar(require("./parse.util"), exports);
 __exportStar(require("./ticket-service-center-match-progress.util"), exports);
+__exportStar(require("./division-lob-catalog"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniorganization/uni-lib",
-  "version": "4.3.4",
+  "version": "5.0.1",
   "description": "UNI Library",
   "author": "Jhomiguel",
   "main": "dist/index.js",