Merge pull request #76 from credebl/passkey-fixes

fix: changed login error message
Signed-off-by: tipusinghaw <[email protected]>

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright [2023] [Blockster Labs Private Limited]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

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

@@ -157,7 +157,7 @@ export class FidoController {
             const fidoUserDetails = await this.fidoService.fetchFidoUserDetails(req.params.userName);
             const finalResponse: IResponseType = {
                 statusCode: HttpStatus.OK,
-                message: ResponseMessages.user.success.login,
+                message: ResponseMessages.user.success.fetchUsers,
                 data: fidoUserDetails.response
             };
             return res.status(HttpStatus.OK).json(finalResponse);

apps/user/src/user.service.ts

@@ -276,35 +276,32 @@ export class UserService {
         return this.generateToken(email, decryptedPassword);
       }
 
-      return this.generateToken(email, password);
+     return this.generateToken(email, password);
     } catch (error) {
       this.logger.error(`In Login User : ${JSON.stringify(error)}`);
       throw new RpcException(error.response);
     }
   }
 
   async generateToken(email: string, password: string): Promise<object> {
-    try {
-      const supaInstance = await this.supabaseService.getClient();
+    const supaInstance = await this.supabaseService.getClient();
 
-      this.logger.error(`supaInstance::`, supaInstance);
+    this.logger.error(`supaInstance::`, supaInstance);
 
-      const { data, error } = await supaInstance.auth.signInWithPassword({
-        email,
-        password
-      });
+    const { data, error } = await supaInstance.auth.signInWithPassword({
+      email,
+      password
+    });
 
-      if (error) {
-        this.logger.error(`Supa Login Error::`, JSON.stringify(error));
-        throw new BadRequestException(error?.message);
-      }
+    this.logger.error(`Supa Login Error::`, JSON.stringify(error));
 
-      const token = data?.session;
-      return token;
-    } catch (error) {
-      this.logger.error(`An unexpected error occurred::`, error.message);
-      throw new InternalServerErrorException('An unexpected error occurred.');
+    if (error) {
+      throw new BadRequestException(error?.message);
     }
+
+    const token = data?.session;
+
+    return token;
   }
 
   async getProfile(payload: { id }): Promise<object> {