Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Allow user to be added to team with role.
Brian Cao502facd426c5
diff --git a/pages/api/teams/[id]/user.ts b/pages/api/teams/[id]/user.tsindex 8a0bb98b6..76e60217c 100644--- a/pages/api/teams/[id]/user.ts+++ b/pages/api/teams/[id]/user.ts@@ -1,18 +1,18 @@import { NextApiRequestQueryBody } from 'interface/api/nextApi';import { allowQuery } from 'lib/auth';import { UmamiApi } from 'lib/constants';-import { uuid } from 'lib/crypto';import { useAuth } from 'lib/middleware';import { NextApiResponse } from 'next';import { badRequest, methodNotAllowed, ok, unauthorized } from 'next-basics';-import { createTeamUser, deleteTeamUser, getUsersByTeamId, getTeamUser } from 'queries';+import { createTeamUser, deleteTeamUser, getUser, getUsersByTeamId } from 'queries';export interface TeamUserRequestQuery {id: string;}export interface TeamUserRequestBody {- user_id: string;+ email: string;+ role_id: string;team_user_id?: string;}@@ -39,16 +39,16 @@ export default async (return unauthorized(res, 'You must be the owner of this team.');}- const { user_id: userId } = req.body;+ const { email, role_id: roleId } = req.body;- // Check for TeamUser- const teamUser = getTeamUser({ userId, teamId });+ // Check for User+ const user = await getUser({ username: email });- if (!teamUser) {- return badRequest(res, 'The User already exists on this Team.');+ if (!user) {+ return badRequest(res, 'The User does not exists.');}- const updated = await createTeamUser({ id: uuid(), userId, teamId });+ const updated = await createTeamUser(user.id, teamId, roleId);return ok(res, updated);}diff --git a/queries/admin/teamUser.ts b/queries/admin/teamUser.tsindex 3bbe9a76d..0adf506fa 100644--- a/queries/admin/teamUser.ts+++ b/queries/admin/teamUser.ts@@ -1,12 +1,31 @@-import { Prisma, TeamUser } from '@prisma/client';+import { Prisma, TeamUser, UserRole } from '@prisma/client';+import { uuid } from 'lib/crypto';import prisma from 'lib/prisma';export async function createTeamUser(- data: Prisma.TeamUserCreateInput | Prisma.TeamUserUncheckedCreateInput,-): Promise<TeamUser> {- return prisma.client.teamUser.create({- data,- });+ userId: string,+ teamId: string,+ roleId: string,+): Promise<[TeamUser, UserRole]> {+ const { client } = prisma;++ return client.$transaction([+ client.teamUser.create({+ data: {+ id: uuid(),+ userId,+ teamId,+ },+ }),+ client.userRole.create({+ data: {+ id: uuid(),+ userId,+ teamId,+ roleId,+ },+ }),+ ]);}export async function getTeamUser(where: Prisma.TeamUserWhereInput): Promise<TeamUser> {