Merge pull request #1093 from credebl/refactor/checkUserExist-API-response

refactor: add email verification status and user registration status in response

Author: pallavighule

apps/api-gateway/src/user/user.controller.ts

@@ -253,7 +253,7 @@ export class UserController {
    * @returns User's email exist status
    */
   @Get('/:email')
-  @ApiOperation({ summary: 'Check if user exist', description: 'check user existence' })
+  @ApiOperation({ summary: 'Check user registration and email verification status', description: 'Check user registration and email verification status' })
   async checkUserExist(@Param() emailParam: EmailValidator, @Res() res: Response): Promise<Response> {
     const userDetails = await this.userService.checkUserExist(emailParam.email);
 

apps/user/interfaces/user.interface.ts

@@ -105,6 +105,8 @@ export interface ICheckUserDetails {
   isEmailVerified?: boolean;
   isFidoVerified?: boolean;
   isRegistrationCompleted?: boolean;
+  userId?: number;
+  message?:string;
 }
 
 export interface IOrgUsers {

apps/user/src/user.service.ts

@@ -990,24 +990,34 @@ export class UserService {
   async checkUserExist(email: string): Promise<ICheckUserDetails> {
     try {
       const userDetails = await this.userRepository.checkUniqueUserExist(email.toLowerCase());
+     let userVerificationDetails;
+      if (userDetails) {
+        userVerificationDetails = {
+          isEmailVerified: userDetails.isEmailVerified,
+          isFidoVerified: userDetails.isFidoVerified,
+          isRegistrationCompleted: null !== userDetails.keycloakUserId && undefined !== userDetails.keycloakUserId,
+          message:'',
+          userId: userDetails.id
+        };
+
+      }
       if (userDetails && !userDetails.isEmailVerified) {
-        throw new ConflictException(ResponseMessages.user.error.verificationAlreadySent);
+        userVerificationDetails.message = ResponseMessages.user.error.verificationAlreadySent;
+        return userVerificationDetails;
       } else if (userDetails && userDetails.keycloakUserId) {
-        throw new ConflictException(ResponseMessages.user.error.exists);
+        userVerificationDetails.message = ResponseMessages.user.error.exists;
+        return userVerificationDetails;
       } else if (userDetails && !userDetails.keycloakUserId && userDetails.supabaseUserId) {
-        throw new ConflictException(ResponseMessages.user.error.exists);
+        userVerificationDetails.message = ResponseMessages.user.error.exists;
+        return userVerificationDetails;
       } else if (null === userDetails) {
-        return {
+         return {
           isRegistrationCompleted: false,
-          isEmailVerified: false
+           isEmailVerified: false,
+           userId:null,
+           message: ResponseMessages.user.error.notFound
         };
       } else {
-        const userVerificationDetails = {
-          isEmailVerified: userDetails.isEmailVerified,
-          isFidoVerified: userDetails.isFidoVerified,
-          isRegistrationCompleted: null !== userDetails.keycloakUserId && undefined !== userDetails.keycloakUserId
-
-        };
         return userVerificationDetails;
       }
     } catch (error) {