admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 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
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({ let userVarUserLevel: any[] = [];
type: KeyValuePairType.USER_VAR,
userId, if (userId) {
key, userVarUserLevel = await this.keyValuePairService.get({
}); type: KeyValuePairType.USER_VAR,
userId,
key,
});
}
if (userVarUserLevel.length > 1) { if (userVarUserLevel.length > 1) {
throw new Error(`Multiple values found for key ${key} at user level`); throw new Error(`Multiple values found for key ${key} at user level`);
@ -60,10 +64,14 @@ export class UserVarsService<
workspaceId, workspaceId,
}); });
const userVarsUserLevel = await this.keyValuePairService.get({ let userVarsUserLevel: any[] = [];
type: KeyValuePairType.USER_VAR,
userId, if (userId) {
}); userVarsUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
});
}
return mergeUserVars<Extract<keyof KeyValueTypesMap, string>>([ return mergeUserVars<Extract<keyof KeyValueTypesMap, string>>([
...userVarsWorkspaceLevel, ...userVarsWorkspaceLevel,