alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update paths

Browse Source 
GitOrigin-RevId: a9474c8f36e8b287de4dd8fda29bc082001444ac
This commit is contained in:
Andrew Rumble
2025-10-23 08:06:10 +00:00
committed by Copybot
parent 0d73904c4b
commit f02f6475ac
110 changed files with 261 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/modules/launchpad/app/src/LaunchpadController.mjs
+5 -6
View File
@@ -2,18 +2,17 @@ import OError from '@overleaf/o-error'
import { expressify } from '@overleaf/promise-utils'
import Settings from '@overleaf/settings'
import Path from 'node:path'
import { fileURLToPath } from 'node:url'
import logger from '@overleaf/logger'
import UserRegistrationHandler from '../../../../app/src/Features/User/UserRegistrationHandler.mjs'
import EmailHandler from '../../../../app/src/Features/Email/EmailHandler.js'
import UserGetter from '../../../../app/src/Features/User/UserGetter.js'
import { User } from '../../../../app/src/models/User.js'
import AuthenticationManager from '../../../../app/src/Features/Authentication/AuthenticationManager.js'
import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.mjs'
import SessionManager from '../../../../app/src/Features/Authentication/SessionManager.js'
import { hasAdminAccess } from '../../../../app/src/Features/Helpers/AdminAuthorizationHelper.js'
import AdminAuthorizationHelper from '../../../../app/src/Features/Helpers/AdminAuthorizationHelper.mjs'
const __dirname = fileURLToPath(new URL('.', import.meta.url))
const { hasAdminAccess } = AdminAuthorizationHelper
/**
* Container for functions that need to be mocked in tests
@@ -53,7 +52,7 @@ async function launchpadPage(req, res) {
if (!sessionUser) {
if (!adminUserExists) {
res.render(Path.resolve(__dirname, '../views/launchpad'), {
res.render(Path.resolve(import.meta.dirname, '../views/launchpad'), {
adminUserExists,
authMethod,
})
@@ -66,7 +65,7 @@ async function launchpadPage(req, res) {
isAdmin: 1,
})
if (hasAdminAccess(user)) {
res.render(Path.resolve(__dirname, '../views/launchpad'), {
res.render(Path.resolve(import.meta.dirname, '../views/launchpad'), {
wsUrl: Settings.wsUrl,
adminUserExists,
authMethod,
services/web/modules/launchpad/app/src/LaunchpadRouter.mjs
+1 -1
View File
@@ -1,7 +1,7 @@
import logger from '@overleaf/logger'
import LaunchpadController from './LaunchpadController.mjs'
import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.js'
import AuthenticationController from '../../../../app/src/Features/Authentication/AuthenticationController.mjs'
import AuthorizationMiddleware from '../../../../app/src/Features/Authorization/AuthorizationMiddleware.mjs'
export default {
services/web/modules/launchpad/test/unit/src/LaunchpadController.test.mjs
+1 -1
View File
@@ -57,7 +57,7 @@ describe('LaunchpadController', function () {
}))
vi.doMock(
'../../../../../app/src/Features/Authentication/AuthenticationController.js',
'../../../../../app/src/Features/Authentication/AuthenticationController.mjs',
() => ({
default: (ctx.AuthenticationController = {}),
})