Scope server with workspace (#157)

* Rename User to AuthUser to avoid naming conflict with user business entity

* Prevent query by workspace in graphql

* Make full user and workspace object available in graphql resolvers

* Add Seed to create companies and people accross two workspace

* Check workspace on all entities findMany, find, create, update)

server/src/api/@generated/refresh-token/refresh-token.model.ts

@@ -3,7 +3,7 @@ import { ObjectType } from '@nestjs/graphql';
 import { ID } from '@nestjs/graphql';
 import { User } from '../user/user.model';
 
-@ObjectType()
+@ObjectType({})
 export class RefreshToken {
   @Field(() => ID, { nullable: false })
   id!: string;

server/src/api/@generated/workspace-member/workspace-member-count-aggregate.input.ts

@@ -1,5 +1,6 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberCountAggregateInput {
@@ -18,7 +19,7 @@ export class WorkspaceMemberCountAggregateInput {
   @Field(() => Boolean, { nullable: true })
   userId?: true;
 
-  @Field(() => Boolean, { nullable: true })
+  @HideField()
   workspaceId?: true;
 
   @Field(() => Boolean, { nullable: true })

server/src/api/@generated/workspace-member/workspace-member-count-order-by-aggregate.input.ts

@@ -1,6 +1,7 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { SortOrder } from '../prisma/sort-order.enum';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberCountOrderByAggregateInput {
@@ -19,6 +20,6 @@ export class WorkspaceMemberCountOrderByAggregateInput {
   @Field(() => SortOrder, { nullable: true })
   userId?: keyof typeof SortOrder;
 
-  @Field(() => SortOrder, { nullable: true })
+  @HideField()
   workspaceId?: keyof typeof SortOrder;
 }

server/src/api/@generated/workspace-member/workspace-member-create-many.input.ts

@@ -1,5 +1,6 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberCreateManyInput {
@@ -18,6 +19,6 @@ export class WorkspaceMemberCreateManyInput {
   @Field(() => String, { nullable: false })
   userId!: string;
 
-  @Field(() => String, { nullable: false })
+  @HideField()
   workspaceId!: string;
 }

server/src/api/@generated/workspace-member/workspace-member-create-without-user.input.ts

@@ -1,6 +1,7 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { WorkspaceCreateNestedOneWithoutWorkspaceMemberInput } from '../workspace/workspace-create-nested-one-without-workspace-member.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberCreateWithoutUserInput {
@@ -16,8 +17,6 @@ export class WorkspaceMemberCreateWithoutUserInput {
   @Field(() => Date, { nullable: true })
   deletedAt?: Date | string;
 
-  @Field(() => WorkspaceCreateNestedOneWithoutWorkspaceMemberInput, {
-    nullable: false,
-  })
+  @HideField()
   workspace!: WorkspaceCreateNestedOneWithoutWorkspaceMemberInput;
 }

server/src/api/@generated/workspace-member/workspace-member-create.input.ts

@@ -2,6 +2,7 @@ import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { UserCreateNestedOneWithoutWorkspaceMemberInput } from '../user/user-create-nested-one-without-workspace-member.input';
 import { WorkspaceCreateNestedOneWithoutWorkspaceMemberInput } from '../workspace/workspace-create-nested-one-without-workspace-member.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberCreateInput {
@@ -22,8 +23,6 @@ export class WorkspaceMemberCreateInput {
   })
   user!: UserCreateNestedOneWithoutWorkspaceMemberInput;
 
-  @Field(() => WorkspaceCreateNestedOneWithoutWorkspaceMemberInput, {
-    nullable: false,
-  })
+  @HideField()
   workspace!: WorkspaceCreateNestedOneWithoutWorkspaceMemberInput;
 }

server/src/api/@generated/workspace-member/workspace-member-max-aggregate.input.ts

@@ -1,5 +1,6 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberMaxAggregateInput {
@@ -18,6 +19,6 @@ export class WorkspaceMemberMaxAggregateInput {
   @Field(() => Boolean, { nullable: true })
   userId?: true;
 
-  @Field(() => Boolean, { nullable: true })
+  @HideField()
   workspaceId?: true;
 }

server/src/api/@generated/workspace-member/workspace-member-max-order-by-aggregate.input.ts

@@ -1,6 +1,7 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { SortOrder } from '../prisma/sort-order.enum';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberMaxOrderByAggregateInput {
@@ -19,6 +20,6 @@ export class WorkspaceMemberMaxOrderByAggregateInput {
   @Field(() => SortOrder, { nullable: true })
   userId?: keyof typeof SortOrder;
 
-  @Field(() => SortOrder, { nullable: true })
+  @HideField()
   workspaceId?: keyof typeof SortOrder;
 }

server/src/api/@generated/workspace-member/workspace-member-min-aggregate.input.ts

@@ -1,5 +1,6 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberMinAggregateInput {
@@ -18,6 +19,6 @@ export class WorkspaceMemberMinAggregateInput {
   @Field(() => Boolean, { nullable: true })
   userId?: true;
 
-  @Field(() => Boolean, { nullable: true })
+  @HideField()
   workspaceId?: true;
 }

server/src/api/@generated/workspace-member/workspace-member-min-order-by-aggregate.input.ts

@@ -1,6 +1,7 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { SortOrder } from '../prisma/sort-order.enum';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberMinOrderByAggregateInput {
@@ -19,6 +20,6 @@ export class WorkspaceMemberMinOrderByAggregateInput {
   @Field(() => SortOrder, { nullable: true })
   userId?: keyof typeof SortOrder;
 
-  @Field(() => SortOrder, { nullable: true })
+  @HideField()
   workspaceId?: keyof typeof SortOrder;
 }

server/src/api/@generated/workspace-member/workspace-member-order-by-with-aggregation.input.ts

@@ -1,6 +1,7 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { SortOrder } from '../prisma/sort-order.enum';
+import { HideField } from '@nestjs/graphql';
 import { WorkspaceMemberCountOrderByAggregateInput } from './workspace-member-count-order-by-aggregate.input';
 import { WorkspaceMemberMaxOrderByAggregateInput } from './workspace-member-max-order-by-aggregate.input';
 import { WorkspaceMemberMinOrderByAggregateInput } from './workspace-member-min-order-by-aggregate.input';
@@ -22,7 +23,7 @@ export class WorkspaceMemberOrderByWithAggregationInput {
   @Field(() => SortOrder, { nullable: true })
   userId?: keyof typeof SortOrder;
 
-  @Field(() => SortOrder, { nullable: true })
+  @HideField()
   workspaceId?: keyof typeof SortOrder;
 
   @Field(() => WorkspaceMemberCountOrderByAggregateInput, { nullable: true })

server/src/api/@generated/workspace-member/workspace-member-order-by-with-relation.input.ts

@@ -1,6 +1,7 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
 import { SortOrder } from '../prisma/sort-order.enum';
+import { HideField } from '@nestjs/graphql';
 import { UserOrderByWithRelationInput } from '../user/user-order-by-with-relation.input';
 import { WorkspaceOrderByWithRelationInput } from '../workspace/workspace-order-by-with-relation.input';
 
@@ -21,12 +22,12 @@ export class WorkspaceMemberOrderByWithRelationInput {
   @Field(() => SortOrder, { nullable: true })
   userId?: keyof typeof SortOrder;
 
-  @Field(() => SortOrder, { nullable: true })
+  @HideField()
   workspaceId?: keyof typeof SortOrder;
 
   @Field(() => UserOrderByWithRelationInput, { nullable: true })
   user?: UserOrderByWithRelationInput;
 
-  @Field(() => WorkspaceOrderByWithRelationInput, { nullable: true })
+  @HideField()
   workspace?: WorkspaceOrderByWithRelationInput;
 }

server/src/api/@generated/workspace-member/workspace-member-scalar-where-with-aggregates.input.ts

@@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
 import { StringWithAggregatesFilter } from '../prisma/string-with-aggregates-filter.input';
 import { DateTimeWithAggregatesFilter } from '../prisma/date-time-with-aggregates-filter.input';
 import { DateTimeNullableWithAggregatesFilter } from '../prisma/date-time-nullable-with-aggregates-filter.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberScalarWhereWithAggregatesInput {
@@ -36,6 +37,6 @@ export class WorkspaceMemberScalarWhereWithAggregatesInput {
   @Field(() => StringWithAggregatesFilter, { nullable: true })
   userId?: StringWithAggregatesFilter;
 
-  @Field(() => StringWithAggregatesFilter, { nullable: true })
+  @HideField()
   workspaceId?: StringWithAggregatesFilter;
 }

server/src/api/@generated/workspace-member/workspace-member-scalar-where.input.ts

@@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
 import { StringFilter } from '../prisma/string-filter.input';
 import { DateTimeFilter } from '../prisma/date-time-filter.input';
 import { DateTimeNullableFilter } from '../prisma/date-time-nullable-filter.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberScalarWhereInput {
@@ -30,6 +31,6 @@ export class WorkspaceMemberScalarWhereInput {
   @Field(() => StringFilter, { nullable: true })
   userId?: StringFilter;
 
-  @Field(() => StringFilter, { nullable: true })
+  @HideField()
   workspaceId?: StringFilter;
 }

server/src/api/@generated/workspace-member/workspace-member-unchecked-create-without-user.input.ts

@@ -1,5 +1,6 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUncheckedCreateWithoutUserInput {
@@ -15,6 +16,6 @@ export class WorkspaceMemberUncheckedCreateWithoutUserInput {
   @Field(() => Date, { nullable: true })
   deletedAt?: Date | string;
 
-  @Field(() => String, { nullable: false })
+  @HideField()
   workspaceId!: string;
 }

server/src/api/@generated/workspace-member/workspace-member-unchecked-create.input.ts

@@ -1,5 +1,6 @@
 import { Field } from '@nestjs/graphql';
 import { InputType } from '@nestjs/graphql';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUncheckedCreateInput {
@@ -18,6 +19,6 @@ export class WorkspaceMemberUncheckedCreateInput {
   @Field(() => String, { nullable: false })
   userId!: string;
 
-  @Field(() => String, { nullable: false })
+  @HideField()
   workspaceId!: string;
 }

server/src/api/@generated/workspace-member/workspace-member-unchecked-update-many.input.ts

@@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
 import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
 import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
 import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUncheckedUpdateManyInput {
@@ -21,6 +22,6 @@ export class WorkspaceMemberUncheckedUpdateManyInput {
   @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
   userId?: StringFieldUpdateOperationsInput;
 
-  @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
+  @HideField()
   workspaceId?: StringFieldUpdateOperationsInput;
 }

server/src/api/@generated/workspace-member/workspace-member-unchecked-update-without-user.input.ts

@@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
 import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
 import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
 import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUncheckedUpdateWithoutUserInput {
@@ -18,6 +19,6 @@ export class WorkspaceMemberUncheckedUpdateWithoutUserInput {
   @Field(() => NullableDateTimeFieldUpdateOperationsInput, { nullable: true })
   deletedAt?: NullableDateTimeFieldUpdateOperationsInput;
 
-  @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
+  @HideField()
   workspaceId?: StringFieldUpdateOperationsInput;
 }

server/src/api/@generated/workspace-member/workspace-member-unchecked-update.input.ts

@@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
 import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-operations.input';
 import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
 import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUncheckedUpdateInput {
@@ -21,6 +22,6 @@ export class WorkspaceMemberUncheckedUpdateInput {
   @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
   userId?: StringFieldUpdateOperationsInput;
 
-  @Field(() => StringFieldUpdateOperationsInput, { nullable: true })
+  @HideField()
   workspaceId?: StringFieldUpdateOperationsInput;
 }

server/src/api/@generated/workspace-member/workspace-member-update-without-user.input.ts

@@ -4,6 +4,7 @@ import { StringFieldUpdateOperationsInput } from '../prisma/string-field-update-
 import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-update-operations.input';
 import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
 import { WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput } from '../workspace/workspace-update-one-required-without-workspace-member-nested.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUpdateWithoutUserInput {
@@ -19,8 +20,6 @@ export class WorkspaceMemberUpdateWithoutUserInput {
   @Field(() => NullableDateTimeFieldUpdateOperationsInput, { nullable: true })
   deletedAt?: NullableDateTimeFieldUpdateOperationsInput;
 
-  @Field(() => WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput, {
-    nullable: true,
-  })
+  @HideField()
   workspace?: WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput;
 }

server/src/api/@generated/workspace-member/workspace-member-update.input.ts

@@ -5,6 +5,7 @@ import { DateTimeFieldUpdateOperationsInput } from '../prisma/date-time-field-up
 import { NullableDateTimeFieldUpdateOperationsInput } from '../prisma/nullable-date-time-field-update-operations.input';
 import { UserUpdateOneRequiredWithoutWorkspaceMemberNestedInput } from '../user/user-update-one-required-without-workspace-member-nested.input';
 import { WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput } from '../workspace/workspace-update-one-required-without-workspace-member-nested.input';
+import { HideField } from '@nestjs/graphql';
 
 @InputType()
 export class WorkspaceMemberUpdateInput {
@@ -25,8 +26,6 @@ export class WorkspaceMemberUpdateInput {
   })
   user?: UserUpdateOneRequiredWithoutWorkspaceMemberNestedInput;
 
-  @Field(() => WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput, {
-    nullable: true,
-  })
+  @HideField()
   workspace?: WorkspaceUpdateOneRequiredWithoutWorkspaceMemberNestedInput;
 }

server/src/api/@generated/workspace-member/workspace-member-where.input.ts

@@ -3,6 +3,7 @@ import { InputType } from '@nestjs/graphql';
 import { StringFilter } from '../prisma/string-filter.input';
 import { DateTimeFilter } from '../prisma/date-time-filter.input';
 import { DateTimeNullableFilter } from '../prisma/date-time-nullable-filter.input';
+import { HideField } from '@nestjs/graphql';
 import { UserRelationFilter } from '../user/user-relation-filter.input';
 import { WorkspaceRelationFilter } from '../workspace/workspace-relation-filter.input';
 
@@ -32,12 +33,12 @@ export class WorkspaceMemberWhereInput {
   @Field(() => StringFilter, { nullable: true })
   userId?: StringFilter;
 
-  @Field(() => StringFilter, { nullable: true })
+  @HideField()
   workspaceId?: StringFilter;
 
   @Field(() => UserRelationFilter, { nullable: true })
   user?: UserRelationFilter;
 
-  @Field(() => WorkspaceRelationFilter, { nullable: true })
+  @HideField()
   workspace?: WorkspaceRelationFilter;
 }

server/src/api/@generated/workspace/workspace.model.ts

@@ -6,7 +6,7 @@ import { Company } from '../company/company.model';
 import { Person } from '../person/person.model';
 import { WorkspaceCount } from './workspace-count.output';
 
-@ObjectType()
+@ObjectType({})
 export class Workspace {
   @Field(() => ID, { nullable: false })
   id!: string;

server/src/api/api.module.ts

@@ -3,15 +3,16 @@ import { GraphQLModule } from '@nestjs/graphql';
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import { CompanyResolver } from './resolvers/company.resolver';
 import { UserResolver } from './resolvers/user.resolver';
-import { PeopleResolver } from './resolvers/people.resolver';
+import { PersonResolver } from './resolvers/person.resolver';
 
-import { PersonRelationsResolver } from './resolvers/relations/people-relations.resolver';
+import { PersonRelationsResolver } from './resolvers/relations/person-relations.resolver';
 import { UserRelationsResolver } from './resolvers/relations/user-relations.resolver';
 import { WorkspaceMemberRelationsResolver } from './resolvers/relations/workspace-member-relations.resolver';
 import { ConfigService } from '@nestjs/config';
 import { AuthModule } from 'src/auth/auth.module';
 import { CompanyRelationsResolver } from './resolvers/relations/company-relations.resolver';
 import { PrismaModule } from 'src/database/prisma.module';
+import { ArgsService } from './resolvers/services/args.service';
 
 @Module({
   imports: [
@@ -25,9 +26,10 @@ import { PrismaModule } from 'src/database/prisma.module';
   ],
   providers: [
     ConfigService,
+    ArgsService,
 
     CompanyResolver,
-    PeopleResolver,
+    PersonResolver,
     UserResolver,
 
     CompanyRelationsResolver,

server/src/api/resolvers/company.resolver.ts

@@ -1,37 +1,39 @@
 import { Resolver, Query, Args, Mutation } from '@nestjs/graphql';
 import { JwtAuthGuard } from 'src/auth/guards/jwt.auth.guard';
 import { UseGuards } from '@nestjs/common';
-import { User, UserType } from './decorators/user.decorator';
+import { AuthWorkspace } from './decorators/auth-workspace.decorator';
 import { PrismaService } from 'src/database/prisma.service';
 import { Company } from '../@generated/company/company.model';
 import { FindManyCompanyArgs } from '../@generated/company/find-many-company.args';
-import { DeleteOneCompanyArgs } from '../@generated/company/delete-one-company.args';
 import { UpdateOneCompanyArgs } from '../@generated/company/update-one-company.args';
 import { CreateOneCompanyArgs } from '../@generated/company/create-one-company.args';
 import { AffectedRows } from '../@generated/prisma/affected-rows.output';
 import { DeleteManyCompanyArgs } from '../@generated/company/delete-many-company.args';
+import { Workspace } from '@prisma/client';
+import { ArgsService } from './services/args.service';
+import { CheckWorkspaceOwnership } from 'src/auth/guards/check-workspace-ownership.guard';
 
+@UseGuards(JwtAuthGuard, CheckWorkspaceOwnership)
 @Resolver(() => Company)
 export class CompanyResolver {
-  constructor(private readonly prismaService: PrismaService) {}
+  constructor(
+    private readonly prismaService: PrismaService,
+    private readonly argsService: ArgsService,
+  ) {}
 
-  @UseGuards(JwtAuthGuard)
   @Query(() => [Company])
-  async companies(@Args() args: FindManyCompanyArgs) {
-    return this.prismaService.company.findMany(args);
+  async findManyCompany(
+    @Args() args: FindManyCompanyArgs,
+    @AuthWorkspace() workspace: Workspace,
+  ) {
+    const preparedArgs =
+      await this.argsService.prepareFindManyArgs<FindManyCompanyArgs>(
+        args,
+        workspace,
+      );
+    return this.prismaService.company.findMany(preparedArgs);
   }
 
-  @UseGuards(JwtAuthGuard)
-  @Mutation(() => Company, {
-    nullable: true,
-  })
-  async deleteOneCompany(
-    @Args() args: DeleteOneCompanyArgs,
-  ): Promise<Company | null> {
-    return this.prismaService.company.delete(args);
-  }
-
-  @UseGuards(JwtAuthGuard)
   @Mutation(() => Company, {
     nullable: true,
   })
@@ -46,23 +48,6 @@ export class CompanyResolver {
     });
   }
 
-  @UseGuards(JwtAuthGuard)
-  @Mutation(() => Company, {
-    nullable: false,
-  })
-  async createOneCompany(
-    @Args() args: CreateOneCompanyArgs,
-    @User() user: UserType,
-  ): Promise<Company> {
-    return this.prismaService.company.create({
-      data: {
-        ...args.data,
-        ...{ workspace: { connect: { id: user.workspaceId } } },
-      },
-    });
-  }
-
-  @UseGuards(JwtAuthGuard)
   @Mutation(() => AffectedRows, {
     nullable: false,
   })
@@ -73,4 +58,19 @@ export class CompanyResolver {
       ...args,
     });
   }
+
+  @Mutation(() => Company, {
+    nullable: false,
+  })
+  async createOneCompany(
+    @Args() args: CreateOneCompanyArgs,
+    @AuthWorkspace() workspace: Workspace,
+  ): Promise<Company> {
+    return this.prismaService.company.create({
+      data: {
+        ...args.data,
+        ...{ workspace: { connect: { id: workspace.id } } },
+      },
+    });
+  }
 }

server/src/api/resolvers/decorators/auth-user.decorator.ts

@@ -1,14 +1,10 @@
 import { ExecutionContext, createParamDecorator } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
 
-export const User = createParamDecorator(
+export const AuthUser = createParamDecorator(
   (data: unknown, ctx: ExecutionContext) => {
     const gqlContext = GqlExecutionContext.create(ctx);
     const request = gqlContext.getContext().req;
     return request.user;
   },
 );
-
-export type UserType = {
-  workspaceId: string;
-};

server/src/api/resolvers/decorators/auth-workspace.decorator.ts

@@ -0,0 +1,10 @@
+import { ExecutionContext, createParamDecorator } from '@nestjs/common';
+import { GqlExecutionContext } from '@nestjs/graphql';
+
+export const AuthWorkspace = createParamDecorator(
+  (data: unknown, ctx: ExecutionContext) => {
+    const gqlContext = GqlExecutionContext.create(ctx);
+    const request = gqlContext.getContext().req;
+    return request.workspace;
+  },
+);

server/src/api/resolvers/person.resolver.ts

@@ -1,7 +1,6 @@
 import { Resolver, Query, Args, Mutation } from '@nestjs/graphql';
 import { UseGuards } from '@nestjs/common';
 import { JwtAuthGuard } from 'src/auth/guards/jwt.auth.guard';
-import { User, UserType } from './decorators/user.decorator';
 import { PrismaService } from 'src/database/prisma.service';
 import { Person } from '../@generated/person/person.model';
 import { FindManyPersonArgs } from '../@generated/person/find-many-person.args';
@@ -9,22 +8,36 @@ import { UpdateOnePersonArgs } from '../@generated/person/update-one-person.args
 import { CreateOnePersonArgs } from '../@generated/person/create-one-person.args';
 import { AffectedRows } from '../@generated/prisma/affected-rows.output';
 import { DeleteManyPersonArgs } from '../@generated/person/delete-many-person.args';
+import { Workspace } from '../@generated/workspace/workspace.model';
+import { AuthWorkspace } from './decorators/auth-workspace.decorator';
+import { ArgsService } from './services/args.service';
+import { CheckWorkspaceOwnership } from 'src/auth/guards/check-workspace-ownership.guard';
 
+@UseGuards(JwtAuthGuard, CheckWorkspaceOwnership)
 @Resolver(() => Person)
-export class PeopleResolver {
-  constructor(private readonly prismaService: PrismaService) {}
+export class PersonResolver {
+  constructor(
+    private readonly prismaService: PrismaService,
+    private readonly argsService: ArgsService,
+  ) {}
 
-  @UseGuards(JwtAuthGuard)
   @Query(() => [Person], {
     nullable: false,
   })
-  async people(@Args() args: FindManyPersonArgs): Promise<Person[]> {
+  async findManyPerson(
+    @Args() args: FindManyPersonArgs,
+    @AuthWorkspace() workspace: Workspace,
+  ): Promise<Person[]> {
+    const preparedArgs =
+      await this.argsService.prepareFindManyArgs<FindManyPersonArgs>(
+        args,
+        workspace,
+      );
     return this.prismaService.person.findMany({
-      ...args,
+      ...preparedArgs,
     });
   }
 
-  @UseGuards(JwtAuthGuard)
   @Mutation(() => Person, {
     nullable: true,
   })
@@ -34,28 +47,12 @@ export class PeopleResolver {
     if (!args.data.company?.connect?.id) {
       args.data.company = { disconnect: true };
     }
+
     return this.prismaService.person.update({
       ...args,
     });
   }
 
-  @UseGuards(JwtAuthGuard)
-  @Mutation(() => Person, {
-    nullable: false,
-  })
-  async createOnePerson(
-    @Args() args: CreateOnePersonArgs,
-    @User() user: UserType,
-  ): Promise<Person> {
-    return this.prismaService.person.create({
-      data: {
-        ...args.data,
-        ...{ workspace: { connect: { id: user.workspaceId } } },
-      },
-    });
-  }
-
-  @UseGuards(JwtAuthGuard)
   @Mutation(() => AffectedRows, {
     nullable: false,
   })
@@ -66,4 +63,19 @@ export class PeopleResolver {
       ...args,
     });
   }
+
+  @Mutation(() => Person, {
+    nullable: false,
+  })
+  async createOnePerson(
+    @Args() args: CreateOnePersonArgs,
+    @AuthWorkspace() workspace: Workspace,
+  ): Promise<Person> {
+    return this.prismaService.person.create({
+      data: {
+        ...args.data,
+        ...{ workspace: { connect: { id: workspace.id } } },
+      },
+    });
+  }
 }

server/src/api/resolvers/services/args.service.ts

@@ -0,0 +1,18 @@
+import { Injectable } from '@nestjs/common';
+import { Workspace } from '@prisma/client';
+
+type FindManyArgsType = { where?: object; orderBy?: object };
+
+@Injectable()
+export class ArgsService {
+  async prepareFindManyArgs<T extends FindManyArgsType>(
+    args: T,
+    workspace: Workspace,
+  ): Promise<T> {
+    args.where = {
+      ...args.where,
+      ...{ workspace: { is: { id: { equals: workspace.id } } } },
+    };
+    return args;
+  }
+}

server/src/api/resolvers/user.resolver.ts

@@ -2,31 +2,39 @@ import { Resolver, Query, Args } from '@nestjs/graphql';
 import { PrismaService } from 'src/database/prisma.service';
 import { UseGuards } from '@nestjs/common';
 import { JwtAuthGuard } from 'src/auth/guards/jwt.auth.guard';
+
 import { User } from '../@generated/user/user.model';
 import { FindManyUserArgs } from '../@generated/user/find-many-user.args';
-import { FindUniqueUserOrThrowArgs } from '../@generated/user/find-unique-user-or-throw.args';
+import { Workspace } from '@prisma/client';
+import { AuthWorkspace } from './decorators/auth-workspace.decorator';
+import { ArgsService } from './services/args.service';
+import { CheckWorkspaceOwnership } from 'src/auth/guards/check-workspace-ownership.guard';
 
+@UseGuards(JwtAuthGuard, CheckWorkspaceOwnership)
 @Resolver(() => User)
 export class UserResolver {
-  constructor(private readonly prismaService: PrismaService) {}
+  constructor(
+    private readonly prismaService: PrismaService,
+    private readonly argsService: ArgsService,
+  ) {}
 
-  @UseGuards(JwtAuthGuard)
   @Query(() => [User], {
     nullable: false,
   })
-  async users(@Args() args: FindManyUserArgs): Promise<User[]> {
+  async findManyUser(
+    @Args() args: FindManyUserArgs,
+    @AuthWorkspace() workspace: Workspace,
+  ): Promise<User[]> {
+    args.where = {
+      ...args.where,
+      ...{
+        WorkspaceMember: {
+          is: { workspace: { is: { id: { equals: workspace.id } } } },
+        },
+      },
+    };
     return await this.prismaService.user.findMany({
       ...args,
     });
   }
-
-  @UseGuards(JwtAuthGuard)
-  @Query(() => User, {
-    nullable: false,
-  })
-  async user(@Args() args: FindUniqueUserOrThrowArgs): Promise<User | null> {
-    return await this.prismaService.user.findUnique({
-      ...args,
-    });
-  }
 }