github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #946 from sharelatex/as-chrome-redirect

Browse source 
Add /chrome redirect to match v1 behaviour
This commit is contained in:
James Allen 2018-09-21 10:36:09 +01:00 committed by GitHub
commit 525aa9fd3a
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -330,6 +330,7 @@ module.exports = class Router
AuthenticationController.httpAuth, AuthenticationController.httpAuth,
CompileController.getFileFromClsiWithoutUser CompileController.getFileFromClsiWithoutUser
<<<<<<< HEAD
webRouter.get '/teams', (req, res, next) -> webRouter.get '/teams', (req, res, next) ->
# Match v1 behaviour - if the user is signed in, show their teams list # Match v1 behaviour - if the user is signed in, show their teams list
# Otherwise show some information about teams # Otherwise show some information about teams
@ -337,6 +338,14 @@ module.exports = class Router
res.redirect('/user/subscription') res.redirect('/user/subscription')
else else
res.redirect("#{settings.v1Api.host}/teams") res.redirect("#{settings.v1Api.host}/teams")
=======
webRouter.get '/chrome', (req, res, next) ->
# Match v1 behaviour - this is used for a Chrome web app
if AuthenticationController.isUserLoggedIn(req)
res.redirect('/project')
else
res.redirect('/register')
>>>>>>> Add /chrome redirect to match v1 behaviour
#Admin Stuff #Admin Stuff
webRouter.get '/admin', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.index webRouter.get '/admin', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.index