Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keycloak integration #48

Merged
merged 23 commits into from
Nov 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
426f564
Remove spring security and Integrate keycloak.
ali-everest Sep 28, 2021
1b6ba27
Update and/or disable unit and integration tests and fix checkstyle e…
donna-ann Oct 7, 2021
f045239
Remove the org email confirmation code, pending registration module.
ali-everest Oct 7, 2021
45141fc
Add update users roles api
dhanalakshmi-narala Oct 14, 2021
e30a58e
Add tests for request filter configuration and organization aggregate
ali-everest Oct 15, 2021
9d6e361
Removing encoded-password for user
nitinks-ee Oct 21, 2021
a15a3c6
Slightly more versatile retry with backoff waiter
sluehr Oct 22, 2021
de0dc51
Setup the keycloak standalone server for testing.
ali-everest Oct 25, 2021
77e22fc
Update readme file for the Keycloak setup and keycloak user details
dhanalakshmi-narala Oct 27, 2021
2c3d8a9
Refactor code and update failing tests.
nitinks-ee Oct 29, 2021
fcb5e4f
Resolving PR comments
nitinks-ee Nov 15, 2021
3330580
Fix saga serialisation
sluehr Nov 16, 2021
b0c6658
Code edits/additions
ali-everest Nov 16, 2021
a5cf404
Minor fixes and code refactoring
ali-everest Nov 17, 2021
217df08
Rename FilterConfig file and refactor shouldNotFilter method
ali-everest Nov 18, 2021
044440a
Migrated Jupyter notebook to Python and updated to demonstrate integr…
sluehr Nov 19, 2021
be07361
Remove admin org registration.
ali-everest Nov 23, 2021
d424ea3
Resolve conflicts & fix tests
ali-everest Nov 23, 2021
b143f70
Prevent first time user bootstrapping filter from retriggering new us…
sluehr Nov 24, 2021
38258fb
Improved pre-aggregate command validation based on projections
sluehr Nov 24, 2021
f6cf200
Fixed new user display name not being set in Keycloak.
sluehr Nov 25, 2021
f2f006c
Add a method for sending verification email
ali-everest Nov 25, 2021
edd7140
Renamed organisation user creation command for more clarity. Updated …
sluehr Nov 25, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,17 @@ steps:
agents:
java: 11
commands:
- ./gradlew build --console plain
- pkill java || echo 'No Java processes to kill.'
- ./gradlew startServer && ./gradlew build --console plain
sluehr marked this conversation as resolved.
Show resolved Hide resolved

- label: ':sonarqube: Quality reporting'
<<: *if-our-repo
<<: *if-main-branch
agents:
java: 11
commands:
- ./gradlew clean codeCoverageReport sonarqube --console plain
- pkill java || echo 'No Java processes to kill.'
- ./gradlew clean startServer && ./gradlew codeCoverageReport sonarqube --console plain

- wait:
<<: *if-release
Expand All @@ -29,7 +31,7 @@ steps:
<<: *if-release
key: bintray-publish
agents:
java: 11
java: 11
commands:
- git fetch --tags
- ./gradlew bintrayPublish bintrayUpload --console plain
3 changes: 3 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
KEYCLOAK_SERVER_PORT=8180
[email protected]
KEYCLOAK_PASSWORD=ac0n3x72
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,8 @@ build/

.ipynb_checkpoints/

.project
.settings
.vscode
/src/launcher/bin
*.classpath
290 changes: 173 additions & 117 deletions README.md

Large diffs are not rendered by default.

7 changes: 5 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ subprojects {
axonCryptoShreddingVersion = '0.9.6'
axonHazelcastCommandDistributionVersion = '0.9.5'
mediaVersion = '0.9.4'
securityVersion = '0.9.5'
storageVersion = '0.9.7'

awsSdkVersion = '1.11.887'
Expand All @@ -59,18 +58,22 @@ subprojects {
hazelcastVersion = '4.2.1'
javaXCacheVersion = '1.1.1'
javaXPersistenceVersion = '2.2'
jsonHelperVersion = '20210307'
keycloakVersion = '15.0.2'
liquibaseVersion = '4.4.0'
lombokVersion = '1.18.20'
microMeterPrometheusVersion = '1.7.1'
postgresDriverVersion = '42.2.18'
prometheusSimpleClientVersion = '0.11.0'
swaggerVersion = '3.0.0'
springBootVersion = '2.4.8'
swaggerVersion = '3.0.0'
webfluxVersion = '2.5.5'

h2Version = '1.4.200'
hamcrestVersion = '2.2'
junitVersion = '5.7.2'
mockitoVersion = '3.11.2'
undercouchVersion = '4.1.2'
}

dependencyManagement {
Expand Down
4 changes: 2 additions & 2 deletions doc/notebook/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rubydata/datascience-notebook:3df56b9025d3
FROM jupyter/base-notebook

RUN gem install httpclient rest-client json iruby awesome_print gnuplot rubyvis nyaplot cztop pry pry-doc
RUN pip install python-keycloak

7 changes: 5 additions & 2 deletions doc/notebook/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ services:
notebook:
build:
context: .
container_name: jupyter-notebook
volumes:
- ./files:/home/jovyan/work
network_mode: "host"

network_mode: host
environment:
- JUPYTER_ENABLE_LAB=yes

Loading