@uniorganization/uni-lib 4.3.0 → 4.3.1

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

@@ -3,7 +3,6 @@ import { UserCampaign } from './user-campaign.entity';
 import { UserRoles } from './user-roles.entity';
 import { RawRoster } from './raw_roster.entity';
 export declare class Users {
-    clientId: number;
     id: number;
     username: string;
     password: string;

package/dist/entities/usr.entity.js

@@ -20,10 +20,6 @@ let Users = class Users {
     }
 };
 exports.Users = Users;
-__decorate([
-    (0, typeorm_1.Column)({ name: 'client_id', type: 'integer' }),
-    __metadata("design:type", Number)
-], Users.prototype, "clientId", void 0);
 __decorate([
     (0, typeorm_1.PrimaryGeneratedColumn)({ name: 'ID' }),
     __metadata("design:type", Number)

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

@@ -38,7 +38,6 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
             var _a, _b, _c;
             const signedUser = payload === null || payload === void 0 ? void 0 : payload.user;
             const effectiveClientId = Number(signedUser === null || signedUser === void 0 ? void 0 : signedUser.clientId);
-            const homeClientId = Number(signedUser === null || signedUser === void 0 ? void 0 : signedUser.homeClientId);
             const originalClientId = (_a = signedUser === null || signedUser === void 0 ? void 0 : signedUser.originalClientId) !== null && _a !== void 0 ? _a : null;
             const now = Math.floor(Date.now() / 1000);
             if ((payload === null || payload === void 0 ? void 0 : payload.type) !== 'access' ||
@@ -47,8 +46,6 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
                 String(signedUser.id) !== payload.sub ||
                 !Number.isInteger(effectiveClientId) ||
                 effectiveClientId <= 0 ||
-                !Number.isInteger(homeClientId) ||
-                homeClientId <= 0 ||
                 !Number.isInteger(payload.exp) ||
                 payload.exp <= now ||
                 !this.validTokenIdentifier(payload.jti) ||
@@ -70,8 +67,8 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
                 throw new common_1.UnauthorizedException();
             }
             const resolved = impersonating
-                ? yield this.authorization.resolveImpersonation(signedUser.id, originalClientId, homeClientId, effectiveClientId)
-                : yield this.authorization.resolve(signedUser.id, effectiveClientId, homeClientId);
+                ? yield this.authorization.resolveImpersonation(signedUser.id, originalClientId, effectiveClientId)
+                : yield this.authorization.resolve(signedUser.id, effectiveClientId);
             const { identity, snapshot } = resolved;
             const isMasterTenantAdmin = !impersonating &&
                 snapshot.clientId === tenant_1.NEWTECH_CLIENT_ID &&
@@ -91,7 +88,6 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
                 password_expired: identity.passwordExpired,
                 viewEvaluations: identity.viewEvaluations,
                 ern: identity.ern,
-                homeClientId: identity.homeClientId,
                 clientId: snapshot.clientId,
                 clientAlias: snapshot.clientAlias,
                 clientName: snapshot.clientName,

package/dist/modules/tenant/redis-tenant-state.store.js

@@ -138,8 +138,6 @@ let RedisTenantStateStore = RedisTenantStateStore_1 = class RedisTenantStateStor
         return Boolean(value &&
             Number.isInteger(value.userId) &&
             value.userId > 0 &&
-            Number.isInteger(value.homeClientId) &&
-            value.homeClientId > 0 &&
             Number.isInteger(value.clientId) &&
             value.clientId > 0 &&
             typeof value.clientName === 'string' &&
@@ -165,7 +163,6 @@ let RedisTenantStateStore = RedisTenantStateStore_1 = class RedisTenantStateStor
             Number.isInteger(value.authzVersion) &&
             value.authzVersion > 0 &&
             ((_a = value.identity) === null || _a === void 0 ? void 0 : _a.id) === value.userId &&
-            value.identity.homeClientId === value.homeClientId &&
             typeof value.cachedAt === 'string');
     }
 };

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

