-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
15 changed files
with
30 additions
and
123 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,3 @@ | ||
REGISTRY=docker.io | ||
FRONTEND_VERSION=architecture/authentication-conversation-starter | ||
DATAVERSE_SERVER=https://beta.dataverse.org | ||
API_KEY=secret_api_key | ||
UNBLOCK_KEY=secret_unblock_key | ||
USER_HEADER=X-Forwarded-Preferred-Username | ||
DATAVERSE_SERVER=http://172.17.0.1:8080/api |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,19 @@ | ||
# see: https://github.com/oauth2-proxy/oauth2-proxy/blob/master/contrib/local-environment/docker-compose-keycloak.yaml | ||
# This docker-compose file can be used to bring up an example instance of oauth2-proxy | ||
# for manual testing and exploration of features. | ||
# Alongside OAuth2-Proxy, this file also starts Keycloak to act as the identity provider, | ||
# dvproxy as an example upstream. | ||
# Alongside OAuth2-Proxy, this file also starts Keycloak to act as the identity provider | ||
# | ||
# This can either be created using docker-compose | ||
# docker-compose -f docker-compose-keycloak.yaml <command> | ||
# Or: | ||
# make keycloak-<command> (eg. make keycloak-up, make keycloak-down) | ||
# | ||
# Access public SPA http://dataverse-public.localtest.me:9000/ | ||
# Access public API http://dataverse-public.localtest.me:9000/api/v1/users/:me | ||
# Access public SPA http://dataverse-public.localhost:9000/ | ||
# Access public API http://dataverse-public.localhost:9000/api/v1/users/:me | ||
# click on "Log In" and login with [email protected], password=password, or use: | ||
# Access authenticated SPA http://oauth2-proxy.localtest.me:4180/ to initiate a login cycle using [email protected], password=password | ||
# Access authenticated API http://oauth2-proxy.localtest.me:4180/api/v1/users/:me to initiate a login cycle using [email protected], password=password | ||
# Access http://keycloak.localtest.me:9080 with the same credentials to check out the settings | ||
# Access authenticated SPA http://oauth2-proxy.localhost:4180/ to initiate a login cycle using [email protected], password=password | ||
# Access authenticated API http://oauth2-proxy.localhost:4180/api/v1/users/:me to initiate a login cycle using [email protected], password=password | ||
# Access http://keycloak.localhost:9080 with the same credentials to check out the settings | ||
services: | ||
|
||
# secured access | ||
|
@@ -56,7 +55,7 @@ services: | |
networks: | ||
keycloak: | ||
aliases: | ||
- keycloak.localtest.me | ||
- keycloak.localhost | ||
|
||
dataverse: | ||
container_name: 'dataverse' | ||
|
@@ -67,29 +66,11 @@ services: | |
network: host | ||
args: | ||
CONFIG: authn | ||
DATAVERSE_SERVER: ${DATAVERSE_SERVER} | ||
networks: | ||
dataverse: | ||
aliases: | ||
- dataverse.localtest.me | ||
depends_on: | ||
- dvproxy | ||
|
||
dvproxy: | ||
container_name: 'dvproxy' | ||
hostname: dvproxy | ||
build: | ||
context: ./dvproxy | ||
dockerfile: ./Dockerfile | ||
network: host | ||
restart: on-failure | ||
environment: | ||
DATAVERSE_SERVER: ${DATAVERSE_SERVER} | ||
API_KEY: ${API_KEY} | ||
UNBLOCK_KEY: ${UNBLOCK_KEY} | ||
USER_HEADER: ${USER_HEADER} | ||
networks: | ||
- dataverse | ||
privileged: false | ||
- dataverse.localhost | ||
|
||
# public access | ||
|
||
|
@@ -108,7 +89,7 @@ services: | |
networks: | ||
dataverse: | ||
aliases: | ||
- dataverse-public.localtest.me | ||
- dataverse-public.localhost | ||
|
||
networks: | ||
dataverse: | ||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
VITE_DATAVERSE_BACKEND_URL=http://oauth2-proxy.localtest.me:4180 | ||
VITE_DATAVERSE_BACKEND_URL=http://oauth2-proxy.localhost:4180 | ||
STORYBOOK_CHROMATIC_BUILD=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
VITE_DATAVERSE_BACKEND_URL=http://localhost:9000 | ||
VITE_DATAVERSE_AUTHN_URL=http://oauth2-proxy.localtest.me:4180 | ||
VITE_DATAVERSE_AUTHN_URL=http://oauth2-proxy.localhost:4180 | ||
STORYBOOK_CHROMATIC_BUILD=false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,8 +4,8 @@ | |
{ | ||
"id": "3356c0a0-d4d5-4436-9c5a-2299c71c08ec", | ||
"createdTimestamp": 1591297959169, | ||
"username": "[email protected]", | ||
"email": "admin@example.com", | ||
"username": "dataverseAdmin", | ||
"email": "dataverse@mailinator.com", | ||
"enabled": true, | ||
"totp": false, | ||
"emailVerified": true, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters