github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

add public api router

Browse source
This commit is contained in:
Brian Gough 2017-07-05 14:32:55 +01:00
parent 3e8ad69f3c
commit 29b40ad824
4 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
services/web/app/coffee/infrastructure/ExpressLocals.coffee
View file

@ -66,7 +66,7 @@ logger.log "Finished generating file fingerprints"
cdnAvailable = Settings.cdn?.web?.host? cdnAvailable = Settings.cdn?.web?.host?
darkCdnAvailable = Settings.cdn?.web?.darkHost? darkCdnAvailable = Settings.cdn?.web?.darkHost?
module.exports = (app, webRouter, apiRouter)-> module.exports = (app, webRouter, privateApiRouter, publicApiRouter)->
webRouter.use (req, res, next)-> webRouter.use (req, res, next)->
res.locals.session = req.session res.locals.session = req.session
next() next()
@ -82,7 +82,8 @@ module.exports = (app, webRouter, apiRouter)->
) )
next() next()
webRouter.use addSetContentDisposition webRouter.use addSetContentDisposition
apiRouter.use addSetContentDisposition privateApiRouter.use addSetContentDisposition
publicApiRouter.use addSetContentDisposition
webRouter.use (req, res, next)-> webRouter.use (req, res, next)->
req.externalAuthenticationSystemUsed = res.locals.externalAuthenticationSystemUsed = -> req.externalAuthenticationSystemUsed = res.locals.externalAuthenticationSystemUsed = ->

10
services/web/app/coffee/infrastructure/Modules.coffee
View file

@ -15,14 +15,14 @@ module.exports = Modules =
@modules.push loadedModule @modules.push loadedModule
Modules.attachHooks() Modules.attachHooks()
applyRouter: (webRouter, apiRouter) -> applyRouter: (webRouter, apiRouter, publicApiRouter) ->
for module in @modules for module in @modules
module.router?.apply?(webRouter, apiRouter) module.router?.apply?(webRouter, apiRouter, publicApiRouter)
applyNonCsrfRouter: (webRouter, apiRouter) -> applyNonCsrfRouter: (webRouter, apiRouter, publicApiRouter) ->
for module in @modules for module in @modules
module.nonCsrfRouter?.apply(webRouter, apiRouter) module.nonCsrfRouter?.apply(webRouter, apiRouter, publicApiRouter)
module.router?.applyNonCsrfRouter?(webRouter, apiRouter) module.router?.applyNonCsrfRouter?(webRouter, apiRouter, publicApiRouter)
viewIncludes: {} viewIncludes: {}
loadViewIncludes: (app) -> loadViewIncludes: (app) ->

14
services/web/app/coffee/infrastructure/Server.coffee
View file

@ -52,7 +52,8 @@ else
app = express() app = express()
webRouter = express.Router() webRouter = express.Router()
apiRouter = express.Router() privateApiRouter = express.Router()
publicApiRouter = express.Router()
if Settings.behindProxy if Settings.behindProxy
app.enable('trust proxy') app.enable('trust proxy')
@ -108,7 +109,7 @@ Modules.hooks.fire 'passportSetup', passport, (err) ->
if err? if err?
logger.err {err}, "error setting up passport in modules" logger.err {err}, "error setting up passport in modules"
Modules.applyNonCsrfRouter(webRouter, apiRouter) Modules.applyNonCsrfRouter(webRouter, privateApiRouter, publicApiRouter)
webRouter.use csrfProtection webRouter.use csrfProtection
webRouter.use translations.expressMiddlewear webRouter.use translations.expressMiddlewear
@ -122,7 +123,7 @@ webRouter.use (req, res, next) ->
next() next()
webRouter.use ReferalConnect.use webRouter.use ReferalConnect.use
expressLocals(app, webRouter, apiRouter) expressLocals(app, webRouter, privateApiRouter, publicApiRouter)
if app.get('env') == 'production' if app.get('env') == 'production'
logger.info "Production Enviroment" logger.info "Production Enviroment"
@ -143,7 +144,7 @@ webRouter.use (req, res, next) ->
res.render("general/closed", {title:"maintenance"}) res.render("general/closed", {title:"maintenance"})
profiler = require "v8-profiler" profiler = require "v8-profiler"
apiRouter.get "/profile", (req, res) -> privateApiRouter.get "/profile", (req, res) ->
time = parseInt(req.query.time || "1000") time = parseInt(req.query.time || "1000")
profiler.startProfiling("test") profiler.startProfiling("test")
setTimeout () -> setTimeout () ->
@ -165,16 +166,17 @@ notDefined = (x) -> !x?
enableApiRouter = Settings.web?.enableApiRouter enableApiRouter = Settings.web?.enableApiRouter
if enableApiRouter or notDefined(enableApiRouter) if enableApiRouter or notDefined(enableApiRouter)
logger.info("providing api router"); logger.info("providing api router");
app.use(apiRouter) app.use(privateApiRouter)
app.use(ErrorController.handleApiError) app.use(ErrorController.handleApiError)
enableWebRouter = Settings.web?.enableWebRouter enableWebRouter = Settings.web?.enableWebRouter
if enableWebRouter or notDefined(enableWebRouter) if enableWebRouter or notDefined(enableWebRouter)
logger.info("providing web router"); logger.info("providing web router");
app.use(publicApiRouter) # public API goes with web router for public access
app.use(webRouter) app.use(webRouter)
app.use(ErrorController.handleError) app.use(ErrorController.handleError)
router = new Router(webRouter, apiRouter) router = new Router(webRouter, privateApiRouter, publicApiRouter)
module.exports = module.exports =
app: app app: app

4
services/web/app/coffee/router.coffee
View file

@ -49,7 +49,7 @@ logger = require("logger-sharelatex")
_ = require("underscore") _ = require("underscore")
module.exports = class Router module.exports = class Router
constructor: (webRouter, apiRouter)-> constructor: (webRouter, apiRouter, publicApiRouter)->
if !Settings.allowPublicAccess if !Settings.allowPublicAccess
webRouter.all '*', AuthenticationController.requireGlobalLogin webRouter.all '*', AuthenticationController.requireGlobalLogin
@ -77,7 +77,7 @@ module.exports = class Router
ContactRouter.apply(webRouter, apiRouter) ContactRouter.apply(webRouter, apiRouter)
AnalyticsRouter.apply(webRouter, apiRouter) AnalyticsRouter.apply(webRouter, apiRouter)
Modules.applyRouter(webRouter, apiRouter) Modules.applyRouter(webRouter, apiRouter, publicApiRouter)
if Settings.enableSubscriptions if Settings.enableSubscriptions