diff --git a/ckan-backend-dev/.env.example b/ckan-backend-dev/.env.example index 4e9acc9f..cfcaeb49 100644 --- a/ckan-backend-dev/.env.example +++ b/ckan-backend-dev/.env.example @@ -146,9 +146,9 @@ S3_BUCKET_NAME=ckan S3_BUCKET_REGION=us-east-1 SYS_ADMIN_API_KEY=CKAN_API_TOKEN RW_API_KEY=ffffffff-ffff-ffff-ffff-ffffffffffff -#AZURE_AD_CLIENT_ID=ffffffff-ffff-ffff-ffff-ffffffffffff -#AZURE_AD_CLIENT_SECRET=ffffffff-ffff-ffff-ffff-ffffffffffff -#AZURE_AD_TENANT_ID=ffffffff-ffff-ffff-ffff-ffffffffffff +AZURE_AD_CLIENT_ID=ffffffff-ffff-ffff-ffff-ffffffffffff +AZURE_AD_CLIENT_SECRET=ffffffff-ffff-ffff-ffff-ffffffffffff +AZURE_AD_TENANT_ID=ffffffff-ffff-ffff-ffff-ffffffffffff SYS_ADMIN_API_KEY=CKAN_API_TOKEN SMTP_SERVER="smtp.ssss.com" SMTP_PORT="587" diff --git a/ckan-backend-dev/docker-compose.test.yml b/ckan-backend-dev/docker-compose.test.yml index 9f453b3b..1653d000 100755 --- a/ckan-backend-dev/docker-compose.test.yml +++ b/ckan-backend-dev/docker-compose.test.yml @@ -56,9 +56,9 @@ services: - S3_BUCKET_NAME=ckan - S3_BUCKET_REGION=us-east-1 - RW_API_KEY=${RW_API_KEY} - #- AZURE_AD_TENANT_ID=${AZURE_AD_TENANT_ID} - #- AZURE_AD_CLIENT_ID=${AZURE_AD_CLIENT_ID} - #- AZURE_AD_CLIENT_SECRET=${AZURE_AD_CLIENT_SECRET} + - AZURE_AD_TENANT_ID=${AZURE_AD_TENANT_ID} + - AZURE_AD_CLIENT_ID=${AZURE_AD_CLIENT_ID} + - AZURE_AD_CLIENT_SECRET=${AZURE_AD_CLIENT_SECRET} - SYS_ADMIN_API_KEY=${SYS_ADMIN_API_KEY} - SMTP_SERVER=${SMTP_SERVER} - SMTP_PORT=${SMTP_PORT} diff --git a/deployment/frontend/.env.example b/deployment/frontend/.env.example index 50ac05c9..f020cc6f 100644 --- a/deployment/frontend/.env.example +++ b/deployment/frontend/.env.example @@ -31,9 +31,9 @@ S3_BUCKET_REGION="us-east-1" # LOCAL SYS_ADMIN_API_KEY="1111" -#AZURE_AD_CLIENT_ID="ffffffff-ffff-ffff-ffff-ffffffffffff" -#AZURE_AD_CLIENT_SECRET="ffffffff-ffff-ffff-ffff-ffffffffffff" -#AZURE_AD_TENANT_ID="ffffffff-ffff-ffff-ffff-ffffffffffff" +AZURE_AD_CLIENT_ID="ffffffff-ffff-ffff-ffff-ffffffffffff" +AZURE_AD_CLIENT_SECRET="ffffffff-ffff-ffff-ffff-ffffffffffff" +AZURE_AD_TENANT_ID="ffffffff-ffff-ffff-ffff-ffffffffffff" OKTA_CLIENT_ID="ffffffff-ffff-ffff-ffff-ffffffffffff" OKTA_CLIENT_SECRET="ffffffff-ffff-ffff-ffff-ffffffffffff" OKTA_ISSUER="https://example-123456.okta.com/oauth2/default" diff --git a/deployment/frontend/Dockerfile b/deployment/frontend/Dockerfile index a978f001..ee97f842 100644 --- a/deployment/frontend/Dockerfile +++ b/deployment/frontend/Dockerfile @@ -15,9 +15,9 @@ ARG CKAN_URL ARG NEXT_PUBLIC_CKAN_URL ARG NEXT_PUBLIC_NEXTAUTH_URL ARG NEXT_PUBLIC_GTM_ID -#ARG AZURE_AD_CLIENT_ID -#ARG AZURE_AD_CLIENT_SECRET -#ARG AZURE_AD_TENANT_ID +ARG AZURE_AD_CLIENT_ID +ARG AZURE_AD_CLIENT_SECRET +ARG AZURE_AD_TENANT_ID ARG RW_API_KEY ARG NEXT_PUBLIC_DISABLE_HOTJAR ARG NEXT_PUBLIC_HOTJAR_ID diff --git a/deployment/frontend/src/components/_shared/Login.tsx b/deployment/frontend/src/components/_shared/Login.tsx index 5531b3fa..6bddbabf 100644 --- a/deployment/frontend/src/components/_shared/Login.tsx +++ b/deployment/frontend/src/components/_shared/Login.tsx @@ -198,7 +198,7 @@ function SignInForm({