From 58540f15e21ac7cb54e52881b693feb175517cf4 Mon Sep 17 00:00:00 2001 From: smizrahi Date: Tue, 22 Nov 2022 17:31:59 +0100 Subject: [PATCH] feat(password-recovery): Change when secret question answer is wrong, go back to secret question instead of login --- UI/WebServerResources/js/Main.js | 2 +- UI/WebServerResources/js/Main.js.map | 2 +- UI/WebServerResources/js/Main/Main.app.js | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/UI/WebServerResources/js/Main.js b/UI/WebServerResources/js/Main.js index b1da4c3f43..cfc1039786 100644 --- a/UI/WebServerResources/js/Main.js +++ b/UI/WebServerResources/js/Main.js @@ -1,2 +1,2 @@ -!function(){"use strict";angular.module("SOGo.MainUI",["SOGo.Common","SOGo.Authentication"]);function e(e,o,s,r,a,n,i,t){var d=this;this.$onInit=function(){this.creds={username:o.cookieUsername,password:null,domain:null,rememberLogin:angular.isDefined(o.cookieUsername)&&0{d.retrievePasswordRecoveryEnabled(),this.passwordRecovery.passwordRecoveryLinkTimer=null},2e3)},this.retrievePasswordRecoveryEnabled=function(){(this.creds.username||this.creds.domain)&&n.passwordRecoveryEnabled(this.creds.username,this.creds.domain).then(function(e){d.passwordRecovery.passwordRecoveryMailDomain=e,d.passwordRecovery.passwordRecoveryEnabled=!0},function(){d.passwordRecovery.passwordRecoveryEnabled=!1})},this.changePasswordVisibility=function(){this.passwords.visible=!this.passwords.visible;var e=document.getElementById("passwordField");this.passwords.visible?(e.type="text",document.getElementById("password-visibility-icon").innerHTML="visibility_off"):(e.type="password",document.getElementById("password-visibility-icon").innerHTML="visibility")}}e.$inject=["$scope","$window","$timeout","Dialog","$mdDialog","Authentication","sgFocus","sgRippleClick"],angular.module("SOGo.MainUI").controller("LoginController",e)}(); +!function(){"use strict";angular.module("SOGo.MainUI",["SOGo.Common","SOGo.Authentication"]);function e(e,o,s,r,a,n,i,t){var d=this;this.$onInit=function(){this.creds={username:o.cookieUsername,password:null,domain:null,rememberLogin:angular.isDefined(o.cookieUsername)&&0{d.retrievePasswordRecoveryEnabled(),this.passwordRecovery.passwordRecoveryLinkTimer=null},2e3)},this.retrievePasswordRecoveryEnabled=function(){(this.creds.username||this.creds.domain)&&n.passwordRecoveryEnabled(this.creds.username,this.creds.domain).then(function(e){d.passwordRecovery.passwordRecoveryMailDomain=e,d.passwordRecovery.passwordRecoveryEnabled=!0},function(){d.passwordRecovery.passwordRecoveryEnabled=!1})},this.changePasswordVisibility=function(){this.passwords.visible=!this.passwords.visible;var e=document.getElementById("passwordField");this.passwords.visible?(e.type="text",document.getElementById("password-visibility-icon").innerHTML="visibility_off"):(e.type="password",document.getElementById("password-visibility-icon").innerHTML="visibility")}}e.$inject=["$scope","$window","$timeout","Dialog","$mdDialog","Authentication","sgFocus","sgRippleClick"],angular.module("SOGo.MainUI").controller("LoginController",e)}(); //# sourceMappingURL=Main.js.map \ No newline at end of file diff --git a/UI/WebServerResources/js/Main.js.map b/UI/WebServerResources/js/Main.js.map index f237a65bc0..f51140d35a 100644 --- a/UI/WebServerResources/js/Main.js.map +++ b/UI/WebServerResources/js/Main.js.map @@ -1 +1 @@ -{"version":3,"file":"Main.js","sources":["Main/Main.app.js"],"names":["angular","module","LoginController","$scope","$window","$timeout","Dialog","$mdDialog","Authentication","focus","rippleDo","vm","this","$onInit","creds","username","cookieUsername","password","domain","rememberLogin","isDefined","length","test","location","search","language","loginState","verificationCodePattern","passwords","newPassword","newPasswordConfirmation","oldPassword","visible","passwordRecovery","passwordRecoveryEnabled","passwordRecoveryQuestionKey","passwordRecoveryQuestion","passwordRecoveryMode","passwordRecoveryQuestionAnswer","passwordRecoveryToken","passwordRecoveryLinkTimer","passwordRecoverySecondaryEmailText","passwordRecoveryMailDomain","showLoader","showLogin","queryString","window","let","token","URLSearchParams","get","pathname","indexOf","tokenArray","replace","split","info","JSON","parse","atob","retrievePasswordRecoveryEnabled","login","then","data","totpmissingkey","totpdisabled","cn","url","continueLogin","msg","value","string","error","errorMessage","grace","l","expire","Math","round","passwordexpired","restoreLogin","verificationCode","passwordRecoveryAbort","href","reload","showAbout","$event","AboutDialogController","closeDialog","hide","show","targetEvent","templateUrl","controller","controllerAs","$inject","changeLanguage","ApplicationBaseURL","hello","form","canChangePassword","$setValidity","isInPasswordRecoveryMode","changePassword","passwordRecoveryInfo","mode","secretQuestionLabel","secretQuestion","obfuscatedRecoveryEmail","passwordRecoveryEmail","passwordRecoveryCheck","usernameChanged","clearTimeout","setTimeout","mailDomain","changePasswordVisibility","field","document","getElementById","type","innerHTML"],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Main.js","sources":["Main/Main.app.js"],"names":["angular","module","LoginController","$scope","$window","$timeout","Dialog","$mdDialog","Authentication","focus","rippleDo","vm","this","$onInit","creds","username","cookieUsername","password","domain","rememberLogin","isDefined","length","test","location","search","language","loginState","verificationCodePattern","passwords","newPassword","newPasswordConfirmation","oldPassword","visible","passwordRecovery","passwordRecoveryEnabled","passwordRecoveryQuestionKey","passwordRecoveryQuestion","passwordRecoveryMode","passwordRecoveryQuestionAnswer","passwordRecoveryToken","passwordRecoveryLinkTimer","passwordRecoverySecondaryEmailText","passwordRecoveryMailDomain","showLoader","showLogin","queryString","window","let","token","URLSearchParams","get","pathname","indexOf","tokenArray","replace","split","info","JSON","parse","atob","retrievePasswordRecoveryEnabled","login","then","data","totpmissingkey","totpdisabled","cn","url","continueLogin","msg","value","string","error","errorMessage","grace","l","expire","Math","round","passwordexpired","restoreLogin","passwordRecoveryInfo","verificationCode","passwordRecoveryAbort","href","reload","showAbout","$event","AboutDialogController","closeDialog","hide","show","targetEvent","templateUrl","controller","controllerAs","$inject","changeLanguage","ApplicationBaseURL","hello","form","canChangePassword","$setValidity","isInPasswordRecoveryMode","changePassword","mode","secretQuestionLabel","secretQuestion","obfuscatedRecoveryEmail","passwordRecoveryEmail","passwordRecoveryCheck","usernameChanged","clearTimeout","setTimeout","mailDomain","changePasswordVisibility","field","document","getElementById","type","innerHTML"],"mappings":"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"} \ No newline at end of file diff --git a/UI/WebServerResources/js/Main/Main.app.js b/UI/WebServerResources/js/Main/Main.app.js index 81f1845bf8..3978a346c2 100644 --- a/UI/WebServerResources/js/Main/Main.app.js +++ b/UI/WebServerResources/js/Main/Main.app.js @@ -152,9 +152,14 @@ }; this.restoreLogin = function() { - vm.loginState = false; - delete vm.creds.verificationCode; - vm.passwordRecoveryAbort(); + vm.showLogin = false; + if ('SecretQuestion' === vm.passwordRecovery.passwordRecoveryMode) { + rippleDo('loginContent'); + vm.passwordRecoveryInfo(); + } else { + delete vm.creds.verificationCode; + vm.passwordRecoveryAbort(); + } }; this.continueLogin = function() {