Merge pull request #52003 from nextcloud/backport/51524/stable31

[stable31] fix: adjust webpack nonce generation

Author: susnux

apps/files_sharing/src/additionalScripts.js

@@ -2,13 +2,14 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { getCSPNonce } from '@nextcloud/auth'
 
 import './share.js'
 import './sharebreadcrumbview.js'
 import './style/sharebreadcrumb.scss'
 import './collaborationresourceshandler.js'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 window.OCA.Sharing = OCA.Sharing

apps/files_sharing/src/collaborationresourceshandler.js

@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { getCSPNonce } from '@nextcloud/auth'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 window.OCP.Collaboration.registerType('file', {
 	action: () => {

apps/settings/src/main-admin-ai.js

@@ -2,13 +2,13 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
+import { getCSPNonce } from '@nextcloud/auth'
 import Vue from 'vue'
 
 import ArtificialIntelligence from './components/AdminAI.vue'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 

apps/settings/src/main-admin-security.js

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
+import { getCSPNonce } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import Vue from 'vue'
 
@@ -11,7 +11,7 @@ import EncryptionSettings from './components/Encryption/EncryptionSettings.vue'
 import store from './store/admin-security.js'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 

apps/settings/src/main-personal-password.js

@@ -2,14 +2,14 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { getCSPNonce } from '@nextcloud/auth'
+import { t, n } from '@nextcloud/l10n'
 
 import Vue from 'vue'
-
 import PasswordSection from './components/PasswordSection.vue'
-import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 Vue.prototype.n = n

apps/settings/src/main-personal-webauth.js

@@ -2,14 +2,14 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
-import Vue from 'vue'
+import { getCSPNonce } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
+import Vue from 'vue'
 
 import WebAuthnSection from './components/WebAuthn/Section.vue'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 

dist/core-common.js

@@ -1,17 +1,32 @@
 SPDX-License-Identifier: MIT
+SPDX-License-Identifier: ISC
 SPDX-License-Identifier: GPL-3.0-or-later
 SPDX-License-Identifier: AGPL-3.0-or-later
 SPDX-FileCopyrightText: escape-html developers
 SPDX-FileCopyrightText: Tobias Koppers @sokra
+SPDX-FileCopyrightText: Roman Shtylman <[email protected]>
 SPDX-FileCopyrightText: Roeland Jago Douma
 SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: GitHub Inc.
 SPDX-FileCopyrightText: Christoph Wurst
 
 
 This file is generated from multiple sources. Included packages:
+- @nextcloud/auth
+	- version: 2.4.0
+	- license: GPL-3.0-or-later
+- @nextcloud/browser-storage
+	- version: 0.4.0
+	- license: GPL-3.0-or-later
 - @nextcloud/capabilities
 	- version: 1.2.0
 	- license: GPL-3.0-or-later
+- semver
+	- version: 7.6.3
+	- license: ISC
+- @nextcloud/event-bus
+	- version: 3.3.2
+	- license: GPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0
 	- license: GPL-3.0-or-later
@@ -24,6 +39,9 @@ This file is generated from multiple sources. Included packages:
 - escape-html
 	- version: 1.0.3
 	- license: MIT
+- process
+	- version: 0.11.10
+	- license: MIT
 - style-loader
 	- version: 4.0.0
 	- license: MIT