admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix incorrect fetch of userVars when users are part of multi-workspaces

Browse Source
This commit is contained in:
Charles Bochet
2024-07-28 11:58:10 +02:00
parent dcb8c7c03a
commit 936279f895
1 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,12 +19,16 @@ export class UserVarsService<
workspaceId?: string;
key: Extract<K, string>;
}): Promise<KeyValueTypesMap[K]> {
const userVarWorkspaceLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId: null,
workspaceId,
key,
});
let userVarWorkspaceLevel: any[] = [];
if (workspaceId) {
userVarWorkspaceLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId: null,
workspaceId,
key,
});
}
if (userVarWorkspaceLevel.length > 1) {
throw new Error(
@ -38,6 +42,7 @@ export class UserVarsService<
userVarUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
workspaceId: null,
key,
});
}
@ -46,9 +51,28 @@ export class UserVarsService<
throw new Error(`Multiple values found for key ${key} at user level`);
}
return mergeUserVars([...userVarUserLevel, ...userVarWorkspaceLevel]).get(
key,
) as KeyValueTypesMap[K];
let userVarWorkspaceAndUserLevel: any[] = [];
if (userId && workspaceId) {
userVarWorkspaceAndUserLevel = await this.keyValuePairService.get({
type: KeyValuePairType.USER_VAR,
userId,
workspaceId,
key,
});
}
if (userVarWorkspaceAndUserLevel.length > 1) {
throw new Error(
`Multiple values found for key ${key} at workspace and user level`,
);
}
return mergeUserVars([
...userVarUserLevel,
...userVarWorkspaceLevel,
...userVarWorkspaceAndUserLevel,
]).get(key) as KeyValueTypesMap[K];
}
public async getAll({