Merge pull request #7 from neuralarchitects/dashboard

fix: enhance data validation for device coordinates and exclude sensi…

Author: TheArchitect2000

admin_web_app/Source_webapp/src/views/crm/CrmDashboard/CrmDashboard.tsx

@@ -47,7 +47,15 @@ const CrmDashboard = () => {
         if (devices?.data.data) {
             const newPositions: [number, number, number, number][] =
                 devices.data.data
-                    .filter((item) => item.location.coordinates)
+                    .filter(
+                        (item) =>
+                            Array.isArray(item.location.coordinates) &&
+                            item.location.coordinates.length === 2 &&
+                            typeof item.location.coordinates[0] === 'number' &&
+                            typeof item.location.coordinates[1] === 'number' &&
+                            item.location.coordinates[0] !== null &&
+                            item.location.coordinates[1] !== null
+                    )
                     .map(
                         (item: any) =>
                             [

backend/src/modules/authentication/authentication.service.ts

@@ -45,6 +45,8 @@ export class AuthenticationService {
       });
 
       if (passwordIsCorrect) {
+        user.password = undefined;
+        user.newPassword = undefined;
         return { user: user, error: null };
       } else {
         return { user: null, error: 'passwordIncorrect' };

backend/src/modules/user/services/user/user.service.ts

@@ -92,9 +92,15 @@ export class UserService {
     private readonly buildingService?: BuildingService,
   ) {}
 
-  getUserKeys(): string {
-    return Object.keys(userSchema.paths).join(' ');
+  getUserKeys(exclude=true): string {
+  const excludedFields = ['password', 'newPassword'];
+  if (exclude) { 
+  return Object.keys(userSchema.paths)
+    .filter(key => !excludedFields.includes(key))
+    .join(' ');
   }
+  return Object.keys(userSchema.paths).join(' ');
+}
 
   validateEmail(email: string) {
     const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
@@ -1446,7 +1452,7 @@ export class UserService {
         },
       },
     ];
-    const selectCondition = this.getUserKeys();
+    const selectCondition = this.getUserKeys(false);
 
     this.user = await this.userRepository.findUserByEmail(
       data.email,
@@ -1556,7 +1562,7 @@ export class UserService {
       },
     ];
 
-    const selectCondition = this.getUserKeys();
+    const selectCondition = this.getUserKeys(false);
 
     this.user = await this.userRepository.findUserByEmail(
       data.email,