|
|
@ -105,8 +105,14 @@ export class UserService { |
|
|
locale?: string; |
|
|
locale?: string; |
|
|
user: UserWithSettings; |
|
|
user: UserWithSettings; |
|
|
}): Promise<IUser> { |
|
|
}): Promise<IUser> { |
|
|
const { id, permissions, provider, settings, subscription, thirdPartyId } = |
|
|
const { |
|
|
user; |
|
|
id, |
|
|
|
|
|
permissions: userPermissions, |
|
|
|
|
|
provider, |
|
|
|
|
|
settings, |
|
|
|
|
|
subscription, |
|
|
|
|
|
thirdPartyId |
|
|
|
|
|
} = user; |
|
|
|
|
|
|
|
|
const userData = await Promise.all([ |
|
|
const userData = await Promise.all([ |
|
|
this.prismaService.access.findMany({ |
|
|
this.prismaService.access.findMany({ |
|
|
@ -165,7 +171,7 @@ export class UserService { |
|
|
return { |
|
|
return { |
|
|
activitiesCount, |
|
|
activitiesCount, |
|
|
id, |
|
|
id, |
|
|
permissions, |
|
|
permissions: userPermissions, |
|
|
provider, |
|
|
provider, |
|
|
subscription, |
|
|
subscription, |
|
|
systemMessage, |
|
|
systemMessage, |
|
|
|