diff --git a/config/prod.js b/config/prod.js index ed9203a..480bd4d 100644 --- a/config/prod.js +++ b/config/prod.js @@ -1,5 +1,6 @@ module.exports = { clientUrl: process.env.CLIENT_URL, + sessionSecret: process.env.SESSION_SECRET, oidc: { gatewayUri: process.env.OIDC_GATEWAY_URI, clientId: process.env.OIDC_CLIENT_ID, diff --git a/deployment.yaml b/deployment.yaml index 2b9d782..59346c5 100644 --- a/deployment.yaml +++ b/deployment.yaml @@ -103,11 +103,6 @@ spec: secretKeyRef: name: redis-walias-cache-owner-secrets key: REDIS_MASTER_URI - - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: redis-walias-cache-owner-secrets - key: REDIS_PASSWORD envFrom: - secretRef: name: oidc-client-walias-owner-secrets diff --git a/src/app.ts b/src/app.ts index 2971301..1cfb85f 100644 --- a/src/app.ts +++ b/src/app.ts @@ -45,7 +45,7 @@ if (getEnv() === Env.prod) { app.use( session({ store: sessionStore, - secret: randomUUID(), + secret: config.get('sessionSecret') || randomUUID(), resave: false, saveUninitialized: false, cookie: { secure: false }, diff --git a/src/services/aliases/aliases.class.ts b/src/services/aliases/aliases.class.ts index 7f427d6..ad6bf3f 100644 --- a/src/services/aliases/aliases.class.ts +++ b/src/services/aliases/aliases.class.ts @@ -126,10 +126,8 @@ export class AliasesService sanitizeAliasResponse(alias: WildDuckAddress): AliasApiResponse { // Hide the id if the alias is not removable - const isRemovable = alias.main || !alias.address.endsWith(config.get('wildDuck.preferredDomain')); - return { - id: isRemovable ? null : alias.id, + id: alias.main ? null : alias.id, address: alias.address, tags: alias.tags, created: alias.created,