From f50f7019b137f02641f3a7f94b64a135529a693e Mon Sep 17 00:00:00 2001
From: tokslaw7 <tokslaw7@gmail.com>
Date: Sat, 1 Apr 2023 23:13:36 +0000
Subject: [PATCH] Refactor

---
 app/Models/userAccess.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/Models/userAccess.php b/app/Models/userAccess.php
index 24c12e9..3c4aa6c 100644
--- a/app/Models/userAccess.php
+++ b/app/Models/userAccess.php
@@ -35,8 +35,9 @@ class userAccess extends baseModel
             $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);
             return $inx = [
-                'session_token' => $this->generateSession($member_id),
+                'session_token' => $sessionToken,
                 'member_id' => $member_id,
                 'member_uuid' => $member_uid,
                 'guid' => $member_uid,
@@ -54,7 +55,8 @@ class userAccess extends baseModel
                 'status' => 1,
                 'raw_data' => $in,
             ];
-        } else {
+        }
+
             return $inx = [
                 'session_token' => '',
                 'settings' => [],
@@ -69,19 +71,21 @@ class userAccess extends baseModel
                 'raw_data' => $in,
                 'error_msg' => 'Invalid username or password',
             ];
-        }
     }
 
     private function generateSession($member_id)
     {
         $loc = $this->getIPAddress();
+
         // do the seesion stuffs here - set up all permissions
         $tk = '';
         for ($i = 1; $i < 20; $i++) {
             $tk .= rand(11111, 99999);
         }
+
         $sqlQ = "DELETE FROM members_session WHERE member_id = $member_id ";
         $query = $this->db->query($sqlQ);
+
         $sqlQ =
             "INSERT INTO members_session (session,member_id,loc) VALUES('" .
             $tk .
@@ -89,8 +93,7 @@ class userAccess extends baseModel
             $member_id .
             ",'" .
             $loc .
-            "'
-            ) ";
+            "') ";
         $query = $this->db->query($sqlQ);
 
         // Create HX