Skip to content

Commit

Permalink
We don't need cookies for REST API
Browse files Browse the repository at this point in the history
  • Loading branch information
Chocobozzz committed Dec 20, 2023
1 parent dbdc20e commit a73f476
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions server/core/lib/html/shared/page-html.ts
Expand Up @@ -4,7 +4,7 @@ import express from 'express'
import { readFile } from 'fs/promises'
import { join } from 'path'
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 { TagsHtml } from './tags-html.js'
import { pathExists } from 'fs-extra/esm'
Expand Down Expand Up @@ -94,7 +94,7 @@ export class PageHtml {

// Save locale in cookies
res.cookie('clientLanguage', lang, {
secure: WEBSERVER.SCHEME === 'https',
secure: true,
sameSite: 'none',
maxAge: 1000 * 3600 * 24 * 90 // 3 months
})
Expand Down
12 changes: 6 additions & 6 deletions server/server.ts
Expand Up @@ -213,9 +213,6 @@ app.use(express.json({
}
}))

// Cookies
app.use(cookieParser())

// W3C DNT Tracking Status
app.use(advertiseDoNotTrack)

Expand All @@ -230,9 +227,6 @@ app.use('/api/' + API_VERSION, apiRouter)
// Services (oembed...)
app.use('/services', servicesRouter)

// Plugins & themes
app.use('/', pluginsRouter)

app.use('/', activityPubRouter)
app.use('/', feedsRouter)
app.use('/', trackerRouter)
Expand All @@ -246,6 +240,12 @@ app.use('/', downloadRouter)
app.use('/', lazyStaticRouter)
app.use('/', objectStorageProxyRouter)

// Cookies for plugins and HTML
app.use(cookieParser())

// Plugins & themes
app.use('/', pluginsRouter)

// Client files, last valid routes!
const cliOptions = cli.opts<{ client: boolean, plugins: boolean }>()
if (cliOptions.client) app.use('/', clientsRouter)
Expand Down

0 comments on commit a73f476

Please sign in to comment.