@puca/puca-core 9.15.2 → 9.15.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/services/crud-front-base.service.js +4 -0
- package/dist/core/services/crud-front-base.service.js.map +1 -1
- package/dist/core/services/user.service.d.ts +8 -6
- package/dist/core/services/user.service.js +26 -31
- package/dist/core/services/user.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -10,6 +10,7 @@ const logger_1 = require("./logger");
|
|
|
10
10
|
const repository_1 = require("../../orm/services/repository");
|
|
11
11
|
const interfaces_1 = require("../../orm/cases/bo/interfaces");
|
|
12
12
|
const essential_1 = require("../../essential");
|
|
13
|
+
const plugins_1 = require("../../plugins");
|
|
13
14
|
const crudControllerEspecificationEnvironmentToCrudControllerEspecification = async (c, args) => {
|
|
14
15
|
const module = await essential_1.moduleConfigService.getModuleConfig();
|
|
15
16
|
return Object.assign(Object.assign(Object.assign({}, _.omit(c, 'environments')), c.environments.find(e => e.name === (args.environment || 'default'))), { module: {
|
|
@@ -119,6 +120,9 @@ class CrudFrontBaseService extends crud_base_service_1.CrudBaseService {
|
|
|
119
120
|
const entityWithoutNotPrimitiveFields = _.omitBy(originalArgs.entity, (value, key) => {
|
|
120
121
|
return fieldsMultiselect.includes(key);
|
|
121
122
|
});
|
|
123
|
+
if (fieldsMultiselect.length && mode === 'new' && !entityWithoutNotPrimitiveFields.puca_pid) {
|
|
124
|
+
entityWithoutNotPrimitiveFields.puca_pid = plugins_1.uuidService.v4();
|
|
125
|
+
}
|
|
122
126
|
const e = await super.update(Object.assign(Object.assign({}, originalArgs), { entity: entityWithoutNotPrimitiveFields }), {
|
|
123
127
|
beforeUpdate: async (args) => {
|
|
124
128
|
for (const fieldSelect of fieldsMultiselect) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"crud-front-base.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-front-base.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"crud-front-base.service.js","sourceRoot":"","sources":["../../../src/core/services/crud-front-base.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,30 +18,32 @@ export interface GetUsersRulesArgs {
|
|
|
18
18
|
export interface LoadUserByArgs {
|
|
19
19
|
key?: string;
|
|
20
20
|
value: string;
|
|
21
|
-
|
|
21
|
+
loadPermissions?: boolean;
|
|
22
22
|
}
|
|
23
23
|
export interface LoadUsersByArgs {
|
|
24
24
|
key?: string;
|
|
25
25
|
value: string[];
|
|
26
|
-
|
|
26
|
+
loadPermissions?: boolean;
|
|
27
27
|
}
|
|
28
28
|
export interface LoadUsersByRulesArgs {
|
|
29
29
|
rule: string;
|
|
30
|
-
|
|
30
|
+
loadPermissions?: boolean;
|
|
31
31
|
}
|
|
32
32
|
export declare class UserService {
|
|
33
33
|
private readonly repositoryFactory;
|
|
34
34
|
private readonly selectManyDataRepository;
|
|
35
35
|
private readonly cacheServiceFactory;
|
|
36
|
+
private readonly CACHE_DURATION_IN_SECONDS;
|
|
36
37
|
private cacheGetUsersByRule;
|
|
37
38
|
private cacheAllRules;
|
|
38
39
|
private cacheUserBy;
|
|
40
|
+
private cacheGetUserPermissionsPermissions;
|
|
39
41
|
constructor(repositoryFactory: RepositoryFactory, selectManyDataRepository: SelectManyDataService, cacheServiceFactory: CacheServiceFactory);
|
|
40
42
|
init(): Promise<void>;
|
|
41
43
|
getUsersRules(args: GetUsersRulesArgs): Promise<UserRules[]>;
|
|
42
44
|
getUserRules(args: GetUserRulesArgs): Promise<string[]>;
|
|
43
45
|
getUserCompanies(args: GetUserCompaniesArgs): Promise<string[]>;
|
|
44
|
-
loadUsersBy({ key, value,
|
|
45
|
-
loadUserBy({
|
|
46
|
-
loadUsersByRules({ rule,
|
|
46
|
+
loadUsersBy({ key, value, loadPermissions }: LoadUsersByArgs): Promise<User[]>;
|
|
47
|
+
loadUserBy({ loadPermissions, key, value }: LoadUserByArgs): Promise<User>;
|
|
48
|
+
loadUsersByRules({ rule, loadPermissions }: LoadUsersByRulesArgs): Promise<User[]>;
|
|
47
49
|
}
|
|
@@ -9,19 +9,9 @@ class UserService {
|
|
|
9
9
|
this.repositoryFactory = repositoryFactory;
|
|
10
10
|
this.selectManyDataRepository = selectManyDataRepository;
|
|
11
11
|
this.cacheServiceFactory = cacheServiceFactory;
|
|
12
|
+
this.CACHE_DURATION_IN_SECONDS = 60;
|
|
12
13
|
}
|
|
13
14
|
async init() {
|
|
14
|
-
this.repositoryFactory.getCacheInstance({
|
|
15
|
-
tableName: 'puca_base_api_select_many_data'
|
|
16
|
-
}).onChange(async ({ row }) => {
|
|
17
|
-
if (!row) {
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
|
-
if (row.name !== 'system_user_puca_base_api_rules') {
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
|
-
this.cacheGetUsersByRule.invalidate(row.value);
|
|
24
|
-
});
|
|
25
15
|
this.cacheGetUsersByRule = this.cacheServiceFactory.get('cacheGetUsersByRule', async (rule) => {
|
|
26
16
|
const selectManyDataRepository = this.repositoryFactory.getInstance({
|
|
27
17
|
tableName: 'puca_base_api_select_many_data'
|
|
@@ -50,15 +40,7 @@ class UserService {
|
|
|
50
40
|
totalizeMode: repository_1.TotalizeMode.never,
|
|
51
41
|
});
|
|
52
42
|
return _.uniq(users.map(u => u.key));
|
|
53
|
-
},
|
|
54
|
-
const debounceClearCacheAllRules = _.debounce(() => {
|
|
55
|
-
this.cacheAllRules.flush();
|
|
56
|
-
}, 500);
|
|
57
|
-
this.repositoryFactory.getCacheInstance({
|
|
58
|
-
tableName: 'puca_base_api_rules'
|
|
59
|
-
}).onChange(async () => {
|
|
60
|
-
debounceClearCacheAllRules();
|
|
61
|
-
});
|
|
43
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
62
44
|
this.cacheAllRules = this.cacheServiceFactory.get('cacheAllRules', async () => {
|
|
63
45
|
const rulesRepository = this.repositoryFactory.getInstance({ tableName: 'puca_base_api_rules' });
|
|
64
46
|
const { data: allRules } = await rulesRepository.findAll({
|
|
@@ -66,7 +48,7 @@ class UserService {
|
|
|
66
48
|
user: { username: 'puca-user' },
|
|
67
49
|
});
|
|
68
50
|
return allRules;
|
|
69
|
-
},
|
|
51
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
70
52
|
this.repositoryFactory.getCacheInstance({
|
|
71
53
|
tableName: 'puca_base_api_system_user'
|
|
72
54
|
}).onChange(async ({ row }) => {
|
|
@@ -109,7 +91,19 @@ class UserService {
|
|
|
109
91
|
totalizeMode: repository_1.TotalizeMode.never,
|
|
110
92
|
});
|
|
111
93
|
return users[0];
|
|
112
|
-
},
|
|
94
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
95
|
+
this.cacheGetUserPermissionsPermissions = this.cacheServiceFactory.get('cacheGetUserPermissionsRules', async (user) => {
|
|
96
|
+
const rules = await this.getUserRules({
|
|
97
|
+
userRef: user,
|
|
98
|
+
});
|
|
99
|
+
const companies = await this.getUserCompanies({
|
|
100
|
+
userRef: user,
|
|
101
|
+
});
|
|
102
|
+
return {
|
|
103
|
+
rules,
|
|
104
|
+
companies,
|
|
105
|
+
};
|
|
106
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
113
107
|
}
|
|
114
108
|
async getUsersRules(args) {
|
|
115
109
|
const retorno = [];
|
|
@@ -151,6 +145,8 @@ class UserService {
|
|
|
151
145
|
return vRules;
|
|
152
146
|
}
|
|
153
147
|
async getUserCompanies(args) {
|
|
148
|
+
if (args.userRef.username === 'puca-user') {
|
|
149
|
+
}
|
|
154
150
|
const { data: companies } = await this.selectManyDataRepository.findByNameAndKey({
|
|
155
151
|
name: 'companies_user',
|
|
156
152
|
key: args.userRef.puca_pid,
|
|
@@ -158,33 +154,32 @@ class UserService {
|
|
|
158
154
|
});
|
|
159
155
|
return companies.map(r => r.value);
|
|
160
156
|
}
|
|
161
|
-
async loadUsersBy({ key = 'puca_pid', value,
|
|
157
|
+
async loadUsersBy({ key = 'puca_pid', value, loadPermissions = false }) {
|
|
162
158
|
const retorno = [];
|
|
163
159
|
for (const userPid of value) {
|
|
164
|
-
const user = await this.loadUserBy({ key, value: userPid,
|
|
160
|
+
const user = await this.loadUserBy({ key, value: userPid, loadPermissions });
|
|
165
161
|
retorno.push(user);
|
|
166
162
|
}
|
|
167
163
|
return retorno.filter(u => u);
|
|
168
164
|
}
|
|
169
|
-
async loadUserBy({
|
|
165
|
+
async loadUserBy({ loadPermissions = false, key = 'puca_pid', value }) {
|
|
170
166
|
const user = await this.cacheUserBy.get({ key, value });
|
|
171
167
|
if (!user) {
|
|
172
168
|
return null;
|
|
173
169
|
}
|
|
174
|
-
if (!
|
|
170
|
+
if (!loadPermissions) {
|
|
175
171
|
return user;
|
|
176
172
|
}
|
|
177
|
-
const rules = await this.
|
|
178
|
-
userRef: user,
|
|
179
|
-
});
|
|
173
|
+
const { rules, companies } = await this.cacheGetUserPermissionsPermissions.get(user);
|
|
180
174
|
user.rules = rules;
|
|
175
|
+
user.companies = companies;
|
|
181
176
|
return user;
|
|
182
177
|
}
|
|
183
|
-
async loadUsersByRules({ rule,
|
|
178
|
+
async loadUsersByRules({ rule, loadPermissions }) {
|
|
184
179
|
const userPidList = await this.cacheGetUsersByRule.get(rule);
|
|
185
180
|
const retorno = [];
|
|
186
181
|
for (const userPid of userPidList) {
|
|
187
|
-
const user = await this.loadUserBy({ value: userPid,
|
|
182
|
+
const user = await this.loadUserBy({ value: userPid, loadPermissions });
|
|
188
183
|
retorno.push(user);
|
|
189
184
|
}
|
|
190
185
|
return retorno.filter(u => u);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAK3B,qDAA0D;AAC1D,8DAA4D;AAc5D,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":"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"}
|