diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2018-01-03 11:48:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-03 11:48:45 +0100 |
| commit | 02b092f35830b916c4fc61413600f5ca86d1630a (patch) | |
| tree | a5cfd5abfc70236ff0d1cfe68ba23b401d47e21c /core/js | |
| parent | 86d33cf50ffff86a6641ab113bce6801802f19cb (diff) | |
| parent | 57050146f686d724a9c7ac2c099a6e8b8d591b76 (diff) | |
| download | nextcloud-server-02b092f35830b916c4fc61413600f5ca86d1630a.tar.gz nextcloud-server-02b092f35830b916c4fc61413600f5ca86d1630a.zip | |
Merge pull request #7487 from nextcloud/no-password-confirm-with-sso
disable password confirmation with SSO
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index a9180663405..0b28310c728 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1682,7 +1682,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); }, /** |