Merge pull request #107 from nimble-platform/staging

Pull Request for Release 17.0.19
nimble-platform · Feb 24, 2022 · a3fc34a · a3fc34a
2 parents 45518de + 226b8c5
commit a3fc34a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/eu/nimble/service/bp/util/persistence/catalogue/PaymentPersistenceUtility.java b/src/main/java/eu/nimble/service/bp/util/persistence/catalogue/PaymentPersistenceUtility.java
@@ -89,7 +89,7 @@ public static String createJSONBodyForPayment(OrderType order){
         json.put("originPlatform","EFPF");
         json.put("totalAmount",totalAmount);
         json.put("status","completed");
-        json.put("@timestamp",timestamp);
+//         json.put("@timestamp",timestamp);
         json.put("products",products);
         return json.toString();
     }

diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml
@@ -204,10 +204,12 @@ nimble:
   # TODO: Retrieve the default token from Keycloak for business-process service client
   default-token: ${BUSINESS_PROCESS_SERVICE_DEFAULT_TOKEN:}
   oauth:
+    # Describes the settings for EFPF Keycloak
+    # It is used to retrieve an access token for Accountancy Service calls
     eFactoryClient:
-      clientId: ${OAUTH_EFACTORY_SERVICE_REGISTRY_CLIENT_ID:}
-      clientSecret: ${OAUTH_EFACTORY_SERVICE_REGISTRY_CLIENT_SECRET:}
-      accessTokenUri: ${OAUTH_EFACTORY_CLIENT_ACCESSTOKEN_URI:}
+      clientId: ${OAUTH_ACCOUNTANCY_SERVICE_REGISTRY_CLIENT_ID:}
+      clientSecret: ${OAUTH_ACCOUNTANCY_SERVICE_REGISTRY_CLIENT_SECRET:}
+      accessTokenUri: ${OAUTH_ACCOUNTANCY_SERVICE_CLIENT_ACCESSTOKEN_URI:}
   kafka:
       topics:
         businessProcessUpdates: ${KAFKA_TOPIC_BUSINESS_PROCESS_UPDATES}