Explorar el Código

Revert "Move the new logic to the `externalAuthenticationSystemUsed` function"

This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.
Shane Kilkelly hace 8 años
padre
commit
27a2e06d7b

+ 1 - 1
services/web/app/coffee/infrastructure/Features.coffee

@@ -2,7 +2,7 @@ Settings = require 'settings-sharelatex'
 
 
 module.exports = Features =
 module.exports = Features =
 	externalAuthenticationSystemUsed: ->
 	externalAuthenticationSystemUsed: ->
-		Settings.ldap? or Settings.saml? or (Settings.overleaf?.oauth? && !Settings.createV1AccountOnLogin)
+		Settings.ldap? or Settings.saml? or Settings.overleaf?.oauth?
 
 
 	hasFeature: (feature) ->
 	hasFeature: (feature) ->
 		switch feature
 		switch feature

+ 1 - 1
services/web/app/views/user/settings.pug

@@ -148,7 +148,7 @@ block content
 
 
 							hr
 							hr
 
 
-							if !externalAuthenticationSystemUsed()
+							if !externalAuthenticationSystemUsed() || (settings.createV1AccountOnLogin && settings.overleaf)
 
 
 								p.small
 								p.small
 									| #{translate("newsletter_info_and_unsubscribe")} 
 									| #{translate("newsletter_info_and_unsubscribe")}