diff --git a/src/oidc.js b/src/oidc.js index 47210637d..77e51857d 100644 --- a/src/oidc.js +++ b/src/oidc.js @@ -710,11 +710,11 @@ async function start() { jwksKeys.push(JSON.parse(keyRs256)); } - let cookieSecret = await settings.getCookieSecret(); + let cookieSecret = await settings.get(settings.OIDC_COOKIE_SECRET_KEY); if (!cookieSecret) { debug('Generating new cookie secret'); cookieSecret = require('crypto').randomBytes(256).toString('base64'); - await settings.setCookieSecret(cookieSecret); + await settings.set(settings.OIDC_COOKIE_SECRET_KEY, cookieSecret); } const configuration = { diff --git a/src/settings.js b/src/settings.js index f5f5f2043..7697724e9 100644 --- a/src/settings.js +++ b/src/settings.js @@ -7,9 +7,6 @@ exports = module.exports = { getTimeZone, setTimeZone, - getCookieSecret, - setCookieSecret, - getCloudronName, setCloudronName, @@ -116,7 +113,7 @@ exports = module.exports = { // strings AUTOUPDATE_PATTERN_KEY: 'autoupdate_pattern', TIME_ZONE_KEY: 'time_zone', - CLOUDRON_COOKIE_SECRET_KEY: 'cookie_secret', + OIDC_COOKIE_SECRET_KEY: 'cookie_secret', CLOUDRON_NAME_KEY: 'cloudron_name', LANGUAGE_KEY: 'language', CLOUDRON_ID_KEY: 'cloudron_id', @@ -324,19 +321,6 @@ async function getTimeZone() { return tz; } -async function getCookieSecret() { - const secret = await get(exports.CLOUDRON_COOKIE_SECRET_KEY); - return secret; -} - -async function setCookieSecret(secret) { - assert.strictEqual(typeof secret, 'string'); - - if (!secret) throw new BoxError(BoxError.BAD_FIELD, 'secret is empty'); - - await set(exports.CLOUDRON_COOKIE_SECRET_KEY, secret); -} - async function getCloudronName() { const name = await get(exports.CLOUDRON_NAME_KEY); if (name === null) return gDefaults[exports.CLOUDRON_NAME_KEY];