diff --git a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml index 8cd3fcfbad06e52252ed2fcaf5f434508dd18564..c80feb0c782fb61b57e83bf53d4750fcaff076c1 100644 --- a/SAS/TMSS/docker/tmss-testenv/docker-compose.yml +++ b/SAS/TMSS/docker/tmss-testenv/docker-compose.yml @@ -6,13 +6,13 @@ services: dockerfile: tmss_testenv_Dockerfile container_name: tmss_test ports: - - "8000:8000" - - "3000:3000" + - "8008:8000" + - "3003:3000" tmss_test_nginx: build: context: . dockerfile: tmss_nginx_Dockerfile container_name: tmss_test_nginx ports: - - "5000:5000" + - "5005:5000" diff --git a/SAS/TMSS/docker/tmss-testenv/nginx.conf b/SAS/TMSS/docker/tmss-testenv/nginx.conf index 6d54bdddd0f7db8dc5d77101840c7453ee637d41..e8f412387f528deab0c0ddff3fbdd0f7cb9d34ff 100644 --- a/SAS/TMSS/docker/tmss-testenv/nginx.conf +++ b/SAS/TMSS/docker/tmss-testenv/nginx.conf @@ -18,26 +18,26 @@ http { } location @api_proxy { - proxy_pass http://tmss_test:8000$uri; + proxy_pass http://tmss_test:8008$uri; proxy_intercept_errors on; recursive_error_pages on; error_page 404 = @frontend_proxy; } location @frontend_proxy { - proxy_pass http://tmss_test:3000$uri; + proxy_pass http://tmss_test:3003$uri; } location /api/ { - proxy_pass http://tmss_test:8000; + proxy_pass http://tmss_test:8008; } location /frontend/ { - proxy_pass http://tmss_test:3000; + proxy_pass http://tmss_test:3003; } location /openid/ { - proxy_pass http://tmss_test:8000/openid; + proxy_pass http://tmss_test:8008/openid; } } diff --git a/SAS/TMSS/src/tmss/settings.py b/SAS/TMSS/src/tmss/settings.py index 61cbfd79808507221ec9f9e69c2393ef5bf2c31b..a734abb34c175c2bcdc7f872045cbd95cf1e6ad0 100644 --- a/SAS/TMSS/src/tmss/settings.py +++ b/SAS/TMSS/src/tmss/settings.py @@ -236,9 +236,9 @@ OIDC_DRF_AUTH_BACKEND = 'mozilla_django_oidc.auth.OIDCAuthenticationBackend' # For talking to Mozilla Identity Provider: OIDC_RP_CLIENT_ID = os.environ.get('OIDC_RP_CLIENT_ID', '1') # Secret, do not put real credentials on Git OIDC_RP_CLIENT_SECRET = os.environ.get('OIDC_RP_CLIENT_SECRET', 'secret') # Secret, do not put real credentials on Git -OIDC_OP_AUTHORIZATION_ENDPOINT="http://localhost:8080/openid/authorize" -OIDC_OP_TOKEN_ENDPOINT="http://localhost:8080/openid/token" -OIDC_OP_USER_ENDPOINT="http://localhost:8080/openid/userinfo" +OIDC_OP_AUTHORIZATION_ENDPOINT="http://localhost:8088/openid/authorize" +OIDC_OP_TOKEN_ENDPOINT="http://localhost:8088/openid/token" +OIDC_OP_USER_ENDPOINT="http://localhost:8088/openid/userinfo" LOGIN_REDIRECT_URL = "/api/" LOGIN_REDIRECT_URL_FAILURE = "/api/" diff --git a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/fixtures.json b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/fixtures.json index 19e122b27225b28db84a2d7f3b6b68bb34294a5d..dac97597a95ca242ea219d97ed4e287c22075c5d 100644 --- a/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/fixtures.json +++ b/SAS/TMSS/test/oidc/docker-test-mozilla-django-oidc/testprovider/fixtures.json @@ -72,7 +72,7 @@ "logo": "", "reuse_consent": true, "require_consent": true, - "_redirect_uris": "http://localhost:8000/oidc/callback/", + "_redirect_uris": ["http://localhost:5000/oidc/callback/", "http://localhost:5005/oidc/callback/", "http://localhost:8000/oidc/callback/" ,"http://localhost:8008/oidc/callback/"], "_post_logout_redirect_uris": "", "_scope": "", "response_types": [ @@ -97,7 +97,7 @@ "logo": "", "reuse_consent": true, "require_consent": true, - "_redirect_uris": "http://localhost:8000/oidc/callback/", + "_redirect_uris": ["http://localhost:5000/oidc/callback/", "http://localhost:5005/oidc/callback/", "http://localhost:8000/oidc/callback/" ,"http://localhost:8008/oidc/callback/"], "_post_logout_redirect_uris": "", "_scope": "", "response_types": [