From 20a8cdf44ba5d0a3476c5658ef920dbc42b65c7c Mon Sep 17 00:00:00 2001
From: AJ Ancheta <7781450+ancheetah@users.noreply.github.com>
Date: Mon, 5 Jan 2026 18:49:36 -0500
Subject: [PATCH 1/2] fix(journey-client): fix callbackType export

---
 packages/journey-client/src/index.ts | 3 +++
 packages/journey-client/src/types.ts | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/journey-client/src/index.ts b/packages/journey-client/src/index.ts
index c51b07963d..04d5c83093 100644
--- a/packages/journey-client/src/index.ts
+++ b/packages/journey-client/src/index.ts
@@ -6,3 +6,6 @@
  */
 
 export * from './lib/client.store.js';
+
+// Re-export types from internal packages that consumers need
+export { callbackType } from '@forgerock/sdk-types';
diff --git a/packages/journey-client/src/types.ts b/packages/journey-client/src/types.ts
index ed7cade5fd..5ec9b606c9 100644
--- a/packages/journey-client/src/types.ts
+++ b/packages/journey-client/src/types.ts
@@ -13,7 +13,6 @@ export type {
   Callback,
   CallbackType,
   StepType,
-  callbackType,
   GenericError,
   PolicyRequirement,
   FailedPolicyRequirement,

From 0bc297fab6a1b739d99bccd08768a3ef21430f70 Mon Sep 17 00:00:00 2001
From: AJ Ancheta <7781450+ancheetah@users.noreply.github.com>
Date: Tue, 6 Jan 2026 17:25:35 -0500
Subject: [PATCH 2/2] fix(oidc-client): fix token force renew

---
 packages/oidc-client/src/lib/client.store.ts | 22 +++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/oidc-client/src/lib/client.store.ts b/packages/oidc-client/src/lib/client.store.ts
index 4c0bc8135a..9e32712a16 100644
--- a/packages/oidc-client/src/lib/client.store.ts
+++ b/packages/oidc-client/src/lib/client.store.ts
@@ -289,16 +289,18 @@ export async function oidc<ActionType extends ActionTypes = ActionTypes>({
               options: storageOptions,
             });
           }),
-          Micro.tap(async (tokens) => {
-            await store.dispatch(
-              oidcApi.endpoints.revoke.initiate({
-                accessToken: tokens.accessToken,
-                clientId: config.clientId,
-                endpoint: wellknown.revocation_endpoint,
-              }),
-            );
-            await storageClient.remove();
-            await storageClient.set(tokens);
+          Micro.tap(async (newTokens) => {
+            if (tokens && 'accessToken' in tokens) {
+              await store.dispatch(
+                oidcApi.endpoints.revoke.initiate({
+                  accessToken: tokens.accessToken,
+                  clientId: config.clientId,
+                  endpoint: wellknown.revocation_endpoint,
+                }),
+              );
+              await storageClient.remove();
+            }
+            await storageClient.set(newTokens);
           }),
         );