fix header doc, use ClientSessionContext, code cleanups

Signed-off-by: Stefan Wiedemann <wistefan@googlemail.com>
wistefan · Apr 17, 2024 · bbdb87f · bbdb87f
1 parent a65798d
commit bbdb87f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/services/src/main/java/org/keycloak/protocol/oidc/grants/PreAuthorizedCodeGrantType.java b/services/src/main/java/org/keycloak/protocol/oidc/grants/PreAuthorizedCodeGrantType.java
@@ -27,8 +27,8 @@
 import org.keycloak.events.Errors;
 import org.keycloak.events.EventType;
 import org.keycloak.models.AuthenticatedClientSessionModel;
+import org.keycloak.models.ClientSessionContext;
 import org.keycloak.models.KeycloakSession;
-import org.keycloak.protocol.oid4vc.OID4VCClientRegistrationProvider;
 import org.keycloak.protocol.oidc.utils.OAuth2Code;
 import org.keycloak.protocol.oidc.utils.OAuth2CodeParser;
 import org.keycloak.provider.EnvironmentDependentProviderFactory;
@@ -68,14 +68,10 @@ public Response process(Context context) {
                     Response.Status.BAD_REQUEST);
         }
         AuthenticatedClientSessionModel clientSession = result.getClientSession();
-        DefaultClientSessionContext sessionContext = DefaultClientSessionContext.fromClientSessionAndScopeParameter(clientSession,
+        ClientSessionContext sessionContext = DefaultClientSessionContext.fromClientSessionAndScopeParameter(clientSession,
                 OAuth2Constants.SCOPE_OPENID, session);
 
 
-        // set the client as retrieved from the pre-authorized session
-        session.getContext().setClient(result.getClientSession().getClient());
-
-
         // set the client as retrieved from the pre-authorized session
         session.getContext().setClient(result.getClientSession().getClient());
 
@@ -121,7 +117,7 @@ public EventType getEventType() {
      *
      * @param session                    - keycloak session to be used
      * @param authenticatedClientSession - client session to be persisted
-     * @param expirationTime             - expiration time of the code, the code should be short-lifed
+     * @param expirationTime             - expiration time of the code, the code should be short-lived
      * @return the pre-authorized code
      */
     public static String getPreAuthorizedCode(KeycloakSession session, AuthenticatedClientSessionModel authenticatedClientSession, int expirationTime) {

diff --git a/...NF/services/org.keycloak.protocol.oid4vc.issuance.signing.VCSigningServiceProviderFactory b/...NF/services/org.keycloak.protocol.oid4vc.issuance.signing.VCSigningServiceProviderFactory
@@ -1,5 +1,5 @@
 #
-# Copyright 2016 Red Hat, Inc. and/or its affiliates
+# Copyright 2024 Red Hat, Inc. and/or its affiliates
 # and other contributors as indicated by the @author tags.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");