refactor(front): use runtimeConfig instead of env

ezpaarse-project · Nov 5, 2021 · 92f3be9 · 92f3be9
1 parent 2ffb6d0
commit 92f3be9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -103,11 +103,11 @@ services:
       args:
         - http_proxy
         - https_proxy
-        - EZMESURE_DISABLE_SHIBBOLETH
     ports:
       - 8080:8080
     environment:
       - API_URL=https://${EZMESURE_DOMAIN}/api
+      - EZMESURE_DISABLE_SHIBBOLETH
       - PORT=8080
       - HOST=0.0.0.0
     restart: unless-stopped

diff --git a/front/Dockerfile b/front/Dockerfile
@@ -8,7 +8,6 @@ COPY package.json /usr/src/app/
 RUN npm install && npm cache clean --force
 COPY . /usr/src/app
 
-ARG EZMESURE_DISABLE_SHIBBOLETH
 RUN npm run build
 
 ENTRYPOINT ["npm", "start"]
diff --git a/front/components/space/Menu.vue b/front/components/space/Menu.vue
@@ -80,7 +80,7 @@
           block
           color="red lighten-2"
           dark
-          href="/Shibboleth.sso/Logout?return=/logout"
+          :href="logoutUrl"
           v-text="$t('menu.logout')"
         />
       </div>
@@ -97,6 +97,9 @@ export default {
     };
   },
   computed: {
+    logoutUrl() {
+      return this.$config.shibbolethEnabled ? '/Shibboleth.sso/Logout?return=/logout' : '/logout';
+    },
     links() {
       return [
         { title: this.$t('menu.profile'), href: '/myspace' },

diff --git a/front/nuxt.config.js b/front/nuxt.config.js
@@ -22,6 +22,7 @@ module.exports = {
   ],
   ssr: false,
   telemetry: false,
+  publicRuntimeConfig: {
     shibbolethEnabled: !process.env.EZMESURE_DISABLE_SHIBBOLETH,
   },
   modules: [

diff --git a/front/pages/myspace.vue b/front/pages/myspace.vue
@@ -89,9 +89,8 @@ export default {
   components: {
     ToolBar,
   },
-  asyncData({ env }) {
+  data() {
     return {
-      logoutUrl: env.shibbolethEnabled ? '/Shibboleth.sso/Logout?return=/logout' : '/logout',
       selectedFiles: [],
       token: '',
     };