From 8586d6555a0e4eb9175a43deddcdc10ee36ea283 Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Wed, 29 Oct 2025 12:48:34 +0530 Subject: [PATCH] agent login issue : GWM --- app/Controllers/AuthController.php | 47 ++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/app/Controllers/AuthController.php b/app/Controllers/AuthController.php index dcfcd8b..da4cc09 100644 --- a/app/Controllers/AuthController.php +++ b/app/Controllers/AuthController.php @@ -131,24 +131,41 @@ class AuthController extends ResourceController ? null : date('d, M-Y h:iA', strtotime($lastLoginBeforeUpdate)); - - - //get service for the organization - $orgService = $this->organizationModel->find($user['org_id']); - $user['service'] = json_decode($orgService['services_ids'],true); - foreach ($user['service'] as $key => $value) + if($user['role_id'] != 5) { - $serviceData = $this->serviceModel->find($value['service_id']); - $user['service'][$key]['name'] = $serviceData['name']; - $user['service'][$key]['icon'] = $serviceData['icon']; - $user['service'][$key]['order'] = $serviceData['order']; + + //get service for the organization + $orgService = $this->organizationModel->find($user['org_id']); + $user['service'] = json_decode($orgService['services_ids'],true); + foreach ($user['service'] as $key => $value) + { + $serviceData = $this->serviceModel->find($value['service_id']); + $user['service'][$key]['name'] = $serviceData['name']; + $user['service'][$key]['icon'] = $serviceData['icon']; + $user['service'][$key]['order'] = $serviceData['order']; + } + + //get role + $user['role'] = $this->userModel->getRole($user['role_id']); + + //find user has the all access + $user['plan_action'] = getUserPlanCreationRestrictionStatus($user); + + }else{ + + $user['service'] = json_decode($user['agent_supported_service_ids'],true); + foreach ($user['service'] as $key => $value) + { + $serviceData = $this->serviceModel->find($value['service_id']); + $user['service'][$key]['name'] = $serviceData['name']; + $user['service'][$key]['icon'] = $serviceData['icon']; + $user['service'][$key]['order'] = $serviceData['order']; + } + } - //get role - $user['role'] = $this->userModel->getRole($user['role_id']); - - //find user has the all access - $user['plan_action'] = getUserPlanCreationRestrictionStatus($user); + + // Generate JWT Token $token = generateJWT($user);