Skip to content

Commit fccd8f1

Browse files
authored
revert login and logout changes (#543)
1 parent 93cff4d commit fccd8f1

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

pantheon-bundle/frontend/src/app/components/Chrome/Header/User.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class User extends Component<IAppState, IState> {
4646
<a className="p2-header__login"
4747
href={this.props.userAuthenticated ? this.state.logoutUrl : this.state.loginUrl}
4848
onClick={this.conditionalRedirect}>
49-
{this.props.userAuthenticated ? "Log Out [" + this.props.username + "]" : "Log In"}
49+
{this.props.userAuthenticated ? "[" + this.props.username + "]" : "Log In"}
5050
</a>
5151
</React.Fragment>
5252
)

pantheon-bundle/frontend/src/app/components/Chrome/Header/__snapshots__/User.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ exports[`User tests should render User component 1`] = `
4141
href="/system/sling/logout"
4242
onClick={[Function]}
4343
>
44-
Log Out [demo]
44+
[demo]
4545
</a>
4646
</Fragment>
4747
`;

pantheon-bundle/src/main/java/com/redhat/pantheon/auth/keycloak/KeycloakFilter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,13 +32,17 @@
3232
service = Filter.class,
3333
property = {
3434
KeycloakOIDCFilter.CONFIG_FILE_PARAM + "=" + "keycloak.json",
35+
"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)",
36+
HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/pantheon/*",
37+
HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/content/pantheon",
38+
HttpWhiteboardConstants.HTTP_WHITEBOARD_FILTER_PATTERN + "=" + "/content/products",
3539
HttpWhiteboardConstants.HTTP_WHITEBOARD_CONTEXT_SELECT
3640
+ "="
3741
+ "(osgi.http.whiteboard.context.name=pantheon)",
3842
})
3943

4044
@SlingServletFilter(scope = {SlingServletFilterScope.REQUEST},
41-
pattern = "/auth/login",
45+
pattern = "/content/.*",
4246
methods = {"GET", "POST"})
4347

4448
public class KeycloakFilter extends KeycloakOIDCFilter implements Filter {

0 commit comments

Comments
 (0)