From 84ab0dc97ebe0863a19c84f794c765fa0b9ec99e Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 4 Jun 2025 17:19:00 +0200 Subject: [PATCH] refactor(OC): migrate request token handling to Typescript Signed-off-by: Ferdinand Thiessen --- core/src/OC/eventsource.js | 2 +- core/src/OC/index.js | 2 +- core/src/OC/{requesttoken.js => requesttoken.ts} | 0 core/src/globals.js | 2 +- core/src/jquery/requesttoken.js | 2 +- core/src/session-heartbeat.js | 2 +- core/src/tests/OC/requesttoken.spec.js | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename core/src/OC/{requesttoken.js => requesttoken.ts} (100%) diff --git a/core/src/OC/eventsource.js b/core/src/OC/eventsource.js index bdafa364beb..bfda0a73ad0 100644 --- a/core/src/OC/eventsource.js +++ b/core/src/OC/eventsource.js @@ -7,7 +7,7 @@ /* eslint-disable */ import $ from 'jquery' -import { getToken } from './requesttoken.js' +import { getToken } from './requesttoken.ts' /** * Create a new event source diff --git a/core/src/OC/index.js b/core/src/OC/index.js index eff3289308a..8c0c788ada4 100644 --- a/core/src/OC/index.js +++ b/core/src/OC/index.js @@ -51,7 +51,7 @@ import { } from './host.js' import { getToken as getRequestToken, -} from './requesttoken.js' +} from './requesttoken.ts' import { hideMenus, registerMenu, diff --git a/core/src/OC/requesttoken.js b/core/src/OC/requesttoken.ts similarity index 100% rename from core/src/OC/requesttoken.js rename to core/src/OC/requesttoken.ts diff --git a/core/src/globals.js b/core/src/globals.js index 8511b699563..1c6debd6667 100644 --- a/core/src/globals.js +++ b/core/src/globals.js @@ -29,7 +29,7 @@ import 'strengthify/strengthify.css' import OC from './OC/index.js' import OCP from './OCP/index.js' import OCA from './OCA/index.js' -import { getToken as getRequestToken } from './OC/requesttoken.js' +import { getToken as getRequestToken } from './OC/requesttoken.ts' const warnIfNotTesting = function() { if (window.TESTING === undefined) { diff --git a/core/src/jquery/requesttoken.js b/core/src/jquery/requesttoken.js index c2868e2728a..a678a44d6b2 100644 --- a/core/src/jquery/requesttoken.js +++ b/core/src/jquery/requesttoken.js @@ -5,7 +5,7 @@ import $ from 'jquery' -import { getToken } from '../OC/requesttoken.js' +import { getToken } from '../OC/requesttoken.ts' $(document).on('ajaxSend', function(elm, xhr, settings) { if (settings.crossDomain === false) { diff --git a/core/src/session-heartbeat.js b/core/src/session-heartbeat.js index 3bd4d6b9ccd..5ae2e8192a5 100644 --- a/core/src/session-heartbeat.js +++ b/core/src/session-heartbeat.js @@ -10,7 +10,7 @@ import { getCurrentUser } from '@nextcloud/auth' import { generateUrl } from '@nextcloud/router' import OC from './OC/index.js' -import { setToken as setRequestToken, getToken as getRequestToken } from './OC/requesttoken.js' +import { setToken as setRequestToken, getToken as getRequestToken } from './OC/requesttoken.ts' let config = null /** diff --git a/core/src/tests/OC/requesttoken.spec.js b/core/src/tests/OC/requesttoken.spec.js index 36833742d14..c379f6ee507 100644 --- a/core/src/tests/OC/requesttoken.spec.js +++ b/core/src/tests/OC/requesttoken.spec.js @@ -4,7 +4,7 @@ */ import { beforeEach, describe, expect, test, vi } from 'vitest' -import { manageToken, setToken } from '../../OC/requesttoken.js' +import { manageToken, setToken } from '../../OC/requesttoken.ts' const eventbus = vi.hoisted(() => ({ emit: vi.fn() })) vi.mock('@nextcloud/event-bus', () => eventbus)