X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.mvc%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fmvc%2FArgeoUserInterceptor.java;h=a9be56d380581f0e6140aad6f5c0647cad9a2cf3;hb=149023e5969377045847bbecf24b0898b18a67a9;hp=74e97a53a27b470a696bf95d36b6d79f059c24ef;hpb=79d37fb873ba8ebaafe64c924f53bc9c76ea6d8c;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java
index 74e97a53a..a9be56d38 100644
--- a/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java
+++ b/security/runtime/org.argeo.security.mvc/src/main/java/org/argeo/security/mvc/ArgeoUserInterceptor.java
@@ -1,24 +1,39 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package org.argeo.security.mvc;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.argeo.security.ArgeoSecurityService;
+import org.argeo.security.UserAdminService;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 /** Add the current argeo user as an attribute to the request. */
 public class ArgeoUserInterceptor extends HandlerInterceptorAdapter {
-	private ArgeoSecurityService securityService;
+	private UserAdminService securityService;
 
 	@Override
 	public boolean preHandle(HttpServletRequest request,
 			HttpServletResponse response, Object handler) throws Exception {
-		request.setAttribute("argeoUser", securityService.getSecurityDao()
-				.getCurrentUser());
+		//request.setAttribute("argeoUser", securityService.getCurrentUser());
 		return super.preHandle(request, response, handler);
 	}
 
-	public void setSecurityService(ArgeoSecurityService securityService) {
+	public void setSecurityService(UserAdminService securityService) {
 		this.securityService = securityService;
 	}