mirror of https://github.com/apache/archiva.git
[MRM-1717] open loginbox when url need authz.
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1412656 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
0fe1b39cf5
commit
a18362e7f4
|
@ -158,6 +158,7 @@ public class DefaultUserRepositories
|
|||
}
|
||||
|
||||
AuthenticationResult authn = new AuthenticationResult( true, principal, null );
|
||||
authn.setUser( user );
|
||||
return new DefaultSecuritySession( authn, user );
|
||||
}
|
||||
|
||||
|
|
|
@ -25,6 +25,8 @@ function(jquery,sammy,utils) {
|
|||
|
||||
//$.log("devMode:"+window.archivaDevMode);
|
||||
|
||||
|
||||
|
||||
// no cache for ajax queries as we get datas from servers so preventing caching !!
|
||||
jQuery.ajaxSetup( {
|
||||
cache: false,//!window.archivaDevMode
|
||||
|
@ -37,6 +39,9 @@ function(jquery,sammy,utils) {
|
|||
displayErrorMessage($.i18n.prop('authz.karma.needed'));
|
||||
userLogged(function(user){
|
||||
userLoggedCallbackFn(user);
|
||||
},function(){
|
||||
$.log("not logged");
|
||||
loginBox();
|
||||
});
|
||||
},
|
||||
500: function(data){
|
||||
|
|
|
@ -35,7 +35,7 @@ define("redback",["jquery","utils","jquery.validate","jquery.json","knockout",
|
|||
/**
|
||||
* call successFn on success with passing user object coming from cookie
|
||||
*/
|
||||
userLogged=function(successFn) {
|
||||
userLogged=function(successFn,notLoggedFn) {
|
||||
// call restServices/redbackServices/loginService/isLogged to know
|
||||
// if a session exists and check the cookie
|
||||
$.log("userLogged");
|
||||
|
@ -48,6 +48,11 @@ define("redback",["jquery","utils","jquery.validate","jquery.json","knockout",
|
|||
if (successFn){
|
||||
successFn(userLogged ? getUserFromLoginCookie():null);
|
||||
}
|
||||
if(!userLogged){
|
||||
if(notLoggedFn){
|
||||
notLoggedFn();
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue