Skip to content

Commit

Permalink
Merge pull request #27 from authts/up-kc
Browse files Browse the repository at this point in the history
upgrade keycloak to 26.0.4
  • Loading branch information
zach-betz-hln authored Nov 4, 2024
2 parents b9ace91 + 9ca0a06 commit d4927ea
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 1.3.0 (2024-11-04)

- Upgrade Keycloak to 26.0.4
- Move screenshots and optional React steps within `details` el

## 1.2.0 (2024-10-29)

- Add screenshots to readme
Expand Down
24 changes: 15 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ Minimal, reproducible example for Keycloak + React.
<!-- toc -->

- [Screenshots](#screenshots)
* [Login](#login)
* [Home](#home)
* [Playground](#playground)
- [Why](#why)
- [Setup](#setup)
* [Docker Compose](#docker-compose)
Expand All @@ -29,7 +26,7 @@ Minimal, reproducible example for Keycloak + React.
* [Making an API request](#making-an-api-request)
- [Seeded data](#seeded-data)
* [Clients](#clients)
* [Login](#login-1)
* [Login](#login)
* [Tokens](#tokens)
* [Email](#email)
- [Sharing](#sharing)
Expand All @@ -41,18 +38,21 @@ Minimal, reproducible example for Keycloak + React.

## Screenshots

### Login
<details>

![](assets/screencapture-login.png)
<summary>Screenshots</summary>

### Home
**Login**:
![](assets/screencapture-login.png)

**Home**:
![](assets/screencapture-home.png)

### Playground

**Playground**:
![](assets/screencapture-playground.png)

</details>

## Why

I often see questions in the [Keycloak forums](https://keycloak.discourse.group) on how to use it with React. On the other hand, I often see questions in the [react-oidc-context repo](https://github.com/authts/react-oidc-context) on how to use it with Keycloak.
Expand Down Expand Up @@ -87,6 +87,10 @@ In one terminal, run the Postgres database, Keycloak server, Mailhog server, Exp

### OPTIONAL: Run React app outside of Docker Compose

<details>

<summary>Optional steps</summary>

1. Stop the React app container

docker compose stop react
Expand All @@ -113,6 +117,8 @@ In one terminal, run the Postgres database, Keycloak server, Mailhog server, Exp

1. See [links](#links) for username and password

</details>

## Config

The Docker Compose config should work as-is. If you need to customize it, then edit file `.env`
Expand Down
1 change: 1 addition & 0 deletions db/init/02-dump-data-only.sql
Original file line number Diff line number Diff line change
Expand Up @@ -856,6 +856,7 @@ kq18k 24.0.4 1715976025
nlnj3 25.0.4 1725461781
d31gi 26.0.1 1729517474
e4upm 26.0.2 1729776999
v11be 26.0.4 1730737499
\.
Expand Down
2 changes: 1 addition & 1 deletion kc/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM quay.io/keycloak/keycloak:26.0.2
FROM quay.io/keycloak/keycloak:26.0.4
ENTRYPOINT [ "/opt/keycloak/bin/kc.sh" ]
CMD [ "start-dev" ]
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.2.0",
"version": "1.3.0",
"scripts": {
"toc": "markdown-toc -i README.md"
},
Expand Down
1 change: 1 addition & 0 deletions task_dump_kc_data.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
set -e

set -o allexport
# shellcheck disable=SC1091
source .env
set +o allexport

Expand Down

0 comments on commit d4927ea

Please sign in to comment.