[Yanel-commits] rev 55864 - 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: 2011-01-06 12:03:21 +0100 (Thu, 06 Jan 2011)
New Revision: 55864

Modified:
   public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared/SharedResource.java
Log:
getCurrentUserId not necessary anymore

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	2011-01-06 10:40:16 UTC (rev 55863)
+++ public/yanel/contributions/realms/konakart-yanel-realm/res-types/shared/src/java/org/wyona/yanel/resources/konakart/shared/SharedResource.java	2011-01-06 11:03:21 UTC (rev 55864)
@@ -234,15 +234,13 @@
      */
     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 = 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)) {
+            if(DefaultWebAuthenticatorImpl.authenticate(username, password, realm, session)) { // TODO: replace by getRealm().getWebAuthenticator().doAuthenticate() ...
                 log.info("Yanel authentication successful for user: " + username);
             } else {
                 log.warn("Yanel authentication failed for user: " + username);