From e2652bd46a14ccf8c2bf98c264fb5555bbc1c812 Mon Sep 17 00:00:00 2001
From: Ravi Lodhi <ravi.lodhi@hotwaxsystems.com>
Date: Thu, 20 Jun 2024 12:56:25 +0530
Subject: [PATCH] Fixed: Added support to use default oms user when oms apis
 are called from a scheduled job (#22).

---
 MoquiConf.xml                                         | 1 +
 service/co/hotwax/common/CommonServices.xml           | 4 +++-
 service/co/hotwax/product/ProductFacilityServices.xml | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/MoquiConf.xml b/MoquiConf.xml
index 5fae6ed..cdb305b 100644
--- a/MoquiConf.xml
+++ b/MoquiConf.xml
@@ -3,4 +3,5 @@
 <moqui-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/moqui-conf-3.xsd">
 
     <default-property name="webapp_require_session_token" value="false"/>
+    <default-property name="default.oms.user" value=""/>
 </moqui-conf>
diff --git a/service/co/hotwax/common/CommonServices.xml b/service/co/hotwax/common/CommonServices.xml
index d475ea6..8877649 100644
--- a/service/co/hotwax/common/CommonServices.xml
+++ b/service/co/hotwax/common/CommonServices.xml
@@ -30,9 +30,11 @@
     <service verb="autoComplete" noun="SolrFacet" transaction-timeout="3600">
         <implements service="co.hotwax.common.CommonServices.autoComplete#OmsSolrFacetApi"/>
         <actions>
+            <!-- In case of schedule job run no user logged in, use system user to get the token-->
+            <set field="userName" from="ec.user.username" default-value="${System.getProperty('default.oms.user')}"/>
             <script>
                 omsBaseUrl = co.hotwax.util.MaargUtil.getOmsInstanceUrl(ec.ecfi);
-                token = co.hotwax.util.MaargUtil.getOmsJwtToken(ec.ecfi);
+                token = co.hotwax.util.MaargUtil.getOmsJwtToken(ec.ecfi, userName);
             </script>
             <if condition="!token">
                 <return error="true" message="Unable to generate oms token, check JWT configuration"/>
diff --git a/service/co/hotwax/product/ProductFacilityServices.xml b/service/co/hotwax/product/ProductFacilityServices.xml
index 50171dc..f4a0f8d 100644
--- a/service/co/hotwax/product/ProductFacilityServices.xml
+++ b/service/co/hotwax/product/ProductFacilityServices.xml
@@ -174,9 +174,11 @@
             <parameter name="productDetail" type="Map"/>
         </out-parameters>
         <actions>
+            <!-- In case of schedule job run no user logged in, use system user to get the token-->
+            <set field="userName" from="ec.user.username" default-value="${System.getProperty('default.oms.user')}"/>
             <script>
                 omsBaseUrl = co.hotwax.util.MaargUtil.getOmsInstanceUrl(ec.ecfi);
-                token = co.hotwax.util.MaargUtil.getOmsJwtToken(ec.ecfi);
+                token = co.hotwax.util.MaargUtil.getOmsJwtToken(ec.ecfi, userName);
             </script>
             <if condition="!token">
                 <return error="true" message="Unable to generate oms token, check JWT configuration"/>