Bläddra i källkod

WIP: enable sudo-mode for v2

Shane Kilkelly 8 år sedan
förälder
incheckning
254d74899b

+ 2 - 1
services/web/app/coffee/Features/SudoMode/SudoModeController.coffee

@@ -4,12 +4,13 @@ AuthenticationController = require '../Authentication/AuthenticationController'
 AuthenticationManager = require '../Authentication/AuthenticationManager'
 ObjectId = require('../../infrastructure/Mongoose').mongo.ObjectId
 UserGetter = require '../User/UserGetter'
+Settings = require 'settings-sharelatex'
 
 
 module.exports = SudoModeController =
 
 	sudoModePrompt: (req, res, next) ->
-		if req.externalAuthenticationSystemUsed()
+		if req.externalAuthenticationSystemUsed() and !Settings.overleaf?
 			logger.log {userId}, "[SudoMode] using external auth, redirecting"
 			return res.redirect('/project')
 		userId = AuthenticationController.getLoggedInUserId(req)

+ 2 - 1
services/web/app/coffee/Features/SudoMode/SudoModeMiddlewear.coffee

@@ -1,12 +1,13 @@
 logger = require 'logger-sharelatex'
 SudoModeHandler = require './SudoModeHandler'
 AuthenticationController = require '../Authentication/AuthenticationController'
+Settings = require 'settings-sharelatex'
 
 
 module.exports = SudoModeMiddlewear =
 
 	protectPage: (req, res, next) ->
-		if req.externalAuthenticationSystemUsed()
+		if req.externalAuthenticationSystemUsed() and !Settings.overleaf?
 			logger.log {userId}, "[SudoMode] using external auth, skipping sudo-mode check"
 			return next()
 		userId = AuthenticationController.getLoggedInUserId(req)

+ 3 - 0
services/web/app/views/sudo_mode/sudo_mode_prompt.pug

@@ -43,3 +43,6 @@ block content
 										p.text-centered
 											small
 												| #{translate('confirm_password_footer')}
+
+										p.text-centered
+											small #[a(href='/user/password/reset' target="_blank") Set or reset password]