From 1facef7746d22a64e329ce08045b5804904e46b3 Mon Sep 17 00:00:00 2001 From: Jana Peper Date: Thu, 22 May 2025 12:16:26 +0200 Subject: [PATCH 1/2] chore: update csp nonce Signed-off-by: Jana Peper --- src/dashboard.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dashboard.js b/src/dashboard.js index 3cc1b705..442d22d1 100644 --- a/src/dashboard.js +++ b/src/dashboard.js @@ -10,9 +10,9 @@ */ import { linkTo } from '@nextcloud/router' -import { getRequestToken } from '@nextcloud/auth' +import { getCSPNonce } from '@nextcloud/auth' -__webpack_nonce__ = btoa(getRequestToken()) // eslint-disable-line +__webpack_nonce__ = getCSPNonce() // eslint-disable-line __webpack_public_path__ = linkTo('integration_mattermost', 'js/') // eslint-disable-line document.addEventListener('DOMContentLoaded', () => { From b97a5fb8a53d0eacf7bcbe85b42bdadc1e12b567 Mon Sep 17 00:00:00 2001 From: Jana Peper Date: Thu, 22 May 2025 13:08:34 +0200 Subject: [PATCH 2/2] chore: update cs workflow Signed-off-by: Jana Peper --- .github/workflows/lint-php-cs.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index 51083488..ef99150c 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -25,16 +25,18 @@ jobs: steps: - name: Checkout - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + with: + persist-credentials: false - name: Get php version id: versions uses: icewind1991/nextcloud-version-matrix@58becf3b4bb6dc6cef677b15e2fd8e7d48c0908f # v1.3.1 - - name: Set up php${{ steps.versions.outputs.php-available }} - uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 + - name: Set up php${{ steps.versions.outputs.php-min }} + uses: shivammathur/setup-php@cf4cade2721270509d5b1c766ab3549210a39a2a # v2.33.0 with: - php-version: ${{ steps.versions.outputs.php-available }} + php-version: ${{ steps.versions.outputs.php-min }} extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite coverage: none ini-file: development @@ -42,7 +44,9 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Install dependencies - run: composer i + run: | + composer remove nextcloud/ocp --dev --no-scripts + composer i - name: Lint - run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) + run: composer run cs:check || ( echo 'Please run `composer run cs:fix` to format your code' && exit 1 ) \ No newline at end of file