From 2a964d1b5c0db71d731edfd3e442dc5d7f952786 Mon Sep 17 00:00:00 2001
From: Michael Becker <alcexhim@gmail.com>
Date: Tue, 17 Dec 2024 00:50:02 -0500
Subject: [PATCH] support login token

---
 .../lib/mocha/oms/HttpOmsClient.inc.php          |  8 ++------
 .../ui/renderers/html/HTMLRenderer2.inc.php      |  2 +-
 .../src/mocha-php/ui/pages/LoginPage.phpx.php    | 16 ++++++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mocha-php/src/mocha-php/lib/mocha/oms/HttpOmsClient.inc.php b/mocha-php/src/mocha-php/lib/mocha/oms/HttpOmsClient.inc.php
index c8fb9f5..9d031b5 100644
--- a/mocha-php/src/mocha-php/lib/mocha/oms/HttpOmsClient.inc.php
+++ b/mocha-php/src/mocha-php/lib/mocha/oms/HttpOmsClient.inc.php
@@ -384,14 +384,10 @@
 			return null;
 		}
 
-		public function processElement(InstanceReference $element, array $values) : array | bool
+		public function processElement(InstanceReference $element, array $values) : array
 		{
 			$result = $this->curl_request_json("/tenants/" . $this->getTenantName() . "/instances/" . $element->GlobalIdentifier . "/element", HttpRequestMethod::POST, $values);
-			if ($result["result"] == "success")
-			{
-				return $result;
-			}
-			return false;
+			return $result;
 		}
 
 		public function getRelatedTasks(InstanceReference $inst)
diff --git a/mocha-php/src/mocha-php/lib/mocha/ui/renderers/html/HTMLRenderer2.inc.php b/mocha-php/src/mocha-php/lib/mocha/ui/renderers/html/HTMLRenderer2.inc.php
index 8392043..ca714d9 100644
--- a/mocha-php/src/mocha-php/lib/mocha/ui/renderers/html/HTMLRenderer2.inc.php
+++ b/mocha-php/src/mocha-php/lib/mocha/ui/renderers/html/HTMLRenderer2.inc.php
@@ -35,7 +35,7 @@
 			}
 
 			$array = $this->OMS->processElement($element, $values);
-			if ($array === false)
+			if ($array["result"] === "failure")
 			{
 				return false;
 			}
diff --git a/mocha-php/src/mocha-php/ui/pages/LoginPage.phpx.php b/mocha-php/src/mocha-php/ui/pages/LoginPage.phpx.php
index a0fcb34..b487064 100644
--- a/mocha-php/src/mocha-php/ui/pages/LoginPage.phpx.php
+++ b/mocha-php/src/mocha-php/ui/pages/LoginPage.phpx.php
@@ -106,18 +106,20 @@
 			$renderer->ProcessPostbackFunction = function($sender, $element, $array)
 			{
 				$oms = mocha_get_oms();
-
 				if ($array["result"] == "success")
 				{
 					if (array_key_exists("sessionSecureToken", $array))
 					{
+						// update token if we have
 						$token = $array["sessionSecureToken"];
 						$_SESSION["user_token_" . System::GetTenantName()] = $token;
-						if ($array["type"] == "redirect")
-						{
-							System::Redirect($array["destinationUrl"]);
-							return false;
-						}
+					}
+
+					if ($array["type"] == "redirect")
+					{
+						// response redirect
+						System::Redirect($array["destinationUrl"]);
+						return false;
 					}
 				}
 			};
@@ -182,6 +184,8 @@
 						$_SESSION["user_token_" . System::GetTenantName()] = $token;
 						$oms->setCurrentUser($instUser);
 						
+						echo ($_SESSION["user_token_" . System::GetTenantName()]); die();
+						
 						System::RedirectFromLoginPage();
 						exit();
 					}