Skip to content

Commit

Permalink
Upgrade keycloak to 11.0.3
Browse files Browse the repository at this point in the history
Closes #1840, closes #969.
  • Loading branch information
rocketeerbkw committed Mar 30, 2022
1 parent a9036d1 commit 00cf4cd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion services/keycloak/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG UPSTREAM_REPO
ARG UPSTREAM_TAG
FROM ${UPSTREAM_REPO:-uselagoon}/commons:${UPSTREAM_TAG:-latest} as commons
FROM jboss/keycloak:8.0.2
FROM jboss/keycloak:11.0.3

ARG LAGOON_VERSION
ENV LAGOON_VERSION=$LAGOON_VERSION
Expand Down
9 changes: 5 additions & 4 deletions services/ui/src/lib/withKeycloak.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ export default (App, initialAuth) => {
};

await keycloak.init({
checkLoginIframe: false,
promiseType: 'native',
checkLoginIframe: false
});

if (!keycloak.authenticated) {
Expand All @@ -51,8 +50,10 @@ export default (App, initialAuth) => {
provider: 'keycloak',
providerData: keycloak,
user: {
username: keycloak.tokenParsed ? keycloak.tokenParsed.preferred_username : 'unauthenticated',
},
username: keycloak.tokenParsed
? keycloak.tokenParsed.preferred_username
: 'unauthenticated'
}
}
});
}
Expand Down

0 comments on commit 00cf4cd

Please sign in to comment.