Merge branch 'main' into luigi-headless

SAP · Oct 18, 2024 · b56c135 · b56c135
2 parents d4f9e69 + c31db2c
commit b56c135
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 22 deletions.
diff --git a/client-frameworks-support/client-support-angular/package-lock.json b/client-frameworks-support/client-support-angular/package-lock.json
diff --git a/client-frameworks-support/client-support-angular/package.json b/client-frameworks-support/client-support-angular/package.json
@@ -34,7 +34,7 @@
     "@types/jasmine": "~3.6.0",
     "@types/node": "^12.11.1",
     "codelyzer": "^6.0.0",
-    "engine.io": "~6.5.5",
+    "engine.io": "~6.6.2",
     "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~6.3.16",

diff --git a/client/src/lifecycleManager.js b/client/src/lifecycleManager.js
@@ -146,28 +146,26 @@ class LifecycleManager extends LuigiClientBase {
     let tpc = 'enabled';
     let cookies = document.cookie;
     let luigiCookie;
-    let luigiCookieKey;
     if (cookies) {
       luigiCookie = cookies
         .split(';')
         .map(cookie => cookie.trim())
-        .find(cookie => cookie == 'luigiCookie=true');
+        .find(cookie => cookie === 'luigiCookie=true');
     }
     if (luigiCookie === 'luigiCookie=true') {
-      luigiCookieKey = luigiCookie.split('=')[0];
-      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
+      document.cookie = 'luigiCookie=; Max-Age=-99999999; SameSite=None; Secure';
     }
     document.cookie = 'luigiCookie=true; SameSite=None; Secure';
     cookies = document.cookie;
     if (cookies) {
       luigiCookie = cookies
         .split(';')
         .map(cookie => cookie.trim())
-        .find(cookie => cookie == 'luigiCookie=true');
+        .find(cookie => cookie === 'luigiCookie=true');
     }
     if (luigiCookie === 'luigiCookie=true') {
+      document.cookie = 'luigiCookie=; Max-Age=-99999999; SameSite=None; Secure';
       window.parent.postMessage({ msg: 'luigi.third-party-cookie', tpc }, '*');
-      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
     } else {
       tpc = 'disabled';
       window.parent.postMessage({ msg: 'luigi.third-party-cookie', tpc }, '*');

diff --git a/container/cypress/e2e/test-app/iframe/iframe-container.cy.js b/container/cypress/e2e/test-app/iframe/iframe-container.cy.js
@@ -16,7 +16,7 @@ describe('Iframe Container Test', () => {
       .get('iframe')
       .then(() => {
         cy.wrap(stub).should('have.been.calledWith', 'set-third-party-cookies-request');
-        cy.getCookie('luigiCookie').should('exist');
+        cy.getCookie('luigiCookie').should('not.exist');
       });
   });
 

diff --git a/core/third-party-cookies/init.html b/core/third-party-cookies/init.html
@@ -2,16 +2,14 @@
   <script>
     let cookies = document.cookie;
     let luigiCookie;
-    let luigiCookieKey;
     if (cookies) {
       luigiCookie = cookies
         .split(';')
         .map(cookie => cookie.trim())
         .find(cookie => cookie == 'luigiCookie=true');
     }
     if (luigiCookie === 'luigiCookie=true') {
-      luigiCookieKey = luigiCookie.split('=')[0];
-      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
+      document.cookie = 'luigiCookie=; Max-Age=-99999999; SameSite=None; Secure';
     }
     document.cookie = 'luigiCookie=true; SameSite=None; Secure';
     cookies = document.cookie;
@@ -23,7 +21,7 @@
     }
     if (luigiCookie === 'luigiCookie=true') {
       window.parent.postMessage('luigi.tpcEnabled', '*');
-      document.cookie = luigiCookieKey + '=; Max-Age=-99999999; SameSite=None; Secure';
+      document.cookie = 'luigiCookie=; Max-Age=-99999999; SameSite=None; Secure';
     } else {
       window.parent.postMessage('luigi.tpcDisabled', '*');
       console.warn('Third party cookies are not supported!');

diff --git a/docs/luigi-compound-container-api.md b/docs/luigi-compound-container-api.md
@@ -16,7 +16,9 @@ meta -->
 
 # Luigi Compound Container API
 
-This document outlines the parameters provided by the Luigi Compound Container. Luigi Compound Container provides the possibility to insert multiple webcomponent-based microfrontends in one container
+This document outlines the parameters provided by the Luigi Compound Container. Luigi Compound Container provides the possibility to insert multiple webcomponent-based microfrontends in one container.<br/>
+In addition you can use standard `addEventListener` function to react on events emmitted by the Luigi Compound Container. The list of events and their meaning can be found [here](https://github.com/SAP/luigi/blob/main/container/src/constants/communication.ts).
+
 
 ## API Reference
 

diff --git a/docs/luigi-container-api.md b/docs/luigi-container-api.md
@@ -16,7 +16,8 @@ meta -->
 
 # Luigi Container API
 
-This document outlines the parameters provided by the Luigi Container.
+This document outlines the parameters provided by the Luigi Container.<br/>
+In addition you can use standard `addEventListener` function to react on events emmitted by the Luigi Container. The list of events and their meaning can be found [here](https://github.com/SAP/luigi/blob/main/container/src/constants/communication.ts).
 
 ## API Reference