- Merge JAAS configs

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / auth / HttpSessionLoginModule.java

diff --git a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
index be8a693baa2c9a6da376fc11c929e2defa1b2995..19f6ee0c6f792748c9c8310623778f1d5aabc4f4 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
+++ b/org.argeo.cms/src/org/argeo/cms/auth/HttpSessionLoginModule.java
@@ -101,20 +101,26 @@ public class HttpSessionLoginModule implements LoginModule {
 
        @Override
        public boolean commit() throws LoginException {
-               // TODO create CmsSession in another module
-               Authorization authorizationToRegister;
-               if (authorization == null) {
-                       authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
-               } else { // this login module did the authorization
+               if(authorization!=null){
                        CmsAuthUtils.addAuthentication(subject, authorization);
-                       authorizationToRegister = authorization;
-               }
-               if (authorizationToRegister == null) {
-                       return false;
+                       CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorization);
                }
-               if (request == null)
-                       return false;
-               CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister);
+               
+               // TODO create CmsSession in another module
+//             Authorization authorizationToRegister;
+//             if (authorization == null) {
+//                     authorizationToRegister = (Authorization) sharedState.get(CmsAuthUtils.SHARED_STATE_AUTHORIZATION);
+//             }
+//             else { // this login module did the authorization
+//                     CmsAuthUtils.addAuthentication(subject, authorization);
+//                     authorizationToRegister = authorization;
+//             }
+//             if (authorizationToRegister == null) {
+//                     return false;
+//             }
+//             if (request == null)
+//                     return false;
+//             CmsAuthUtils.registerSessionAuthorization(bc, request, subject, authorizationToRegister);
 
                byte[] outToken = (byte[]) sharedState.get(CmsAuthUtils.SHARED_STATE_SPNEGO_OUT_TOKEN);
                if (outToken != null) {