fix: Update for 5 minute tutorial (#1704)

ory · Feb 1, 2020 · aeecfe1 · aeecfe1
1 parent d3eac25
commit aeecfe1
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/quickstart-jwt.yml b/quickstart-jwt.yml
@@ -17,4 +17,4 @@ services:
   hydra:
     environment:
       - OAUTH2_ACCESS_TOKEN_STRATEGY=jwt
-      - OIDC_SUBJECT_IDENTIFIERS_ENABLED=public
+      - OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public
diff --git a/quickstart.yml b/quickstart.yml
@@ -29,14 +29,14 @@ services:
       - URLS_LOGOUT=http://127.0.0.1:3000/logout
       - DSN=memory
       - SECRETS_SYSTEM=youReallyNeedToChangeThis
-      - OIDC_SUBJECT_TYPES_SUPPORTED=public,pairwise
-      - OIDC_SUBJECT_TYPE_PAIRWISE_SALT=youReallyNeedToChangeThis
+      - OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public,pairwise
+      - OIDC_SUBJECT_IDENTIFIERS_PAIRWISE_SALT=youReallyNeedToChangeThis
     restart: unless-stopped
 
   consent:
     environment:
       - HYDRA_ADMIN_URL=http://hydra:4445
-    image: oryd/hydra-login-consent-node:v1.0.0-rc.10
+    image: oryd/hydra-login-consent-node:v1.1.1
     ports:
       - "3000:3000"
     restart: unless-stopped
diff --git a/scripts/5min-tutorial.sh b/scripts/5min-tutorial.sh
@@ -2,20 +2,20 @@
 
 DB=${DB:-postgres}
 TRACING=${TRACING:-false}
-TWOC=${TWOC:-false}
+PROMETHEUS=${PROMETHEUS:-false}
 
-DC="docker-compose -f docker-compose.yml"
+DC="docker-compose -f quickstart.yml"
 if [[ $DB == "mysql" ]]; then
-    DC+=" -f docker-compose-mysql.yml"
+    DC+=" -f quickstart-mysql.yml"
 fi
 if [[ $DB == "postgres" ]]; then
-    DC+=" -f docker-compose-postgres.yml"
+    DC+=" -f quickstart-postgres.yml"
 fi
 if [[ $TRACING == true ]]; then
-    DC+=" -f docker-compose-tracing.yml"
+    DC+=" -f quickstart-tracing.yml"
 fi
-if [[ $TWOC == true ]]; then
-    DC+=" -f docker-compose-twoc.yml"
+if [[ $PROMETHEUS == true ]]; then
+    DC+=" -f quickstart-prometheus.yml"
 fi
 DC+=" up --build"
 

diff --git a/test/e2e/circle-ci.bash b/test/e2e/circle-ci.bash
@@ -36,7 +36,7 @@ case "$1" in
         memory-jwt)
             DSN=memory \
                 OAUTH2_ACCESS_TOKEN_STRATEGY=jwt \
-                OIDC_SUBJECT_IDENTIFIERS_ENABLED=public \
+                OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public \
                 ./hydra serve all --dangerous-force-http --disable-telemetry >> ./hydra.e2e.log 2>&1 &
             export CYPRESS_jwt_enabled=true
             ;;
@@ -52,7 +52,7 @@ case "$1" in
             hydra migrate sql --yes $TEST_DATABASE_POSTGRESQL
             DSN=$TEST_DATABASE_POSTGRESQL \
                 OAUTH2_ACCESS_TOKEN_STRATEGY=jwt \
-                OIDC_SUBJECT_IDENTIFIERS_ENABLED=public \
+                OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public \
                 ./hydra serve all --dangerous-force-http --disable-telemetry >> ./hydra.e2e.log 2>&1 &
             export CYPRESS_jwt_enabled=true
             ;;
