From fccd8f17eb462be115265f681ef72b9901f18b19 Mon Sep 17 00:00:00 2001
From: Lisa Davidson <xdavidson@users.noreply.github.com>
Date: Wed, 17 Mar 2021 08:58:31 -0400
Subject: [PATCH] revert login and logout changes (#543)

---
 .../frontend/src/app/components/Chrome/Header/User.tsx      | 2 +-
 .../Chrome/Header/__snapshots__/User.test.tsx.snap          | 2 +-
 .../com/redhat/pantheon/auth/keycloak/KeycloakFilter.java   | 6 +++++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pantheon-bundle/frontend/src/app/components/Chrome/Header/User.tsx b/pantheon-bundle/frontend/src/app/components/Chrome/Header/User.tsx
index 77eb39b8e..f1a11de62 100644
--- a/pantheon-bundle/frontend/src/app/components/Chrome/Header/User.tsx
+++ b/pantheon-bundle/frontend/src/app/components/Chrome/Header/User.tsx
@@ -46,7 +46,7 @@ class User extends Component<IAppState, IState> {
                 <a className="p2-header__login"
                     href={this.props.userAuthenticated ? this.state.logoutUrl : this.state.loginUrl}
                     onClick={this.conditionalRedirect}>
-                    {this.props.userAuthenticated ? "Log Out [" + this.props.username + "]" : "Log In"}
+                    {this.props.userAuthenticated ? "[" + this.props.username + "]" : "Log In"}
                 </a>
             </React.Fragment>
         )
diff --git a/pantheon-bundle/frontend/src/app/components/Chrome/Header/__snapshots__/User.test.tsx.snap b/pantheon-bundle/frontend/src/app/components/Chrome/Header/__snapshots__/User.test.tsx.snap
index c6f1cb3c1..40f9ff138 100644
--- a/pantheon-bundle/frontend/src/app/components/Chrome/Header/__snapshots__/User.test.tsx.snap
+++ b/pantheon-bundle/frontend/src/app/components/Chrome/Header/__snapshots__/User.test.tsx.snap
@@ -41,7 +41,7 @@ exports[`User tests should render User component 1`] = `
     href="/system/sling/logout"
     onClick={[Function]}
   >
-    Log Out [demo]
+    [demo]
   </a>
 </Fragment>
 `;
diff --git a/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java b/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
index 696bda8e1..d31a128d9 100644
--- a/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
+++ b/pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java
@@ -32,13 +32,17 @@
         service = Filter.class,
         property = {
                 KeycloakOIDCFilter.CONFIG_FILE_PARAM + "=" + "keycloak.json",
+                "keycloak.config.skipPattern=(/pantheon/internal/modules.json|/pantheon/builddate.json|/pantheon/fonts/*|/content/repositories.harray.1.json|/starter.html|/bin/browser.html|/content/starter/css/bundle.css|/content/starter/img/sling-logo.svg|/content/starter/img/asf-logo.svg|/content/starter/img/sling-logo.svg|/content/starter/img/gradient.jpg|/content/starter/fonts/OpenSans-Light-webfont.woff|/content/starter/fonts/OpenSans-Regular-webfont.woff|/system/sling.js|/system/*|/pantheon/*.js)",
+                HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/pantheon/*",
+                HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/content/pantheon",
+                HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/content/products",
                 HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT
                         + "="
                         + "(osgi.http.whiteboard.context.name=pantheon)",
         })
 
 @SlingServletFilter(scope = {SlingServletFilterScope.REQUEST},
-        pattern = "/auth/login",
+        pattern = "/content/.*",
         methods = {"GET", "POST"})
 
 public class KeycloakFilter extends KeycloakOIDCFilter implements Filter {