summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorBjoern Schiessle <bjoern@schiessle.org>2017-12-13 14:41:56 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2018-01-02 20:30:37 +0100
commit1bcbeb24bcb82f825d1993217cdb6878375c5077 (patch)
tree83b171423eb459f92fd0ecbf926ee09864b5996a /core
parent7fdd9097bb8cfa4a5d3afe161e1ee2a71da3a8eb (diff)
downloadnextcloud-server-1bcbeb24bcb82f825d1993217cdb6878375c5077.tar.gz
nextcloud-server-1bcbeb24bcb82f825d1993217cdb6878375c5077.zip
disable password confirmation with SSO
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Diffstat (limited to 'core')
-rw-r--r--core/js/js.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 9af80676d5e..31f415a1902 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1647,7 +1647,8 @@ OC.PasswordConfirmation = {
requiresPasswordConfirmation: function() {
var timeSinceLogin = moment.now() - (nc_lastLogin * 1000);
- return timeSinceLogin > 30 * 60 * 1000; // 30 minutes
+ // if timeSinceLogin > 30 minutes and user backend allows password confirmation
+ return (backendAllowsPasswordConfirmation && timeSinceLogin > 30 * 60 * 1000);
},
/**