OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

We don't need cookies for REST API

pull/6128/head
Chocobozzz 2023-11-30 11:08:04 +01:00
parent dbdc20e673
commit a73f476c8a
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/lib/html/shared/page-html.ts
View File

@ -4,7 +4,7 @@ import express from 'express'
import { readFile } from 'fs/promises' import { readFile } from 'fs/promises'
import { join } from 'path' import { join } from 'path'
import { logger } from '../../../helpers/logger.js' import { logger } from '../../../helpers/logger.js'
import { CUSTOM_HTML_TAG_COMMENTS, FILES_CONTENT_HASH, PLUGIN_GLOBAL_CSS_PATH, WEBSERVER } from '../../../initializers/constants.js' import { CUSTOM_HTML_TAG_COMMENTS, FILES_CONTENT_HASH, PLUGIN_GLOBAL_CSS_PATH } from '../../../initializers/constants.js'
import { ServerConfigManager } from '../../server-config-manager.js' import { ServerConfigManager } from '../../server-config-manager.js'
import { TagsHtml } from './tags-html.js' import { TagsHtml } from './tags-html.js'
import { pathExists } from 'fs-extra/esm' import { pathExists } from 'fs-extra/esm'
@ -94,7 +94,7 @@ export class PageHtml {
// Save locale in cookies // Save locale in cookies
res.cookie('clientLanguage', lang, { res.cookie('clientLanguage', lang, {
secure: WEBSERVER.SCHEME === 'https', secure: true,
sameSite: 'none', sameSite: 'none',
maxAge: 1000 * 3600 * 24 * 90 // 3 months maxAge: 1000 * 3600 * 24 * 90 // 3 months
}) })

12
server/server.ts
View File

@ -213,9 +213,6 @@ app.use(express.json({
} }
})) }))
// Cookies
app.use(cookieParser())
// W3C DNT Tracking Status // W3C DNT Tracking Status
app.use(advertiseDoNotTrack) app.use(advertiseDoNotTrack)
@ -230,9 +227,6 @@ app.use('/api/' + API_VERSION, apiRouter)
// Services (oembed...) // Services (oembed...)
app.use('/services', servicesRouter) app.use('/services', servicesRouter)
// Plugins & themes
app.use('/', pluginsRouter)
app.use('/', activityPubRouter) app.use('/', activityPubRouter)
app.use('/', feedsRouter) app.use('/', feedsRouter)
app.use('/', trackerRouter) app.use('/', trackerRouter)
@ -246,6 +240,12 @@ app.use('/', downloadRouter)
app.use('/', lazyStaticRouter) app.use('/', lazyStaticRouter)
app.use('/', objectStorageProxyRouter) app.use('/', objectStorageProxyRouter)
// Cookies for plugins and HTML
app.use(cookieParser())
// Plugins & themes
app.use('/', pluginsRouter)
// Client files, last valid routes! // Client files, last valid routes!
const cliOptions = cli.opts<{ client: boolean, plugins: boolean }>() const cliOptions = cli.opts<{ client: boolean, plugins: boolean }>()
if (cliOptions.client) app.use('/', clientsRouter) if (cliOptions.client) app.use('/', clientsRouter)