diff --git a/devi b/devi index 5da9c7b..c1b732f 100755 --- a/devi +++ b/devi @@ -64,11 +64,7 @@ if [[ "$(strip_dash $1)" == "deploy" ]]; then mvn clean install -Pkubernetes -DskipTests fi -if [[ "$(strip_dash $1)" == "deploy-oidc" ]]; then - echo " Deploy to Imixs-Cloud..." - mvn clean install -Pkubernetes-oidc -DskipTests -fi # Überprüfen, ob keine Parameter übergeben wurden - standard build if [[ $# -eq 0 ]]; then @@ -80,7 +76,6 @@ if [[ $# -eq 0 ]]; then echo " -hot : Manik Hotdeploy Starten" echo " -test : Run tests" echo " -deploy: Imixs-Cloud Deployment starten " - echo " -deploy-oidc: Imixs-Cloud Deployment mit SSO starten " echo " -setup : Developer Umgebung neu aufbauen und Docker Container starten " echo "_________________________________________" echo " " diff --git a/office-alexander-logistics-app/pom.xml b/office-alexander-logistics-app/pom.xml index 77f57d1..b238241 100644 --- a/office-alexander-logistics-app/pom.xml +++ b/office-alexander-logistics-app/pom.xml @@ -123,74 +123,6 @@ - - kubernetes-oidc - - - - org.imixs.workflow - imixs-office-workflow-oidc - compile - ${org.imixs.office.version} - - - - - - - maven-war-plugin - - - - true - src/oidc/ - - **/* - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.8 - - - install - - - - - - - - - - - - - - - - - - - - - run - - - - - - - - diff --git a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java index a9dca9b..16275e5 100644 --- a/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java +++ b/office-alexander-logistics-app/src/main/java/com/alexanderlogistics/zoho/ZohoOAuthManager.java @@ -62,7 +62,8 @@ public class ZohoOAuthManager { @Lock(LockType.READ) public String getValidAccessToken() throws PluginException { logger.fine("├── get Zoho AccessTokens"); - ItemCollection zohoConfig = configService.loadConfiguration(ZohoController.ZOHO_CONFIGURATION, false); + // Discard Config Cache! + ItemCollection zohoConfig = configService.loadConfiguration(ZohoController.ZOHO_CONFIGURATION, true); String accessToken = zohoConfig.getItemValueString("zoho.accessToken"); logger.fine("│ ├── accessToken=" + accessToken); logger.fine("│ ├── refresh=" + zohoConfig.getItemValueString("zoho.refreshToken")); @@ -124,13 +125,6 @@ public class ZohoOAuthManager { String clientID = zohoConfig.getItemValueString("zoho.clientid"); String clientSecret = zohoConfig.getItemValueString("zoho.clientsecret"); - // String requestUrl = zohoConfig.getItemValueString("zoho.oauth.uri") + - // "?code=" - // + URLEncoder.encode(code, StandardCharsets.UTF_8) + "&client_id=" - // + URLEncoder.encode(clientID, StandardCharsets.UTF_8) + "&client_secret=" - // + URLEncoder.encode(clientSecret, StandardCharsets.UTF_8) + "&redirect_uri=" - // + URLEncoder.encode(redirectURI, StandardCharsets.UTF_8) + - // "&grant_type=authorization_code"; String requestUrl = zohoConfig.getItemValueString("zoho.oauth.uri") + "?code=" + URLEncoder.encode(code, StandardCharsets.UTF_8) + "&client_id=" @@ -181,7 +175,8 @@ public class ZohoOAuthManager { public String refreshAccessToken() throws PluginException { logger.info("├── refresh Zoho access token"); - ItemCollection zohoConfig = configService.loadConfiguration(ZohoController.ZOHO_CONFIGURATION, false); + // discard config cache! + ItemCollection zohoConfig = configService.loadConfiguration(ZohoController.ZOHO_CONFIGURATION, true); String clientID = zohoConfig.getItemValueString("zoho.clientid"); String clientSecret = zohoConfig.getItemValueString("zoho.clientsecret"); diff --git a/office-alexander-logistics-app/src/oidc/WEB-INF/web.xml b/office-alexander-logistics-app/src/oidc/WEB-INF/web.xml index 5d3b359..4f79212 100644 --- a/office-alexander-logistics-app/src/oidc/WEB-INF/web.xml +++ b/office-alexander-logistics-app/src/oidc/WEB-INF/web.xml @@ -87,11 +87,6 @@ --> - diff --git a/pom.xml b/pom.xml index 1d83e6c..b91ff1a 100644 --- a/pom.xml +++ b/pom.xml @@ -90,10 +90,6 @@ kubernetes - - kubernetes-oidc - - diff --git a/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn b/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn index bb4aeb8..e912747 100644 --- a/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn +++ b/workflow/dwc/rechnungseingang-dwc-1.0.7.bpmn @@ -4110,10 +4110,7 @@ Betrag: _amount (Brutto € _amount_brutto1000 100 (?!txtworkflowhistory)(^[a-zA-Z]|^_) - - stop - false - + ]]> diff --git a/workflow/posteingang-en-2.0.2.bpmn b/workflow/posteingang-en-2.0.2.bpmn index 2a565b4..ef29fce 100644 --- a/workflow/posteingang-en-2.0.2.bpmn +++ b/workflow/posteingang-en-2.0.2.bpmn @@ -514,7 +514,7 @@ Company: document.company
]]> https://llama.cpp.imixs.com/ XML - true + false cdtr.name,invoice.number,invoice.date,invoice.total,payment.date,cdtr.iban,cdtr.bic,total @@ -900,7 +900,7 @@ Note: Do not generate any other information instead of the XML object. Do not ge https://llama.cpp.imixs.com/ invoice.summary - true + false false