Fix compass ce url and parser (#303)

* Fix compass ce url * Correct the parser
kyma-incubator · Dec 22, 2021 · 952986b · 952986b
1 parent 8b5571a
commit 952986b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/examples/kyma-mock/app.js b/examples/kyma-mock/app.js
@@ -68,7 +68,7 @@ function customizeMock(app) {
             urls:
             {
                 eventsUrl: localDomain + "/events/v1/events",
-                cloudeventsUrl: localDomain + "events/events",
+                cloudeventsUrl: localDomain + "/events/events",
                 metadataUrl:
                     localDomain + "/metadata/v1/metadata/services",
                 renewCertUrl:

diff --git a/modules/api-server/src/server/app.ts b/modules/api-server/src/server/app.ts
@@ -28,9 +28,10 @@ const LOGGER = config.logger("api-server")
 async function init(config: config.Config) {
     let app = express()
     app.use(express.json({
-        type: function (req) {
-            return req.headers['content-type']
-        }
+        type: [
+            "application/cloudevents+json",
+            "application/json"
+        ]
     }))
     app.use(cors())
     app.options('*', cors())

diff --git a/modules/app-connector/src/server/compass/connector.ts b/modules/app-connector/src/server/compass/connector.ts
@@ -129,7 +129,7 @@ async function signCertificateSigningRequestBase(connectorClientFn: Function, ur
   return Buffer.from(encodedCert, "base64");
 }
 
-export async function eventsUrl(): Promise<string> {
+export async function legacyEventsUrl(): Promise<string> {
   const query = gql`
     query($appId: ID!) {
       application(id: $appId) {
@@ -165,9 +165,18 @@ export async function eventsUrl(): Promise<string> {
         : " application not found"
     }`
   );
+  LOGGER.debug("Legacy events URL: %s", result.data.application.eventingConfiguration.defaultURL)
   return result.data.application.eventingConfiguration.defaultURL;
 }
 
+export async function cloudEventsUrl(): Promise<string> {
+  let legacyUrl = await legacyEventsUrl();
+
+  let cloudeventsUrl = legacyUrl.replace("/v1/events", "/events");
+  LOGGER.debug("Cloud events URL: %s", cloudeventsUrl)
+  return cloudeventsUrl;
+}
+
 async function queryAppID(connectionInfo: connection.Info, certificate: Buffer): Promise<string> {
   const query = gql`
     query {

diff --git a/modules/app-connector/src/server/connection.ts b/modules/app-connector/src/server/connection.ts
@@ -142,12 +142,12 @@ export async function connect(token: string, persistFiles: boolean = true, insec
 
 export async function legacyEventsUrl(): Promise<string> {
   if (connection!.type === Type.Kyma) return kymaConnector.legacyEventsUrl();
-  else return compassConnector.eventsUrl();
+  else return compassConnector.legacyEventsUrl();
 }
 
 export async function cloudEventsUrl(): Promise<string> {
   if (connection!.type === Type.Kyma) return kymaConnector.cloudEventsUrl();
-  else return compassConnector.eventsUrl();
+  else return compassConnector.cloudEventsUrl();
 }
 
 export type Info = {