From 543e197a408365bc05e66b3bc35014ceceaaa103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 14 Aug 2023 16:24:28 +0200 Subject: [PATCH] fix: Use shared init file to properly set nonce for async component loading MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- src/main.js | 3 +-- src/shared-init.js | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main.js b/src/main.js index 9840e5f8a..271633b97 100644 --- a/src/main.js +++ b/src/main.js @@ -25,12 +25,11 @@ import Collectives from './Collectives.vue' import router from './router.js' import store from './store/store.js' import { sync } from 'vuex-router-sync' -import { generateFilePath } from '@nextcloud/router' /** Global directives */ import VTooltip from '@nextcloud/vue/dist/Directives/Tooltip.js' -__webpack_public_path__ = generateFilePath('collectives', '', 'js/') // eslint-disable-line +import './shared-init.js' // Register global directives Vue.directive('Tooltip', VTooltip) diff --git a/src/shared-init.js b/src/shared-init.js index fc3d1bc23..a3f73bff0 100644 --- a/src/shared-init.js +++ b/src/shared-init.js @@ -1,9 +1,12 @@ +import { getRequestToken } from '@nextcloud/auth' +import { generateFilePath } from '@nextcloud/router' + // eslint-disable-next-line -__webpack_nonce__ = btoa(OC.requestToken) +__webpack_nonce__ = btoa(getRequestToken()) if (!process.env.WEBPACK_SERVE) { // eslint-disable-next-line - __webpack_public_path__ = OC.linkTo('collectives', 'js/') + __webpack_public_path__ = generateFilePath('collectives', '', 'js/') } else { // eslint-disable-next-line __webpack_public_path__ = 'http://127.0.0.1:3000/'