@fphgov/authentication-sdk 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fphgov/authentication-sdk",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Authentication gRPC service SDK only for FPH",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/protos/authentication.proto

@@ -8,8 +8,14 @@ service AuthService {
 
 message AuthRequest {
   string token = 1;
+  optional int32 serviceId = 2;
+}
+
+message AuthUser {
+  int32 id = 1;
+  string username = 2;
 }
 
 message AuthResponse {
-  bool success = 1;
+  AuthUser user = 1;
 }

package/src/client.ts

@@ -1,9 +1,7 @@
 import * as grpc from '@grpc/grpc-js'
 import * as protoLoader from '@grpc/proto-loader'
 import * as path from 'path'
-import { type AuthServiceClient, type AuthServiceConstructor } from './types'
-
-const { status } = grpc
+import { type AuthUser, type AuthServiceClient, type AuthServiceConstructor } from './types'
 
 const PROTO_PATH = path.join(__dirname, '../protos/authentication.proto')
 
@@ -25,17 +23,13 @@ export class AuthenticationClient {
     this.grpcClient = new proto.authentication.AuthService(url, grpc.credentials.createInsecure())
   }
 
-  authenticate(token: string): Promise<boolean> {
+  authenticate(token: string, serviceId: number): Promise<AuthUser> {
     return new Promise((resolve, reject) => {
-      this.grpcClient.authenticate({ token }, (err, response) => {
+      this.grpcClient.authenticate({ token, serviceId }, (err, response) => {
         if (err) {
-          if (err.code === status.UNAUTHENTICATED) {
-            resolve(false)
-          } else {
-            reject(err)
-          }
+          reject(err)
         } else {
-          resolve(response.success)
+          resolve(response.user)
         }
       })
     })

package/src/index.ts

@@ -1,3 +1,3 @@
 export { AuthenticationClient } from './client'
 export { AuthenticationInterceptor } from './interceptor'
-export type { AuthRequest, AuthResponse, AuthServiceClient, AuthServiceConstructor } from './types'
+export type { AuthUser, AuthRequest, AuthResponse, AuthServiceClient, AuthServiceConstructor } from './types'

package/src/interceptor.ts

@@ -1,11 +1,16 @@
-import { type ExecutionContext, type CallHandler } from '@nestjs/common'
+import { type ExecutionContext, type CallHandler, Logger } from '@nestjs/common'
 import { RpcException } from '@nestjs/microservices'
 import { type Observable } from 'rxjs'
 import { Metadata, status } from '@grpc/grpc-js'
 import { AuthenticationClient } from './client'
 
 export class AuthenticationInterceptor {
-  constructor(private readonly client: AuthenticationClient) {}
+  private readonly logger = new Logger(AuthenticationInterceptor.name)
+
+  constructor(
+    private readonly client: AuthenticationClient,
+    private readonly serviceId: number,
+  ) {}
 
   async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<unknown>> {
     const metadata = context.getArgByIndex<Metadata>(1)
@@ -16,9 +21,10 @@ export class AuthenticationInterceptor {
       throw new RpcException({ code: status.UNAUTHENTICATED, message: 'Missing authentication token' })
     }
 
-    const success = await this.client.authenticate(token)
-
-    if (!success) {
+    try {
+      const user = await this.client.authenticate(token, this.serviceId)
+      this.logger.log(`Authenticated user id=${user.id} username=${user.username}`)
+    } catch {
       throw new RpcException({ code: status.UNAUTHENTICATED, message: 'Invalid authentication token' })
     }
 

package/src/types.ts

@@ -1,11 +1,17 @@
 import * as grpc from '@grpc/grpc-js'
 
+export interface AuthUser {
+  id: number
+  username: string
+}
+
 export interface AuthRequest {
   token: string
+  serviceId?: number
 }
 
 export interface AuthResponse {
-  success: boolean
+  user: AuthUser
 }
 
 export interface AuthServiceClient extends grpc.Client {