diff --git a/backend/src/config/index.js b/backend/src/config/index.js index b6b8a837e..b7d500b8b 100644 --- a/backend/src/config/index.js +++ b/backend/src/config/index.js @@ -82,8 +82,8 @@ const options = { SUPPORT_URL: links.SUPPORT, APPLICATION_NAME: metadata.APPLICATION_NAME, ORGANIZATION_URL: links.ORGANIZATION, - PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true', // because env booleans are given as string in differenz to the webapp - INVITE_REGISTRATION: env.INVITE_REGISTRATION === 'true', // because env booleans are given as string in differenz to the webapp + PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true' || false, + INVITE_REGISTRATION: env.INVITE_REGISTRATION !== 'false', // default = true } // Check if all required configs are present diff --git a/webapp/config/index.js b/webapp/config/index.js index 3a5e42284..5fc9e093f 100644 --- a/webapp/config/index.js +++ b/webapp/config/index.js @@ -29,8 +29,8 @@ const sentry = { const options = { VERSION: process.env.VERSION || pkg.version, DESCRIPTION: process.env.DESCRIPTION || pkg.description, - PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION, // because env booleans are given as booleans and not as strings in differenz to the backend - INVITE_REGISTRATION: process.env.INVITE_REGISTRATION, // because env booleans are given as booleans and not as strings in differenz to the backend + PUBLIC_REGISTRATION: process.env.PUBLIC_REGISTRATION === 'true' || false, + INVITE_REGISTRATION: process.env.INVITE_REGISTRATION !== 'false', // default = true // Cookies COOKIE_EXPIRE_TIME: process.env.COOKIE_EXPIRE_TIME || 730, // Two years by default COOKIE_HTTPS_ONLY: process.env.COOKIE_HTTPS_ONLY || process.env.NODE_ENV === 'production', // ensure true in production if not set explicitly diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js index d918dc0b4..1d38a3a0a 100644 --- a/webapp/nuxt.config.js +++ b/webapp/nuxt.config.js @@ -27,7 +27,7 @@ export default { }, env: { - release: CONFIG.VERSION, + ...CONFIG, // pages which do NOT require a login publicPages: [ 'login', diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue index abdf48376..3502f65b5 100644 --- a/webapp/pages/registration.vue +++ b/webapp/pages/registration.vue @@ -25,16 +25,14 @@ export default { nonce, }, }, + publicRegistration: this.$env.PUBLIC_REGISTRATION === 'true', // for 'false' in .env PUBLIC_REGISTRATION is of type undefined and not(!) boolean false, because of internal handling + inviteRegistration: this.$env.INVITE_REGISTRATION === 'true', // for 'false' in .env INVITE_REGISTRATION is of type undefined and not(!) boolean false, because of internal handling } }, - asyncData({ app, store, redirect }) { + asyncData({ store, redirect }) { if (store.getters['auth/isLoggedIn']) { redirect('/') } - return { - publicRegistration: app.$env.PUBLIC_REGISTRATION, - inviteRegistration: app.$env.INVITE_REGISTRATION, - } }, computed: { registrationType() {