From 5b25974ac03dc132b1dc1ad32bdff7c51970d7bc Mon Sep 17 00:00:00 2001
From: "DESKTOP-GBA0BK8\\Admin" <ameye@chiefsoft.com>
Date: Thu, 13 Apr 2023 22:37:19 -0400
Subject: [PATCH] Session fix

---
 app/Models/userAccess.php | 48 ++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 31 deletions(-)

diff --git a/app/Models/userAccess.php b/app/Models/userAccess.php
index 3e2147f..d2069b0 100644
--- a/app/Models/userAccess.php
+++ b/app/Models/userAccess.php
@@ -30,6 +30,7 @@ class userAccess extends baseModel
 
         if (count($data['profile_data']) == 1) {
             $data['profile_data'][0]['password'] = '**REMOVED**';
+            $data['profile_data'][0]['password2'] = '**REMOVED**';
             $member_id = $data['profile_data'][0]['mid'];
             $member_uid = $data['profile_data'][0]['mid']; //$data['profile_data'][0]['uuid'];
             $data['profile_data'][0]['member_id'] = $member_id; // fixing issue of member id used in profile
@@ -45,12 +46,8 @@ class userAccess extends baseModel
                 'settings' => [],
                 'layout'=> ['dash'=>$computedDash],
                 'preferences' => [],
-                'measurement_units' => [
-                    'weight' => [
-                        ['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
-                        ['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
-                    ],
-                ],
+                'cards' => [],
+                'cars' => [],
                 'status' => 0,
                 'status' => 1,
                 'raw_data' => $in,
@@ -61,12 +58,8 @@ class userAccess extends baseModel
                 'session_token' => '',
                 'settings' => [],
                 'preferences' => [],
-                'measurement_units' => [
-                    'weight' => [
-                        ['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
-                        ['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
-                    ],
-                ],
+                'cards' => [],
+                'cars' => [],
                 'status' => 0,
                 'raw_data' => $in,
                 'error_msg' => 'Invalid username or password',
@@ -91,12 +84,13 @@ class userAccess extends baseModel
 
         if (count($data['profile_data']) == 1) {
             $data['profile_data'][0]['password'] = '**REMOVED**';
+            $data['profile_data'][0]['password2'] = '**REMOVED**';
             $member_id = $data['profile_data'][0]['mid'];
-            $member_uid = $data['profile_data'][0]['uuid'];
+            $member_uid = $data['profile_data'][0]['mid'];
             $data['profile_data'][0]['member_id'] = $member_id; // fixing issue of member id used in profile
             $possibeLayout =['33010','33015','33020','33025','33030','33035','33040'];
             $computedDash = $possibeLayout[rand(0,6)];// 33010; // Recomendation engine points
-            $sessionToken = $this->generateSession($member_id);
+            $sessionToken = $this->generateSession($member_id.'Fleet');
             return $inx = [
                 'session_token' => $sessionToken,
                 'member_id' => $member_id,
@@ -106,12 +100,8 @@ class userAccess extends baseModel
                 'settings' => [],
                 'layout'=> ['dash'=>$computedDash],
                 'preferences' => [],
-                'measurement_units' => [
-                    'weight' => [
-                        ['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
-                        ['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
-                    ],
-                ],
+                'cards' => [],
+                'cars' => [],
                 'status' => 0,
                 'status' => 1,
                 'raw_data' => $in,
@@ -122,19 +112,15 @@ class userAccess extends baseModel
             'session_token' => '',
             'settings' => [],
             'preferences' => [],
-            'measurement_units' => [
-                'weight' => [
-                    ['name' => 'Kilogram', 'code' => 'KG', 'text' => 'Kg.'],
-                    ['name' => 'Pound', 'code' => 'LB', 'text' => 'Lbs.'],
-                ],
-            ],
+            'cards' => [],
+            'cars' => [],
             'status' => 0,
             'raw_data' => $in,
             'error_msg' => 'Invalid username or password',
         ];
     }
 
-    private function generateSession($member_id)
+    private function generateSession($member_id,$login_type = 'Users')
     {
         $loc = $this->getIPAddress();
 
@@ -158,13 +144,13 @@ class userAccess extends baseModel
         $query = $this->db->query($sqlQ);
 
         // Create HX
-        /*
-        $sqlQ =
-            "INSERT INTO members_login_hx (member_id,channel,loc) VALUES ($member_id,'Desktop','" .
+
+     $sqlQ =
+            "INSERT INTO members_login_hx (member_id,channel,loc) VALUES ($member_id,'$login_type','" .
             $loc .
             "')";
         $this->db->query($sqlQ);
-        */
+          /* */
         return $tk;
     }