Merge pull request #77 from SyncrowIOT/SP-342-implement-region-end-point-in-the-login

error handling for login

src/auth/services/user-auth.service.ts

@@ -90,39 +90,43 @@ export class UserAuthService {
   }
 
   async userLogin(data: UserLoginDto) {
-    const user = await this.authService.validateUser(
+    try {
-      data.email,
+      const user = await this.authService.validateUser(
-      data.password,
+        data.email,
-      data.regionUuid,
+        data.password,
-    );
+        data.regionUuid,
+      );
 
-    if (!user) {
+      if (!user) {
-      throw new UnauthorizedException('Invalid login credentials.');
+        throw new UnauthorizedException('Invalid login credentials.');
-    }
+      }
 
-    const session = await Promise.all([
+      const session = await Promise.all([
-      await this.sessionRepository.update(
+        await this.sessionRepository.update(
-        { userId: user.id },
+          { userId: user.id },
-        {
+          {
-          isLoggedOut: true,
+            isLoggedOut: true,
-        },
+          },
-      ),
+        ),
-      await this.authService.createSession({
+        await this.authService.createSession({
+          userId: user.uuid,
+          loginTime: new Date(),
+          isLoggedOut: false,
+        }),
+      ]);
+
+      return await this.authService.login({
+        email: user.email,
         userId: user.uuid,
-        loginTime: new Date(),
+        uuid: user.uuid,
-        isLoggedOut: false,
+        roles: user?.roles?.map((role) => {
-      }),
+          return { uuid: role.uuid, type: role.roleType.type };
-    ]);
+        }),
-
+        sessionId: session[1].uuid,
-    return await this.authService.login({
+      });
-      email: user.email,
+    } catch (error) {
-      userId: user.uuid,
+      throw new BadRequestException('Wrong email, password or region');
-      uuid: user.uuid,
+    }
-      roles: user?.roles?.map((role) => {
-        return { uuid: role.uuid, type: role.roleType.type };
-      }),
-      sessionId: session[1].uuid,
-    });
   }
 
   async deleteUser(uuid: string) {