From 27a2e06d7b6a836a9a5045eb07d5665a45572089 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 31 Aug 2018 13:57:27 +0100 Subject: [PATCH] Revert "Move the new logic to the `externalAuthenticationSystemUsed` function" This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe. --- services/web/app/coffee/infrastructure/Features.coffee | 2 +- services/web/app/views/user/settings.pug | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/web/app/coffee/infrastructure/Features.coffee b/services/web/app/coffee/infrastructure/Features.coffee index c5531099d8..37f62ddec2 100644 --- a/services/web/app/coffee/infrastructure/Features.coffee +++ b/services/web/app/coffee/infrastructure/Features.coffee @@ -2,7 +2,7 @@ Settings = require 'settings-sharelatex' module.exports = Features = externalAuthenticationSystemUsed: -> - Settings.ldap? or Settings.saml? or (Settings.overleaf?.oauth? && !Settings.createV1AccountOnLogin) + Settings.ldap? or Settings.saml? or Settings.overleaf?.oauth? hasFeature: (feature) -> switch feature diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index bb66b83a44..eb2b535efb 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -148,7 +148,7 @@ block content hr - if !externalAuthenticationSystemUsed() + if !externalAuthenticationSystemUsed() || (settings.createV1AccountOnLogin && settings.overleaf) p.small | #{translate("newsletter_info_and_unsubscribe")}