Allow custom behavior in oidc-derivative id providers #205

Author: rymsha

src/main/java/com/enonic/app/oidcidprovider/PortalRequestBean.java

@@ -6,8 +6,6 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
-import jakarta.servlet.http.HttpSession;
-
 import com.enonic.app.oidcidprovider.mapper.ContextMapper;
 import com.enonic.xp.portal.PortalRequest;
 import com.enonic.xp.script.bean.BeanContext;
@@ -19,13 +17,13 @@
 public class PortalRequestBean
     implements ScriptBean
 {
-    private static final String AUTO_LOGIN_FAILED_ATTRIBUTE = PortalRequestBean.class.getName() + ".autoLoginFailed";
+    private static final Lock LOCK = new ReentrantLock();
 
-    private static final String CONTEXT_KEY = "com.enonic.app.oidcidprovider.context";
+    private String contextSessionKey;
 
-    private static final String ID_TOKEN_KEY = "com.enonic.app.oidcidprovider.idtoken";
+    private String idTokenSessionKey;
 
-    private static final Lock LOCK = new ReentrantLock();
+    private String autoLoginAttr;
 
     private PortalRequest portalRequest;
 
@@ -41,8 +39,8 @@ public void storeContext( final String state, final String nonce, final String o
         {
             final var contextMap = new ConcurrentHashMap<String, Map<String, String>>();
 
-            final HttpSession session = portalRequest.getRawRequest().getSession( true );
-            Map<String, Map<String, String>> existingContextMap = (Map) session.getAttribute( CONTEXT_KEY );
+            final var session = portalRequest.getRawRequest().getSession( true );
+            Map<String, Map<String, String>> existingContextMap = (Map) session.getAttribute( contextSessionKey );
 
             if ( existingContextMap != null )
             {
@@ -54,7 +52,7 @@ public void storeContext( final String state, final String nonce, final String o
 
             contextMap.put( state, context.asMap() );
 
-            session.setAttribute( CONTEXT_KEY, Collections.unmodifiableMap( contextMap ) );
+            session.setAttribute( contextSessionKey, Collections.unmodifiableMap( contextMap ) );
         }
         finally
         {
@@ -68,15 +66,15 @@ public ContextMapper removeContext( final String state )
         LOCK.lock();
         try
         {
-            final HttpSession session = portalRequest.getRawRequest().getSession( false );
+            final var session = portalRequest.getRawRequest().getSession( false );
 
             if ( session == null )
             {
                 throw new WebException( HttpStatus.UNAUTHORIZED, "No session" );
             }
 
-            final Map<String, Map<String, String>> contextMap = (Map) session.getAttribute( CONTEXT_KEY );
-            session.removeAttribute( CONTEXT_KEY );
+            final Map<String, Map<String, String>> contextMap = (Map) session.getAttribute( contextSessionKey );
+            session.removeAttribute( contextSessionKey );
 
             if ( contextMap == null )
             {
@@ -106,29 +104,32 @@ public ContextMapper removeContext( final String state )
 
     public void storeIdToken( final String idToken )
     {
-        final HttpSession session = portalRequest.getRawRequest().getSession( true );
-        session.setAttribute( ID_TOKEN_KEY, idToken );
+        final var session = portalRequest.getRawRequest().getSession( true );
+        session.setAttribute( idTokenSessionKey, idToken );
     }
 
     public String getIdToken()
     {
-        final HttpSession session = portalRequest.getRawRequest().getSession( false );
-        return session != null ? (String) session.getAttribute( ID_TOKEN_KEY ) : null;
+        final var session = portalRequest.getRawRequest().getSession( false );
+        return session != null ? (String) session.getAttribute( idTokenSessionKey ) : null;
     }
 
     public void autoLoginFailed()
     {
-        this.portalRequest.getRawRequest().setAttribute( AUTO_LOGIN_FAILED_ATTRIBUTE, Boolean.TRUE );
+        this.portalRequest.getRawRequest().setAttribute( autoLoginAttr, Boolean.TRUE );
     }
 
     public boolean isAutoLoginFailed()
     {
-        return Boolean.TRUE.equals( this.portalRequest.getRawRequest().getAttribute( AUTO_LOGIN_FAILED_ATTRIBUTE ) );
+        return Boolean.TRUE.equals( this.portalRequest.getRawRequest().getAttribute( autoLoginAttr ) );
     }
 
     @Override
     public void initialize( final BeanContext context )
     {
+        this.contextSessionKey = context.getApplicationKey() + ".context";
+        this.idTokenSessionKey = context.getApplicationKey() + ".idtoken";
+        this.autoLoginAttr = context.getApplicationKey() + ".autoLoginFailed";
         this.portalRequest = context.getBinding( PortalRequest.class ).get();
     }
 }

src/main/resources/lib/login.js

@@ -37,7 +37,7 @@ function login(token, tokenClaims, isAutoLogin) {
         updateUserData(claims, idProviderConfig, user);
     }
 
-    doLogin(idProviderConfig, userName, isAutoLogin);
+    return doLogin(idProviderConfig, userName, isAutoLogin);
 }
 
 function getClaim(claims, claimKey) {
@@ -110,6 +110,7 @@ function doLogin(idProviderConfig, userName, isAutoLogin) {
         }
         throw `Error while logging user [${principalKey}]`;
     }
+    return loginResult;
 }
 
 function doCreateUser(idProviderConfig, claims, userName, isAutoLogin) {