diff --git a/documentation/examples/helm/impress.values.yaml b/documentation/examples/helm/impress.values.yaml index 05c8c2fed..a6d26dab5 100644 --- a/documentation/examples/helm/impress.values.yaml +++ b/documentation/examples/helm/impress.values.yaml @@ -134,7 +134,6 @@ yProvider: COLLABORATION_BACKEND_BASE_URL: https://docs.127.0.0.1.nip.io COLLABORATION_LOGGING: true COLLABORATION_SERVER_ORIGIN: https://docs.127.0.0.1.nip.io - COLLABORATION_SERVER_SECRET: my-secret ingress: enabled: true diff --git a/documentation/installation/compose.md b/documentation/installation/compose.md index 014f6e5a1..baf976e6b 100644 --- a/documentation/installation/compose.md +++ b/documentation/installation/compose.md @@ -93,7 +93,7 @@ If you are using an external service, you need to set `REDIS_URL` environment va The Y provider service enables collaboration through websockets. -Generates a secure key for `Y_PROVIDER_API_KEY` and `COLLABORATION_SERVER_SECRET` in ``env.d/yprovider``. +Generates a secure key for `Y_PROVIDER_API_KEY` in ``env.d/yprovider``. ### Docs diff --git a/env.d/development/common b/env.d/development/common index 60072b5fd..7a294177d 100644 --- a/env.d/development/common +++ b/env.d/development/common @@ -79,7 +79,6 @@ USER_RECONCILIATION_FORM_URL=http://localhost:3000 # Collaboration COLLABORATION_BACKEND_BASE_URL=http://app-dev:8000 COLLABORATION_SERVER_ORIGIN=http://localhost:3000 -COLLABORATION_SERVER_SECRET=my-secret COLLABORATION_WS_URL=ws://localhost:3002/collaboration/ws/v1/docs COLLABORATION_WS_INACTIVITY_TIMEOUT=15 # Seconds diff --git a/env.d/production.dist/yprovider b/env.d/production.dist/yprovider index 5761d7ae2..401cf4016 100644 --- a/env.d/production.dist/yprovider +++ b/env.d/production.dist/yprovider @@ -1,6 +1,5 @@ Y_PROVIDER_API_BASE_URL=http://${YPROVIDER_HOST}:4444/api/ Y_PROVIDER_API_KEY= -COLLABORATION_SERVER_SECRET= COLLABORATION_SERVER_ORIGIN=https://${DOCS_HOST} COLLABORATION_BACKEND_BASE_URL=https://${DOCS_HOST} COLLABORATION_LOGGING=true \ No newline at end of file diff --git a/src/frontend/servers/y-provider/src/env.ts b/src/frontend/servers/y-provider/src/env.ts index 564c72927..7c607aad9 100644 --- a/src/frontend/servers/y-provider/src/env.ts +++ b/src/frontend/servers/y-provider/src/env.ts @@ -1,23 +1,13 @@ -import { readFileSync } from 'fs'; - export const COLLABORATION_BACKEND_BASE_URL = process.env.COLLABORATION_BACKEND_BASE_URL || 'http://app-dev:8000'; export const COLLABORATION_LOGGING = process.env.COLLABORATION_LOGGING || 'false'; export const COLLABORATION_SERVER_ORIGIN = process.env.COLLABORATION_SERVER_ORIGIN || 'http://localhost:3000'; -// TODO(yhub): unused since the yhub migration, mirrors the Django setting of -// the same name (see impress/settings.py). Kept until CollaborationService is -// reinstated. -export const COLLABORATION_SERVER_SECRET = process.env - .COLLABORATION_SERVER_SECRET_FILE - ? readFileSync(process.env.COLLABORATION_SERVER_SECRET_FILE, 'utf-8') - : process.env.COLLABORATION_SERVER_SECRET || 'secret-api-key'; export const CONVERSION_FILE_MAX_SIZE = process.env.CONVERSION_FILE_MAX_SIZE ? Number(process.env.CONVERSION_FILE_MAX_SIZE) : 20971520; // 20 MB default // JWKS of the Django backend, used to verify the JWT it signs when calling us. -export const JWKS_URL = - process.env.JWKS_URL || `${COLLABORATION_BACKEND_BASE_URL}/api/v1.0/jwks`; +export const JWKS_URL = `${COLLABORATION_BACKEND_BASE_URL}/api/v1.0/jwks`; export const PORT = Number(process.env.PORT || 4444); export const SENTRY_DSN = process.env.SENTRY_DSN || ''; diff --git a/src/helm/env.d/dev/values.impress.yaml.gotmpl b/src/helm/env.d/dev/values.impress.yaml.gotmpl index 056d5a30e..35130a086 100644 --- a/src/helm/env.d/dev/values.impress.yaml.gotmpl +++ b/src/helm/env.d/dev/values.impress.yaml.gotmpl @@ -169,7 +169,6 @@ yProvider: COLLABORATION_BACKEND_BASE_URL: https://docs.127.0.0.1.nip.io COLLABORATION_LOGGING: true COLLABORATION_SERVER_ORIGIN: https://docs.127.0.0.1.nip.io - COLLABORATION_SERVER_SECRET: my-secret NODE_EXTRA_CA_CERTS: /cert/cacert.pem # Extra volume mounts to manage our local custom CA and avoid to set ssl_verify: false diff --git a/src/helm/env.d/feature/values.impress.yaml.gotmpl b/src/helm/env.d/feature/values.impress.yaml.gotmpl index 422d9bce6..4ea4e8e6c 100644 --- a/src/helm/env.d/feature/values.impress.yaml.gotmpl +++ b/src/helm/env.d/feature/values.impress.yaml.gotmpl @@ -147,7 +147,6 @@ yProvider: COLLABORATION_BACKEND_BASE_URL: https://{{ .Values.feature }}-docs.{{ .Values.domain }} COLLABORATION_LOGGING: true COLLABORATION_SERVER_ORIGIN: https://{{ .Values.feature }}-docs.{{ .Values.domain }} - COLLABORATION_SERVER_SECRET: my-secret NODE_OPTIONS: "--max-old-space-size=1024" docSpec: