github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-23 13:13:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

[web] Fix Null Pointer Error in WikiController in SP (#13393)

Browse source 
* [web] Fix NPE in WikiController

This error prevents the wiki from retrieving
page content in Server Pro

* [web] add `settings.proxyLearn` to SaaS config

GitOrigin-RevId: d137097e08720e8423133a7f59e2fe619fe134be
This commit is contained in:
Miguel Serrano 2023-06-27 13:38:30 +02:00 committed by Copybot
parent efdc2dfca4
commit 78314a0ee0
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/web/app/views/project/editor/meta.pug
View file

@ -9,7 +9,7 @@ meta(name="ol-anonymousAccessToken" content=anonymousAccessToken)
meta(name="ol-isTokenMember" data-type="boolean" content=isTokenMember) meta(name="ol-isTokenMember" data-type="boolean" content=isTokenMember)
meta(name="ol-isRestrictedTokenMember" data-type="boolean" content=isRestrictedTokenMember) meta(name="ol-isRestrictedTokenMember" data-type="boolean" content=isRestrictedTokenMember)
meta(name="ol-maxDocLength" data-type="json" content=maxDocLength) meta(name="ol-maxDocLength" data-type="json" content=maxDocLength)
meta(name="ol-wikiEnabled" data-type="boolean" content=!!(settings.apis.wiki && settings.apis.wiki.url)) meta(name="ol-wikiEnabled" data-type="boolean" content=settings.proxyLearn)
meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl) meta(name="ol-gitBridgePublicBaseUrl" content=gitBridgePublicBaseUrl)
meta(name="ol-compilesUserContentDomain" content=settings.compilesUserContentDomain) meta(name="ol-compilesUserContentDomain" content=settings.compilesUserContentDomain)
meta(name="ol-fallbackCompileDomain" content=settings.pdfDownloadDomain) meta(name="ol-fallbackCompileDomain" content=settings.pdfDownloadDomain)

4
services/web/config/settings.defaults.js
View file

@ -218,6 +218,10 @@ module.exports = {
webpack: { webpack: {
url: `http://${process.env.WEBPACK_HOST || 'localhost'}:3808`, url: `http://${process.env.WEBPACK_HOST || 'localhost'}:3808`,
}, },
wiki: {
url: process.env.WIKI_URL || 'https://learn.sharelatex.com',
maxCacheAge: parseInt(process.env.WIKI_MAX_CACHE_AGE || 5 * minutes, 10),
},
haveIBeenPwned: { haveIBeenPwned: {
enabled: process.env.HAVE_I_BEEN_PWNED_ENABLED === 'true', enabled: process.env.HAVE_I_BEEN_PWNED_ENABLED === 'true',

6
services/web/test/acceptance/config/settings.test.server-pro.js
View file

@ -2,7 +2,11 @@ const { merge } = require('@overleaf/settings/merge')
const baseApp = require('../../../config/settings.overrides.server-pro') const baseApp = require('../../../config/settings.overrides.server-pro')
const baseTest = require('./settings.test.defaults') const baseTest = require('./settings.test.defaults')
module.exports = baseApp.mergeWith(baseTest.mergeWith({})) module.exports = baseApp.mergeWith(
baseTest.mergeWith({
proxyLearn: true,
})
)
module.exports.mergeWith = function (overrides) { module.exports.mergeWith = function (overrides) {
return merge(overrides, module.exports) return merge(overrides, module.exports)