You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/11/22 21:27:24 UTC
svn commit: r1412656 - in /archiva/trunk/archiva-modules/archiva-web:
archiva-security/src/main/java/org/apache/archiva/security/
archiva-webapp-js/src/main/webapp/js/archiva/
archiva-webapp-js/src/main/webapp/js/redback/
Author: olamy
Date: Thu Nov 22 20:27:23 2012
New Revision: 1412656
URL: http://svn.apache.org/viewvc?rev=1412656&view=rev
Log:
[MRM-1717] open loginbox when url need authz.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java?rev=1412656&r1=1412655&r2=1412656&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/archiva/security/DefaultUserRepositories.java Thu Nov 22 20:27:23 2012
@@ -158,6 +158,7 @@ public class DefaultUserRepositories
}
AuthenticationResult authn = new AuthenticationResult( true, principal, null );
+ authn.setUser( user );
return new DefaultSecuritySession( authn, user );
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js?rev=1412656&r1=1412655&r2=1412656&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/startup.js Thu Nov 22 20:27:23 2012
@@ -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){
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js?rev=1412656&r1=1412655&r2=1412656&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/redback/redback.js Thu Nov 22 20:27:23 2012
@@ -35,7 +35,7 @@ define("redback",["jquery","utils","jque
/**
* 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","jque
if (successFn){
successFn(userLogged ? getUserFromLoginCookie():null);
}
+ if(!userLogged){
+ if(notLoggedFn){
+ notLoggedFn();
+ }
+ }
}
});
}