@@ -68,7 +68,7 @@ case "$1" in
             hydra migrate sql --yes $TEST_DATABASE_MYSQL
             DSN=$TEST_DATABASE_MYSQL \
                 OAUTH2_ACCESS_TOKEN_STRATEGY=jwt \
-                OIDC_SUBJECT_IDENTIFIERS_ENABLED=public \
+                OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public \
                 ./hydra serve all --dangerous-force-http --disable-telemetry >> ./hydra.e2e.log 2>&1 &
             export CYPRESS_jwt_enabled=true
             ;;
@@ -84,7 +84,7 @@ case "$1" in
             hydra migrate sql --yes $TEST_DATABASE_COCKROACHDB
             DSN=$TEST_DATABASE_COCKROACHDB \
                 OAUTH2_ACCESS_TOKEN_STRATEGY=jwt \
-                OIDC_SUBJECT_IDENTIFIERS_ENABLED=public \
+                OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public \
                 ./hydra serve all --dangerous-force-http --disable-telemetry >> ./hydra.e2e.log 2>&1 &
             export CYPRESS_jwt_enabled=true
             ;;
@@ -98,7 +98,7 @@ case "$1" in
         plugin-jwt)
             DSN=plugin://./memtest.so \
                 OAUTH2_ACCESS_TOKEN_STRATEGY=jwt \
-                OIDC_SUBJECT_IDENTIFIERS_ENABLED=public \
+                OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public \
                 ./hydra serve all --dangerous-force-http --disable-telemetry >> ./hydra.e2e.log 2>&1 &
             export CYPRESS_jwt_enabled=true
             ;;

diff --git a/test/e2e/circle-ci.env.bash b/test/e2e/circle-ci.env.bash
@@ -5,8 +5,8 @@ export URLS_CONSENT=http://127.0.0.1:5002/consent
 export URLS_LOGIN=http://127.0.0.1:5002/login
 export URLS_LOGOUT=http://127.0.0.1:5002/logout
 export SECRETS_SYSTEM=youReallyNeedToChangeThis
-export OIDC_SUBJECT_TYPES_SUPPORTED=public,pairwise
-export OIDC_SUBJECT_TYPE_PAIRWISE_SALT=youReallyNeedToChangeThis
+export OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public,pairwise
+export OIDC_SUBJECT_IDENTIFIERS_PAIRWISE_SALT=youReallyNeedToChangeThis
 export SERVE_PUBLIC_CORS_ENABLED=true
 export SERVE_PUBLIC_CORS_ALLOWED_METHODS=POST,GET,PUT,DELETE
 export SERVE_ADMIN_CORS_ENABLED=true

diff --git a/test/e2e/docker-compose.jwt.yml b/test/e2e/docker-compose.jwt.yml
@@ -17,4 +17,4 @@ services:
   hydra:
     environment:
       - OAUTH2_ACCESS_TOKEN_STRATEGY=jwt
-      - OIDC_SUBJECT_IDENTIFIERS_ENABLED=public
+      - OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public
diff --git a/test/e2e/docker-compose.yml b/test/e2e/docker-compose.yml
@@ -18,8 +18,8 @@ services:
       - URLS_LOGOUT=http://127.0.0.1:5002/logout
       - DSN=memory
       - SECRETS_SYSTEM=youReallyNeedToChangeThis
-      - OIDC_SUBJECT_TYPES_SUPPORTED=public,pairwise
-      - OIDC_SUBJECT_TYPE_PAIRWISE_SALT=youReallyNeedToChangeThis
+      - OIDC_SUBJECT_IDENTIFIERS_SUPPORTED_TYPES=public,pairwise
+      - OIDC_SUBJECT_IDENTIFIERS_PAIRWISE_SALT=youReallyNeedToChangeThis
       - SERVE_PUBLIC_CORS_ENABLED=true
       - SERVE_PUBLIC_CORS_ALLOWED_METHODS=POST,GET,PUT,DELETE
       - SERVE_ADMIN_CORS_ENABLED=true