From 1bcbeb24bcb82f825d1993217cdb6878375c5077 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <bjoern@schiessle.org>
Date: Wed, 13 Dec 2017 14:41:56 +0100
Subject: disable password confirmation with SSO

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
---
 core/js/js.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/js')

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);
 	},
 
 	/**
-- 
cgit v1.2.3