feat: add ctx-user-id decorator

libs/api/auth/data-access/src/index.ts

@@ -1,6 +1,7 @@
 export * from './lib/api-auth-data-access.module'
 export * from './lib/api-auth.service'
 export * from './lib/contexts/ctx-user'
+export * from './lib/contexts/ctx-user-id'
 export * from './lib/dto/login.input'
 export * from './lib/dto/register.input'
 export * from './lib/guards/api-anon-jwt-guard'

libs/api/auth/data-access/src/lib/contexts/ctx-user-id.ts

@@ -0,0 +1,7 @@
+import { createParamDecorator, ExecutionContext } from '@nestjs/common'
+import { GqlExecutionContext } from '@nestjs/graphql'
+
+export const CtxUserId = createParamDecorator((data: unknown, context: ExecutionContext) => {
+  const ctx = GqlExecutionContext.create(context)
+  return ctx.getContext().req.user?.id
+})

libs/api/identity/feature/src/lib/api-user-identity.resolver.ts

@@ -1,6 +1,6 @@
 import { UseGuards } from '@nestjs/common'
 import { Args, Context, Mutation, Query, Resolver } from '@nestjs/graphql'
-import { ApiAuthGraphQLUserGuard, CtxUser } from '@pubkey-stack/api-auth-data-access'
+import { ApiAuthGraphQLUserGuard, CtxUserId } from '@pubkey-stack/api-auth-data-access'
 import { BaseContext } from '@pubkey-stack/api-core-data-access'
 import {
   ApiIdentityService,
@@ -18,31 +18,31 @@ export class ApiUserIdentityResolver {
   constructor(private readonly service: ApiIdentityService) {}
 
   @Mutation(() => Boolean, { nullable: true })
-  userDeleteIdentity(@CtxUser() user: { id: string }, @Args('identityId') identityId: string) {
-    return this.service.user.deleteIdentity(user.id, identityId)
+  userDeleteIdentity(@CtxUserId() userId: string, @Args('identityId') identityId: string) {
+    return this.service.user.deleteIdentity(userId, identityId)
   }
 
   @Query(() => IdentityChallenge, { nullable: true })
   userRequestIdentityChallenge(
     @Context() ctx: BaseContext,
-    @CtxUser() user: { id: string },
+    @CtxUserId() userId: string,
     @Args('input') input: RequestIdentityChallengeInput,
   ) {
-    return this.service.user.requestIdentityChallenge(ctx, user.id, input)
+    return this.service.user.requestIdentityChallenge(ctx, userId, input)
   }
 
   @Mutation(() => Identity, { nullable: true })
-  userLinkIdentity(@CtxUser() user: { id: string }, @Args('input') input: LinkIdentityInput) {
-    return this.service.user.linkIdentity(user.id, input)
+  userLinkIdentity(@CtxUserId() userId: string, @Args('input') input: LinkIdentityInput) {
+    return this.service.user.linkIdentity(userId, input)
   }
 
   @Mutation(() => IdentityChallenge, { nullable: true })
   userVerifyIdentityChallenge(
     @Context() ctx: BaseContext,
-    @CtxUser() user: { id: string },
+    @CtxUserId() userId: string,
     @Args('input') input: VerifyIdentityChallengeInput,
   ) {
-    return this.service.user.verifyIdentityChallenge(ctx, user.id, input)
+    return this.service.user.verifyIdentityChallenge(ctx, userId, input)
   }
 
   @Query(() => [Identity], { nullable: true })

libs/api/user/feature/src/lib/api-user-user.resolver.ts

@@ -1,6 +1,6 @@
 import { UseGuards } from '@nestjs/common'
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql'
-import { ApiAuthGraphQLUserGuard, CtxUser } from '@pubkey-stack/api-auth-data-access'
+import { ApiAuthGraphQLUserGuard, CtxUserId } from '@pubkey-stack/api-auth-data-access'
 import {
   ApiUserService,
   User,
@@ -25,7 +25,7 @@ export class ApiUserUserResolver {
   }
 
   @Mutation(() => User, { nullable: true })
-  userUpdateUser(@CtxUser() user: User, @Args('input') input: UserUpdateUserInput) {
-    return this.service.user.updateUser(user.id as string, input)
+  userUpdateUser(@CtxUserId() userId: string, @Args('input') input: UserUpdateUserInput) {
+    return this.service.user.updateUser(userId as string, input)
   }
 }