SAP · maxmarkus · May 14, 2019 · Apr 16, 2019 · Apr 17, 2019 · Apr 17, 2019
@@ -17,7 +17,7 @@ describe('Login Flow', () => {
     );
   });
 
-  it('Link in profile dropwdown', () => {
+  it('Link in profile dropdown', () => {
     cy.login('tets@email.com', 'tets');
 
     cy.get('[data-e2e="luigi-topnav-profile"]').click();

@@ -72,8 +72,18 @@
     <div class="panel">
       <h1>Login to Luigi sample app</h1>
       <form>
-        <input type="text" class="form-input" value="LuigiUsername" /><br />
-        <input type="password" class="form-input" value="LuigiPassword" /><br />
+        <input
+          type="text"
+          class="form-input"
+          value="LuigiUsername"
+          autocomplete="username"
+        /><br />
+        <input
+          type="password"
+          class="form-input"
+          value="LuigiPassword"
+          autocomplete="current-password"
+        /><br />
         <button id="login-button">Login</button>
       </form>
     </div>

@@ -1,15 +1,47 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>Luigi Mock Identity Provider</title>
-</head>
-<body>
-Logging out...
-<script>
-  window.onload = function() {
-    const redirectTo = decodeURIComponent(window.location.href.match(/post_logout_redirect_uri=(.*?)(&|$)/)[1]);
-    window.location.href = redirectTo;
-  };
-</script>
-</body>
+  <head>
+    <title>Luigi Mock Identity Provider</title>
+  </head>
+  <body>
+    Logging out...
+    <script>
+      var allPossibilitiesOfHashSlashes = '([^/?=&]+)(=([^&]*))?';
+
+      var getQueryParams = function(uri) {
+        var hashParams = {};
+        uri.replace(new RegExp(allPossibilitiesOfHashSlashes, 'g'), function(
+          $0,
+          $1,
+          $2,
+          $3
+        ) {
+          hashParams[$1] = $3;
+        });
+        return hashParams;
+      };
+
+      window.onload = function() {
+        let redirectTo;
+        try {
+          const url = new URL(window.location.href);
+          const post_logout_redirect_uri = url.searchParams.get(
+            'post_logout_redirect_uri'
+          );
+          redirectTo = post_logout_redirect_uri;
+
+          const error = url.searchParams.get('error');
+          const errorDescription = url.searchParams.get('errorDescription');
+          if (error) {
+            redirectTo = `${redirectTo}?error=${error}&errorDescription=${errorDescription}`;
+          }
+        } catch (error) {
+          redirectTo = decodeURIComponent(
+            window.location.href.match(/post_logout_redirect_uri=(.*?)(&|$)/)[1]
+          );
+        }
+        window.location.href = redirectTo;
+      };
+    </script>
+  </body>
 </html>
@@ -57,7 +57,7 @@
           <div class="hint" id="message" data-e2e="logout-message">Sign in again to continue working on awesome things!</div>
         </p>
         <p class="fd-has-text-align-center">
-          <button class="fd-button--emphasized " onclick="login()">Re-Login</button>
+          <button class="fd-button--emphasized" onclick="login()">Re-Login</button>
         </p>
       </section>
     </div>
@@ -74,16 +74,12 @@
   var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
   var results = regex.exec(location.search);
   return results && decodeURIComponent(results[1].replace(/\+/g, ' ')) || '';
-};
+}
 
-var reason = getUrlParameter('reason');
 var error = getUrlParameter('error');
+var errorDescription = getUrlParameter('errorDescription');
 
-if (error) {
-  document.getElementById('message').innerText = error;
-}
-
-switch (reason) {
+switch (error) {
   case 'tokenExpired':
     document.getElementById('headline').innerText = 'Your session has expired.';
     break;
@@ -94,6 +90,11 @@
   default:
     break;
 }
+
+if (errorDescription) {
+  document.getElementById('message').innerText = errorDescription;
+}
+
 </script>
 </body>
 </html>
@@ -91,18 +91,19 @@ class Auth {
   };
 
   events = {
-    onLogout: () => {
-      console.log('onLogout');
+    onLogout: settings => {
+      console.log('onLogout', settings);
     },
-    onAuthSuccessful: data => {
-      console.log('onAuthSuccessful', data);
+    onAuthSuccessful: (settings, authData) => {
+      console.log('onAuthSuccessful', settings, authData);
     },
-    onAuthExpired: () => {
-      console.log('onAuthExpired');
+    onAuthExpired: settings => {
+      console.log('onAuthExpired', settings);
+      // return false; // prevent redirect to logoutUrl
     },
-    // TODO: define luigi-client api for getting errors
-    onAuthError: err => {
-      console.log('authErrorHandler 1', err);
+    onAuthError: (settings, err) => {
+      console.log('authErrorHandler 1', err, settings);
+      // return false; // prevent redirect to logoutUrl, but go to /
     }
   };
 }