twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-12-23 20:13:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect fetch of userVars when userId is not specified

Browse Source
This commit is contained in:
Charles Bochet 2024-07-28 11:30:14 +02:00
parent 75e0e1434a
commit dcb8c7c03a
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/twenty-server/src/engine/core-modules/user/user-vars/services/user-vars.service.ts
View File

@ -32,11 +32,15 @@ export class UserVarsService<
);
}
const userVarUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
key,
});
let userVarUserLevel: any[] = [];
if (userId) {
userVarUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
key,
});
}
if (userVarUserLevel.length > 1) {
throw new Error(`Multiple values found for key ${key} at user level`);
@ -60,10 +64,14 @@ export class UserVarsService<
workspaceId,
});
const userVarsUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
});
let userVarsUserLevel: any[] = [];
if (userId) {
userVarsUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
});
}
return mergeUserVars<Extract<keyof KeyValueTypesMap, string>>([
...userVarsWorkspaceLevel,