Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

return user data when adding him to project share

Blue Moused5f8af89136e
diff --git a/src/project/project.controller.ts b/src/project/project.controller.ts
index 1c31577de..c5633a6c2 100644
--- a/src/project/project.controller.ts
+++ b/src/project/project.controller.ts
@@ -22,7 +22,7 @@ import * as _size from 'lodash/size'
import * as _values from 'lodash/values'
import * as _includes from 'lodash/includes'
-import { ProjectService } from './project.service'
+import { ProjectService, processProjectUser } from './project.service'
import { UserType, ACCOUNT_PLANS, PlanCode } from '../user/entities/user.entity'
import { ActionTokenType } from '../action-tokens/action-token.entity'
import { ActionTokensService } from '../action-tokens/action-tokens.service'
@@ -570,9 +570,11 @@ export class ProjectController {
url, email: user.email, name: project.name, role: share.role, expiration: PROJECT_INVITE_EXPIRE,
})
- return await this.projectService.findOne(pid, {
- relations: ['share'],
+ const updatedProject = await this.projectService.findOne(pid, {
+ relations: ['share', 'share.user'],
})
+
+ return processProjectUser(updatedProject)
} catch (e) {
console.error(`[ERROR] Could not share project (pid: ${project.id}, invitee ID: ${invitee.id}): ${e}`)
throw new BadRequestException(e)
diff --git a/src/project/project.service.ts b/src/project/project.service.ts
index 2f3cca4bb..2be505053 100644
--- a/src/project/project.service.ts
+++ b/src/project/project.service.ts
@@ -26,19 +26,25 @@ import {
dayjs.extend(utc)
-const processProjectUser = (projects: Project[]): Project[] => {
- for (let i = 0; i < _size(projects); ++i) {
- const { share } = projects[i]
+export const processProjectUser = (project: Project): Project => {
+ const { share } = project
- for (let j = 0; j < _size(share); ++j) {
- const { user } = share[j]
+ for (let j = 0; j < _size(share); ++j) {
+ const { user } = share[j]
- if (user) {
- share[j].user = _pick(user, ['email'])
- }
+ if (user) {
+ share[j].user = _pick(user, ['email'])
}
}
+ return project
+}
+
+export const processProjectsUser = (projects: Project[]): Project[] => {
+ for (let i = 0; i < _size(projects); ++i) {
+ projects[i] = processProjectUser(projects[i])
+ }
+
return projects
}
@@ -63,7 +69,7 @@ export class ProjectService {
})
return new Pagination<Project>({
- results: processProjectUser(results),
+ results: processProjectsUser(results),
total,
})
}