Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-21 09:24:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix auto login after account validation and password change

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1212608 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2011-12-09 20:10:36 +00:00
parent 0f21921750
commit 2bd399b978
2 changed files with 70 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archiva-modules/archiva-web/archiva-webapp-js/TODO.TXT Normal file
View File

@ -0,0 +1,8 @@
ui pages to do in js:
* Redback:
** user roles list/edition/assignment (Repository Manager and Repository Observer: per repo for user)
** roles list
** single roles read (parent, childs, permissions, users with a parent role, users with this role)
* too much for archiva :-)

115
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/user.js
View File

@ -211,6 +211,57 @@ $(function() {
$("#modal-login").focus();
}
var successLoginCallbackFn=function(result){
var logged = false;
if (result == null) {
logged = false;
} else {
if (result.user) {
logged = true;
}
}
$.log("successLoginCallbackFn, logged:"+logged);
if (logged == true) {
var user = mapUser(result.user);
$.log("user.passwordChangeRequired:"+user.passwordChangeRequired());
if (user.passwordChangeRequired()==true){
changePasswordBox(true,false,user);
return;
}
// not really needed as an exception is returned but "ceintures et bretelles" as we said in French :-)
if (user.locked()==true){
$.log("user locked");
displayErrorMessage($.i18n.prop("accout.locked"));
return
}
// FIXME check validated
reccordLoginCookie(user);
$("#login-link").hide();
$("#logout-link").show();
$("#register-link").hide();
$("#change-password-link").show();
if (window.modalLoginWindow){
window.modalLoginWindow.modal('hide');
}
clearForm("#user-login-form");
decorateMenuWithKarma(user);
return;
}
$("#modal-login-err-message").html($.i18n.prop("incorrect.username.password"));
$("#modal-login-err-message").show();
}
var errorLoginCallbackFn= function(result) {
var obj = jQuery.parseJSON(result.responseText);
displayRedbackError(obj,"modal-login-err-message");
$("#modal-login-err-message").show();
}
var completeLoginCallbackFn=function(){
$("#modal-login-ok").removeAttr("disabled");
$("#login-spinner").remove();
}
login=function(){
$("#modal-login-err-message").html("");
screenChange();
@ -226,56 +277,8 @@ $(function() {
var url = 'restServices/redbackServices/loginService/logIn?userName='+$("#user-login-form-username").val();
url += "&password="+$("#user-login-form-password").val();
var successCallbackFn=function(result){
var logged = false;
if (result == null) {
logged = false;
} else {
if (result.user) {
logged = true;
}
}
if (logged == true) {
var user = mapUser(result.user);
$.log("user.passwordChangeRequired:"+user.passwordChangeRequired());
if (user.passwordChangeRequired()==true){
changePasswordBox(true,false,user);
return;
}
// not really needed as an exception is returned but "ceintures et bretelles" as we said in French :-)
if (user.locked()==true){
$.log("user locked");
displayErrorMessage($.i18n.prop("accout.locked"));
return
}
// FIXME check validated
reccordLoginCookie(user);
$("#login-link").hide();
$("#logout-link").show();
$("#register-link").hide();
$("#change-password-link").show();
window.modalLoginWindow.modal('hide');
clearForm("#user-login-form");
decorateMenuWithKarma(user);
return;
}
$("#modal-login-err-message").html($.i18n.prop("incorrect.username.password"));
$("#modal-login-err-message").show();
}
var errorCallbackFn= function(result) {
var obj = jQuery.parseJSON(result.responseText);
displayRedbackError(obj,"modal-login-err-message");
$("#modal-login-err-message").show();
}
var completeCallbackFn=function(){
$("#modal-login-ok").removeAttr("disabled");
$("#login-spinner").remove();
}
loginCall($("#user-login-form-username").val(),$("#user-login-form-password").val()
,successCallbackFn,errorCallbackFn,completeCallbackFn);
,successLoginCallbackFn,errorLoginCallbackFn,completeLoginCallbackFn);
@ -439,14 +442,20 @@ $(function() {
$.ajax({
url: url,
success: function(result){
var ok = JSON.parse(result);
if (ok == true) {
$.log("changePassword#success result:"+result);
var user = mapUser(result.user);
if (user) {
window.modalChangePasswordBox.modal('hide');
displaySuccessMessage($.i18n.prop('change.password.success.section.title'));
$.log("changePassword#sucess,registration:"+registration);
if (registration==true) {
displaySuccessMessage($.i18n.prop('change.password.success.section.title'))
loginCall(user.username(), $("#passwordChangeFormNewPassword").val(),successLoginCallbackFn);
} else {
displaySuccessMessage($.i18n.prop('change.password.success.section.title'));
}
} else {
displayErrorMessage("issue appended");
}
// menu etc....
},
complete: function(){