[Yanel-commits] rev 55533 - public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared

[michi at wyona.com]

Author: michi
Date: 2010-12-16 08:08:15 +0100 (Thu, 16 Dec 2010)
New Revision: 55533

Modified:
   public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared/SharedResource.java
Log:
use yanel servlet for getting identity

Modified: public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared/SharedResource.java
===================================================================
--- public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared/SharedResource.java	2010-12-16 07:03:26 UTC (rev 55532)
+++ public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared/SharedResource.java	2010-12-16 07:08:15 UTC (rev 55533)
@@ -235,7 +235,12 @@
     public String login(String username, String password, Realm realm, HttpSession session) throws Exception {
         // INFO: Yanel authentication 
         // (Also see src/webapp/src/java/org/wyona/yanel/servlet/security/impl/DefaultWebAuthenticatorImpl.java)
-        String currentYanelUserId = DefaultWebAuthenticatorImpl.getCurrentUserId(session, realm);
+        String currentYanelUserId = null;
+        org.wyona.security.core.api.Identity identity = YanelServlet.getIdentity(session, realm);
+        if (identity != null) {
+            currentYanelUserId = identity.getUsername();
+        }
+        //String currentYanelUserId = DefaultWebAuthenticatorImpl.getCurrentUserId(session, realm);
         if(currentYanelUserId == null) {
             if(DefaultWebAuthenticatorImpl.authenticate(username, password, realm, session)) {
                 log.info("Yanel authentication successful for user: " + username);