@@ -12,8 +12,8 @@ export declare class TenantAuthorizationService {
     private readonly userRoleRepository;
     private readonly logger;
     constructor(store: TenantAuthorizationStore, userRepository: Repository<Users>, clientRepository: Repository<Client>, userRoleRepository: Repository<UserRoles>);
-    resolve(userId: number, clientId: number, expectedHomeClientId: number): Promise<ResolvedTenantAuthorization>;
-    resolveImpersonation(userId: number, originClientId: number, homeClientId: number, targetClientId: number): Promise<ResolvedTenantAuthorization>;
+    resolve(userId: number, clientId: number, _legacyOriginClientId?: number): Promise<ResolvedTenantAuthorization>;
+    resolveImpersonation(userId: number, originClientId: number, targetClientIdOrLegacyOriginClientId: number, legacyTargetClientId?: number): Promise<ResolvedTenantAuthorization>;
     invalidate(userId: number, clientId: number): Promise<void>;
     invalidateMany(clientId: number, userIds: readonly number[]): Promise<void>;
     private loadFromDatabase;

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

@@ -41,36 +41,36 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
         this.userRoleRepository = userRoleRepository;
         this.logger = new common_1.Logger(TenantAuthorizationService_1.name);
     }
-    resolve(userId, clientId, expectedHomeClientId) {
+    resolve(userId, clientId, _legacyOriginClientId) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b;
             this.assertPositiveInteger(userId);
             this.assertPositiveInteger(clientId);
-            this.assertPositiveInteger(expectedHomeClientId);
             const key = (0, tenant_authorization_keys_1.tenantAuthorizationKey)(clientId, userId);
             const cached = yield this.readCache(key);
             if (cached &&
                 cached.userId === userId &&
                 cached.clientId === clientId &&
-                cached.homeClientId === expectedHomeClientId &&
                 ((_a = cached.identity) === null || _a === void 0 ? void 0 : _a.id) === userId &&
-                cached.identity.homeClientId === expectedHomeClientId &&
                 this.isFresh(cached.cachedAt) &&
-                cached.roles.length > 0) {
+                cached.roles.length > 0 &&
+                Array.isArray(cached.permissions) &&
+                ((_b = cached.accessRole) === null || _b === void 0 ? void 0 : _b.id)) {
                 return { identity: cached.identity, snapshot: cached };
             }
-            const resolved = yield this.loadFromDatabase(userId, clientId, expectedHomeClientId);
+            const resolved = yield this.loadFromDatabase(userId, clientId);
             yield this.writeCache(key, resolved.snapshot);
             return resolved;
         });
     }
-    resolveImpersonation(userId, originClientId, homeClientId, targetClientId) {
+    resolveImpersonation(userId, originClientId, targetClientIdOrLegacyOriginClientId, legacyTargetClientId) {
         return __awaiter(this, void 0, void 0, function* () {
+            const targetClientId = legacyTargetClientId !== null && legacyTargetClientId !== void 0 ? legacyTargetClientId : targetClientIdOrLegacyOriginClientId;
             if (originClientId !== tenant_constants_1.NEWTECH_CLIENT_ID ||
                 targetClientId === tenant_constants_1.NEWTECH_CLIENT_ID) {
                 throw new common_1.UnauthorizedException();
             }
-            const origin = yield this.resolve(userId, originClientId, homeClientId);
+            const origin = yield this.resolve(userId, originClientId);
             const isNewtechMaster = origin.snapshot.permissions.includes('master.users.read') ||
                 origin.snapshot.roles.some((role) => role.moduleName.toLowerCase() === 'root' &&
                     role.roleName.toLowerCase() === 'sysadmin');
@@ -82,7 +82,6 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
             }
             const snapshot = {
                 userId,
-                homeClientId,
                 clientId: targetClientId,
                 clientName: targetClient.name,
                 clientAlias: targetClient.alias,
@@ -123,8 +122,9 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
             }
         });
     }
-    loadFromDatabase(userId, clientId, expectedHomeClientId) {
+    loadFromDatabase(userId, clientId) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const [user, client, assignments, accessRows] = yield Promise.all([
                 this.userRepository.findOne({ where: { id: userId } }),
                 this.clientRepository.findOne({
@@ -165,20 +165,31 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
             ]);
             if (!user ||
                 !Number(user.is_active) ||
-                user.clientId !== expectedHomeClientId ||
                 !client ||
-                accessRows.length !== 1) {
+                accessRows.length > 1 ||
+                (accessRows.length === 0 && assignments.length === 0)) {
                 throw new common_1.UnauthorizedException();
             }
             const accessRow = accessRows[0];
-            const accessRole = {
-                id: Number(accessRow.id),
-                code: accessRow.code,
-                name: accessRow.name,
-                scope: accessRow.scope,
-                clientId: accessRow.roleClientId == null ? null : Number(accessRow.roleClientId),
-            };
-            const usingLegacyCompatibility = accessRole.code.startsWith('migrated-');
+            const usingLegacyCompatibility = accessRows.length === 0 || accessRow.code.startsWith('migrated-');
+            const legacyRole = (_a = assignments[0]) === null || _a === void 0 ? void 0 : _a.role;
+            const accessRole = accessRow
+                ? {
+                    id: Number(accessRow.id),
+                    code: accessRow.code,
+                    name: accessRow.name,
+                    scope: accessRow.scope,
+                    clientId: accessRow.roleClientId == null
+                        ? null
+                        : Number(accessRow.roleClientId),
+                }
+                : {
+                    id: Number(legacyRole === null || legacyRole === void 0 ? void 0 : legacyRole.id),
+                    code: `legacy-${Number(legacyRole === null || legacyRole === void 0 ? void 0 : legacyRole.id)}`,
+                    name: (_b = legacyRole === null || legacyRole === void 0 ? void 0 : legacyRole.roleName) !== null && _b !== void 0 ? _b : 'Legacy access',
+                    scope: 'CLIENT',
+                    clientId,
+                };
             const roles = usingLegacyCompatibility && assignments.length
                 ? assignments.map((assignment) => {
                     var _a, _b, _c, _d, _e, _f;
@@ -215,7 +226,6 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
                 : [];
             const identity = {
                 id: user.id,
-                homeClientId: user.clientId,
                 firstName: user.first_name,
                 username: user.username,
                 lastName: user.last_name,
@@ -230,7 +240,6 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
             };
             const snapshot = {
                 userId,
-                homeClientId: user.clientId,
                 clientId,
                 clientName: client.name,
                 clientAlias: client.alias,
@@ -240,7 +249,7 @@ let TenantAuthorizationService = TenantAuthorizationService_1 = class TenantAuth
                 permissions: Array.isArray(accessRow.permissions)
                     ? accessRow.permissions
                     : [],
-                authzVersion: Number(accessRow.authzVersion),
+                authzVersion: accessRow ? Number(accessRow.authzVersion) : 1,
                 identity,
                 cachedAt: new Date().toISOString(),
             };

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

@@ -6,7 +6,6 @@ export interface TenantRoleAuthorization {
 }
 export interface TenantAuthorizationSnapshot {
     userId: number;
-    homeClientId: number;
     clientId: number;
     clientName: string;
     clientAlias: string;
@@ -17,6 +16,7 @@ export interface TenantAuthorizationSnapshot {
     authzVersion: number;
     identity: TenantAuthorizationIdentity;
     cachedAt: string;
+    [key: string]: unknown;
 }
 export interface TenantAccessRoleAuthorization {
     id: number;
@@ -27,7 +27,6 @@ export interface TenantAccessRoleAuthorization {
 }
 export interface TenantAuthorizationIdentity {
     id: number;
-    homeClientId: number;
     firstName?: string;
     username?: string;
     lastName?: string;
@@ -39,6 +38,7 @@ export interface TenantAuthorizationIdentity {
     passwordExpired?: number;
     viewEvaluations?: boolean;
     ern?: string;
+    [key: string]: unknown;
 }
 export interface ResolvedTenantAuthorization {
     identity: TenantAuthorizationIdentity;

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

@@ -12,7 +12,6 @@ export interface TenantContextState {
 }
 export interface AuthenticatedTenantUser {
     id: number;
-    homeClientId: number;
     clientId: number;
     clientAlias?: string;
     clientName?: string;

package/package.json

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